authentication principal reset fix (when principal is already authent…

…icated)
Evolveum · Dec 7, 2022 · 0333e4a · 0333e4a
1 parent 252afb7
commit 0333e4a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java b/...src/main/java/com/evolveum/midpoint/authentication/api/config/MidpointAuthentication.java
@@ -354,4 +354,8 @@ public boolean isAnonymous() {
         }
         return false;
     }
+
+    public boolean hasSucceededAuthentication() {
+        return getAuthentications().stream().anyMatch(auth -> AuthenticationModuleState.SUCCESSFULLY.equals(auth.getState()));
+    }
 }
diff --git a/...m/evolveum/midpoint/authentication/impl/filter/MidpointAnonymousAuthenticationFilter.java b/...m/evolveum/midpoint/authentication/impl/filter/MidpointAnonymousAuthenticationFilter.java
@@ -97,7 +97,9 @@ protected void processAuthentication(ServletRequest req) {
             if (moduleAuthentication != null && moduleAuthentication.getAuthentication() == null) {
                 Authentication authentication = createBasicAuthentication((HttpServletRequest) req);
                 moduleAuthentication.setAuthentication(authentication);
-                mpAuthentication.setPrincipal(authentication.getPrincipal());
+                if (!mpAuthentication.hasSucceededAuthentication()) {
+                    mpAuthentication.setPrincipal(authentication.getPrincipal());
+                }
             }
         }
     }