upgrade spring boot parent

Evolveum · Jun 8, 2021 · d1be44f · d1be44f
1 parent 1f68f63
commit d1be44f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/...main/java/com/evolveum/midpoint/web/security/filter/configurers/AuthFilterConfigurer.java b/...main/java/com/evolveum/midpoint/web/security/filter/configurers/AuthFilterConfigurer.java
@@ -12,6 +12,7 @@
 import org.springframework.security.config.annotation.web.HttpSecurityBuilder;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
 import org.springframework.security.config.annotation.web.configurers.SecurityContextConfigurer;
+import org.springframework.security.web.authentication.AnonymousAuthenticationFilter;
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
 import org.springframework.security.web.context.SecurityContextRepository;
 import org.springframework.security.web.session.InvalidSessionStrategy;
@@ -42,7 +43,7 @@ public void configure(H http) throws Exception {
         MidpointAuthFilter mpFilter = postProcess(new MidpointAuthFilter(sharedObjects));
         mpFilter.createFilterForAuthenticatedRequest();
         http.addFilterBefore(mpFilter, SessionManagementFilter.class);
-        http.addFilterBefore(new TranslateExceptionFilter(), MidpointAuthFilter.class);
+        http.addFilterAfter(new TranslateExceptionFilter(), AnonymousAuthenticationFilter.class);
     }
 
     private void setSharedObject(Map<Class<? extends Object>, Object> sharedObjects, H http, Class<? extends Object> clazz) {

diff --git a/...main/java/com/evolveum/midpoint/web/security/module/LoginFormModuleWebSecurityConfig.java b/...main/java/com/evolveum/midpoint/web/security/module/LoginFormModuleWebSecurityConfig.java
@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.web.security.AuditedLogoutHandler;
 import com.evolveum.midpoint.web.security.WicketLoginUrlAuthenticationEntryPoint;
 import com.evolveum.midpoint.web.security.module.configuration.LoginFormModuleWebSecurityConfiguration;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.security.cas.web.CasAuthenticationFilter;
@@ -76,8 +77,7 @@ protected void configure(HttpSecurity http) throws Exception {
                 .authenticationEntryPoint(new WicketLoginUrlAuthenticationEntryPoint("/login"));
 
         http.logout().clearAuthentication(true)
-                .logoutRequestMatcher(getLogoutMatcher(http, getPrefix() +"/logout"))
-//                .logoutUrl(stripEndingSlases(getPrefix()) +"/logout")
+                .logoutRequestMatcher(getLogoutMatcher(http, getPrefix() + "/logout"))
                 .invalidateHttpSession(true)
                 .deleteCookies("JSESSIONID")
                 .logoutSuccessHandler(createLogoutHandler());
@@ -87,7 +87,7 @@ protected void configure(HttpSecurity http) throws Exception {
             http.addFilterBefore(requestSingleLogoutFilter, LogoutFilter.class);
         }
 
-                                if (Arrays.stream(environment.getActiveProfiles()).anyMatch(p -> p.equalsIgnoreCase("ssoenv"))) {
+        if (Arrays.stream(environment.getActiveProfiles()).anyMatch(p -> p.equalsIgnoreCase("ssoenv"))) {
             http.addFilterBefore(requestAttributeAuthenticationFilter, LogoutFilter.class);
         }
     }

diff --git a/.../src/main/java/com/evolveum/midpoint/web/security/module/SamlModuleWebSecurityConfig.java b/.../src/main/java/com/evolveum/midpoint/web/security/module/SamlModuleWebSecurityConfig.java
@@ -49,6 +49,9 @@
 import com.evolveum.midpoint.web.security.module.configuration.SamlModuleWebSecurityConfiguration;
 import com.evolveum.midpoint.web.security.util.SecurityUtils;
 
+import org.springframework.security.web.savedrequest.RequestCacheAwareFilter;
+import org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter;
+
 /**
  * @author skublik
  */
@@ -82,21 +85,21 @@ protected void configure(HttpSecurity http) throws Exception {
                 getBeanConfiguration().samlConfigurationFilter(),
                 BasicAuthenticationFilter.class
         )
-                .addFilterAfter(
+                .addFilterBefore(
                         getBeanConfiguration().spMetadataFilter(),
-                        getBeanConfiguration().samlConfigurationFilter().getClass()
+                        RequestCacheAwareFilter.class
                 )
-                .addFilterAfter(
+                .addFilterAt(
                         getBeanConfiguration().spAuthenticationRequestFilter(),
-                        getBeanConfiguration().spMetadataFilter().getClass()
+                        RequestCacheAwareFilter.class
                 )
                 .addFilterAfter(
                         getBeanConfiguration().spAuthenticationResponseFilter(),
-                        getBeanConfiguration().spAuthenticationRequestFilter().getClass()
+                        RequestCacheAwareFilter.class
                 )
-                .addFilterAfter(
+                .addFilterBefore(
                         getBeanConfiguration().spSamlLogoutFilter(),
-                        getBeanConfiguration().spAuthenticationResponseFilter().getClass()
+                        SecurityContextHolderAwareRequestFilter.class
                 );
     }
 

diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>2.4.3</version>
+        <version>2.5.0</version>
         <!-- This parent also declares dependencies listed here:
         https://docs.spring.io/spring-boot/docs/2.4.3/reference/html/appendix-dependency-versions.html
         Or for current version of Spring Boot: