Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · May 24, 2022 · f205aa6 · f205aa6
2 parents 6082f50 + f68b711
commit f205aa6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...pl/src/main/java/com/evolveum/midpoint/authentication/impl/filter/MidpointAuthFilter.java b/...pl/src/main/java/com/evolveum/midpoint/authentication/impl/filter/MidpointAuthFilter.java
@@ -120,12 +120,13 @@ public void doFilter(ServletRequest request, ServletResponse response,
     private void doFilterInternal(ServletRequest request, ServletResponse response,
             FilterChain chain) throws IOException, ServletException {
         HttpServletRequest httpRequest = (HttpServletRequest) request;
-        if (isPermitAllPage(httpRequest)) {
+        MidpointAuthentication mpAuthentication = (MidpointAuthentication) SecurityContextHolder.getContext().getAuthentication();
+
+        if (isPermitAllPage(httpRequest) && (mpAuthentication == null || !mpAuthentication.isAuthenticated())) {
             chain.doFilter(request, response);
             return;
         }
 
-        MidpointAuthentication mpAuthentication = (MidpointAuthentication) SecurityContextHolder.getContext().getAuthentication();
         AuthenticationWrapper authWrapper = defineAuthenticationWrapper();
 
         if (AuthSequenceUtil.isIgnoredLocalPath(authWrapper.authenticationsPolicy, httpRequest)) {

diff --git a/...thentication/impl/module/configurer/SecurityQuestionsFormModuleWebSecurityConfigurer.java b/...thentication/impl/module/configurer/SecurityQuestionsFormModuleWebSecurityConfigurer.java
@@ -43,7 +43,6 @@ protected void configure(HttpSecurity http) throws Exception {
 
         http.logout().clearAuthentication(true)
                 .logoutRequestMatcher(getLogoutMatcher(http, getPrefix() +"/logout"))
-//                .logoutUrl(stripEndingSlases(getPrefixOfModule()) +"/logout")
                 .invalidateHttpSession(true)
                 .deleteCookies("JSESSIONID")
                 .logoutSuccessHandler(createLogoutHandler());