commit f532f740ce18fda0cb1790ed4421ed1785ee7b4e
author Eric Norman <enorman@apache.org> Mon Apr 17 09:24:27 2023 -0700
committer GitHub <noreply@github.com> Mon Apr 17 09:24:27 2023 -0700
tree d0a3e9f073e66d42027db370da43e104ec2fe5ad
parent 67e26aa10fc6ce77d197004877375e344d469978

SLING-11817 getUserPrincipal() should return null for anonymous requests (#13)

src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java

diff --git a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
index 5919860..e9f2e23 100644
--- a/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
+++ b/src/main/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequest.java
@@ -884,15 +884,16 @@
     @Override
     public Principal getUserPrincipal() {
         Principal principal = null;
-        ResourceResolver rr = getResourceResolver();
-        if (rr != null) {
-            principal = rr.adaptTo(Principal.class);
-        }
+        // always return null for anonymous user
+        final String userid = getRemoteUser();
+        if (userid != null) {
+            ResourceResolver rr = getResourceResolver();
+            if (rr != null) {
+                principal = rr.adaptTo(Principal.class);
+            }
 
-        if (principal == null) {
-            //fallback to the userid
-            final String userid = getRemoteUser();
-            if (userid != null) {
+            if (principal == null) {
+                //fallback to the userid
                 principal = () -> userid;
             }
         }

src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java

diff --git a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
index 5e8b3b8..5916eb9 100644
--- a/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
+++ b/src/test/java/org/apache/sling/servlethelpers/MockSlingHttpServletRequestTest.java
@@ -585,6 +585,11 @@
     public void testGetUserPrincipalFromResourceResolver() {
         Mockito.when(resourceResolver.adaptTo(Principal.class))
             .thenReturn(() -> "rruser");
+        // always returns null for anonymous user
+        assertNull(request.getUserPrincipal());
+
+        // make remote user not anonymous
+        request.setRemoteUser("remoteuser");
         Principal userPrincipal = request.getUserPrincipal();
         assertNotNull(userPrincipal);
         assertEquals("rruser", userPrincipal.getName());