OAK-11498: Expose Session-bound principals via JackrabbitSession

Author: kwin

oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/JackrabbitSession.java

@@ -16,18 +16,20 @@
  */
 package org.apache.jackrabbit.api;
 
-import org.apache.jackrabbit.api.security.user.UserManager;
-import org.apache.jackrabbit.api.security.principal.PrincipalManager;
+import java.security.Principal;
+import java.util.Set;
 
+import javax.jcr.AccessDeniedException;
 import javax.jcr.Item;
 import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
 import javax.jcr.Property;
-import javax.jcr.Session;
-import javax.jcr.AccessDeniedException;
 import javax.jcr.RepositoryException;
+import javax.jcr.Session;
 import javax.jcr.UnsupportedRepositoryOperationException;
 
+import org.apache.jackrabbit.api.security.principal.PrincipalManager;
+import org.apache.jackrabbit.api.security.user.UserManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.osgi.annotation.versioning.ProviderType;
@@ -277,4 +279,12 @@ default Node getParentOrNull(@NotNull Item item) throws RepositoryException {
             return null;
         }
     }
+    
+    /**
+     * Returns the set of principals associated with this session.
+     * @return the set of principals associated with this session.
+     * @throws RepositoryException in case principal information cannot be retrieved.
+     * @since 1.78
+     */
+    @NotNull Set<Principal> getPrincipals() throws RepositoryException;
 }

oak-jackrabbit-api/src/main/java/org/apache/jackrabbit/api/package-info.java

@@ -18,6 +18,6 @@
 /**
  * Jackrabbit extensions for JCR core interfaces
  */
-@org.osgi.annotation.versioning.Version("2.9.0")
+@org.osgi.annotation.versioning.Version("2.10.0")
 package org.apache.jackrabbit.api;
 

oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/session/SessionImpl.java

@@ -24,6 +24,7 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.AccessControlException;
+import java.security.Principal;
 import java.util.Collections;
 import java.util.Set;
 import java.util.TreeSet;
@@ -845,6 +846,12 @@ public UserManager getUserManager() throws RepositoryException {
         return sessionContext.getUserManager();
     }
 
+    @Override
+    @NotNull
+    public Set<Principal> getPrincipals() throws RepositoryException {
+        return sd.getAuthInfo().getPrincipals();
+    }
+
     @Override
     public String toString() {
         if (isLive()) {

oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/session/JackrabbitSessionTest.java

@@ -30,6 +30,9 @@
 
 import static org.mockito.Mockito.mock;
 
+import java.security.Principal;
+import java.util.Set;
+
 public class JackrabbitSessionTest extends AbstractJCRTest {
 
     private JackrabbitSession s;
@@ -81,6 +84,23 @@ public void testGetParentOrNullImplMismatch() {
             // success
         }
     }
-    
-    
+
+    public void testGetPrincipalsForAdminSession() throws RepositoryException {
+        Set<Principal> principals = s.getPrincipals();
+        assertNotNull(principals);
+        assertTrue("Admin principal expected", principals.contains(s.getPrincipalManager().getPrincipal("admin")));
+        assertTrue("Everyone principal expected", principals.contains(s.getPrincipalManager().getEveryone()));
+    }
+
+    public void testGetPrincipalsForGuestSession() throws RepositoryException {
+        JackrabbitSession guest = (JackrabbitSession) getHelper().getRepository().login(new GuestCredentials());
+        try {
+            Set<Principal> principals = guest.getPrincipals();
+            assertNotNull(principals);
+            assertFalse("Admin principal not expected", principals.contains(s.getPrincipalManager().getPrincipal("admin")));
+            assertTrue("Everyone principal expected", principals.contains(s.getPrincipalManager().getEveryone()));
+        } finally {
+            guest.logout();
+        }
+    }
 }