commit c4f4deffe0590646562d47a7c52b4490859a74ed
author Carsten Ziegeler <cziegeler@apache.org> Wed Aug 05 16:11:59 2020 +0200
committer Carsten Ziegeler <cziegeler@apache.org> Wed Aug 05 16:11:59 2020 +0200
tree 53a30a2a9fc1d0fa3d8a516fa3dd61b5e07633cf
parent 0e1fd4f863c20ca9bf822da3fe335d0c4acff808

SLING-5483 : Unauthenticated request: getUserPrincipal() doesn't return null for auth.annonymous=true

src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java

diff --git a/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java b/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
index c2e876a..6e203cc 100644
--- a/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
+++ b/src/main/java/org/apache/sling/auth/core/impl/SlingAuthenticator.java
@@ -1287,8 +1287,10 @@
             final HttpServletRequest request) {
 
         // HttpService API required attributes
-        request.setAttribute(ServletContextHelper.REMOTE_USER, resolver.getUserID());
         request.setAttribute(ServletContextHelper.AUTHENTICATION_TYPE, authType);
+        if ( authType != null ) {
+            request.setAttribute(ServletContextHelper.REMOTE_USER, resolver.getUserID());
+        }
 
         // resource resolver for down-stream use
         request.setAttribute(REQUEST_ATTRIBUTE_RESOLVER, resolver);