Merge pull request #243 from pdowler/master

bug fix: TokenValidator not keeping all bearer token principals
opencadc · Feb 21, 2024 · fd3af59 · fd3af59
2 parents a86a5fb + 0c29403
commit fd3af59
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cadc-util/build.gradle b/cadc-util/build.gradle
@@ -16,7 +16,7 @@ sourceCompatibility = 1.8
 
 group = 'org.opencadc'
 
-version = '1.10.6'
+version = '1.10.7'
 
 description = 'OpenCADC core utility library'
 def git_url = 'https://github.com/opencadc/core'

diff --git a/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java b/cadc-util/src/main/java/ca/nrc/cadc/auth/TokenValidator.java
@@ -150,7 +150,7 @@ public static Subject validateTokens(Subject subject) throws NotAuthenticatedExc
 
                 try {
                     SignedToken validatedToken = SignedToken.parse(credentials);
-                    subject.getPrincipals().add(validatedToken.getUser());
+                    subject.getPrincipals().addAll(validatedToken.getIdentityPrincipals());
 
                     AuthorizationToken authToken = new AuthorizationToken(
                         challengeType, credentials, validatedToken.getDomains(), validatedToken.getScope());