upgrade spring boot
This commit is contained in:
@@ -35,7 +35,7 @@ public class LocalAuthenticationProvider extends DaoAuthenticationProvider {
|
|||||||
* @param userDetailService the user detail service
|
* @param userDetailService the user detail service
|
||||||
*/
|
*/
|
||||||
public LocalAuthenticationProvider(UserDetailsService userDetailService) {
|
public LocalAuthenticationProvider(UserDetailsService userDetailService) {
|
||||||
setUserDetailsService(userDetailService);
|
super(userDetailService);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ import org.springframework.security.web.authentication.rememberme.PersistentToke
|
|||||||
import org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy;
|
import org.springframework.security.web.authentication.session.SessionFixationProtectionStrategy;
|
||||||
import org.springframework.security.web.firewall.StrictHttpFirewall;
|
import org.springframework.security.web.firewall.StrictHttpFirewall;
|
||||||
import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter.ReferrerPolicy;
|
import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter.ReferrerPolicy;
|
||||||
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
|
import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
|
||||||
import org.springframework.web.cors.CorsConfiguration;
|
import org.springframework.web.cors.CorsConfiguration;
|
||||||
import org.springframework.web.cors.CorsConfigurationSource;
|
import org.springframework.web.cors.CorsConfigurationSource;
|
||||||
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
|
||||||
@@ -170,7 +170,8 @@ public class SecurityConfig {
|
|||||||
@Bean
|
@Bean
|
||||||
public LocalAuthenticationEntryPoint localAuthenticationEntryPoint() {
|
public LocalAuthenticationEntryPoint localAuthenticationEntryPoint() {
|
||||||
LocalAuthenticationEntryPoint localAuthenticationEntryPoint = new LocalAuthenticationEntryPoint(loginUrl);
|
LocalAuthenticationEntryPoint localAuthenticationEntryPoint = new LocalAuthenticationEntryPoint(loginUrl);
|
||||||
localAuthenticationEntryPoint.addRequestMatcher(new AntPathRequestMatcher("/oidc/authorize"));
|
localAuthenticationEntryPoint
|
||||||
|
.addRequestMatcher(PathPatternRequestMatcher.withDefaults().matcher("/oidc/authorize"));
|
||||||
|
|
||||||
return localAuthenticationEntryPoint;
|
return localAuthenticationEntryPoint;
|
||||||
}
|
}
|
||||||
@@ -186,7 +187,8 @@ public class SecurityConfig {
|
|||||||
rememberMeServices(), tokenSessionManager, loginTargetUrl, SecurityConfig.KEEP_PARAM);
|
rememberMeServices(), tokenSessionManager, loginTargetUrl, SecurityConfig.KEEP_PARAM);
|
||||||
formAuthenticationSuccessHandler.setTotpRedirectUrl(secondFactorUrl);
|
formAuthenticationSuccessHandler.setTotpRedirectUrl(secondFactorUrl);
|
||||||
formAuthenticationSuccessHandler.setTargetUrlParameter("forward");
|
formAuthenticationSuccessHandler.setTargetUrlParameter("forward");
|
||||||
formAuthenticationSuccessHandler.addRequestMatcher(new AntPathRequestMatcher("/oidc/authorize"));
|
formAuthenticationSuccessHandler
|
||||||
|
.addRequestMatcher(PathPatternRequestMatcher.withDefaults().matcher("/oidc/authorize"));
|
||||||
return formAuthenticationSuccessHandler;
|
return formAuthenticationSuccessHandler;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,7 +208,6 @@ public class SecurityConfig {
|
|||||||
public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception {
|
public AuthenticationManager authenticationManager(HttpSecurity http) throws Exception {
|
||||||
AuthenticationManagerBuilder authenticationManagerBuilder = http
|
AuthenticationManagerBuilder authenticationManagerBuilder = http
|
||||||
.getSharedObject(AuthenticationManagerBuilder.class);
|
.getSharedObject(AuthenticationManagerBuilder.class);
|
||||||
localAuthenticationProvider.setUserDetailsService(localUserDetailsService);
|
|
||||||
localAuthenticationProvider.setPasswordEncoder(passwordEncoder);
|
localAuthenticationProvider.setPasswordEncoder(passwordEncoder);
|
||||||
authenticationManagerBuilder.authenticationProvider(localAuthenticationProvider);
|
authenticationManagerBuilder.authenticationProvider(localAuthenticationProvider);
|
||||||
return authenticationManagerBuilder.build();
|
return authenticationManagerBuilder.build();
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
<artifactId>spring-boot-starter-parent</artifactId>
|
||||||
<version>3.4.5</version>
|
<version>3.5.7</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user