Merge pull request #281 from smillidge/fix-subject-key

Revert Subject context key to start with javax
eclipse-ee4j · Aug 10, 2020 · 815b0fd · 815b0fd
2 parents 58b002a + a7fbb94
commit 815b0fd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/impl/src/main/java/org/glassfish/soteria/authorization/JACC.java b/impl/src/main/java/org/glassfish/soteria/authorization/JACC.java
@@ -45,8 +45,10 @@
 
 public class JACC {
 
+    public static String SUBJECT_CONTAINER_KEY = "javax.security.auth.Subject.container";
+
     public static Subject getSubject() {
-        return getFromContext("jakarta.security.auth.Subject.container");
+        return getFromContext(SUBJECT_CONTAINER_KEY);
     }
 
     public static boolean isCallerInRole(String role) {

diff --git a/impl/src/main/java/org/glassfish/soteria/authorization/spi/impl/SubjectParser.java b/impl/src/main/java/org/glassfish/soteria/authorization/spi/impl/SubjectParser.java
@@ -154,7 +154,7 @@ public Principal getCallerPrincipalFromPrincipals(Iterable<Principal> principals
                 // So we're getting the principals from the Subject here. Do note that we miss the
                 // potential extra deployment roles here which may be in the principals collection we get
                 // passed in.
-                Subject subject = (Subject) PolicyContext.getContext("jakarta.security.auth.Subject.container");
+                Subject subject = (Subject) PolicyContext.getContext(JACC.SUBJECT_CONTAINER_KEY);
 
                 if (subject == null) {
                     return null;
@@ -179,7 +179,7 @@ public List<String> getMappedRolesFromPrincipals(Iterable<Principal> principals)
         if (isLiberty || isJboss) {
 
             try {
-                Subject subject = (Subject) PolicyContext.getContext("jakarta.security.auth.Subject.container");
+                Subject subject = (Subject) PolicyContext.getContext(JACC.SUBJECT_CONTAINER_KEY);
                 if (subject == null) {
                     return emptyList();
                 }