Merge pull request #344 from Skyllarr/callerPrincipalRebase

Do not require a caller principal obtained from EJB to be assignable from CallerPrincipal
eclipse-ee4j · Jun 6, 2023 · e5f8253 · e5f8253
2 parents f39812c + 7d86ed7
commit e5f8253
Showing 1 changed file with 2 additions and 1 deletion.
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
@@ -514,7 +514,8 @@ private Principal getVendorCallerPrincipal(Principal principal, boolean isEjb) {
                 break;
         }
 
-        if (CallerPrincipal.class.isAssignableFrom(principal.getClass())) {
+        // do not require a principal from EJBContext to be assignable from CallerPrincipal
+        if (isEjb || CallerPrincipal.class.isAssignableFrom(principal.getClass())) {
             return principal;
         }