Переглянути джерело

Update :servlet:java-configuration:authentication:preauth to 7

Josh Cummings 1 місяць тому
батько
коміт
84f51b5f4b

+ 1 - 1
servlet/java-configuration/authentication/preauth/gradle.properties

@@ -1,4 +1,4 @@
 version=6.1.1
-spring-security.version=6.5.0-SNAPSHOT
+spring-security.version=7.0.0-SNAPSHOT
 org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError
 org.gradle.caching=true

+ 4 - 11
servlet/java-configuration/authentication/preauth/src/main/java/example/SecurityConfiguration.java

@@ -18,7 +18,6 @@ package example;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Scope;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.User;
@@ -26,19 +25,19 @@ import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
-import org.springframework.web.servlet.handler.HandlerMappingIntrospector;
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 
 @Configuration
 @EnableWebSecurity
 public class SecurityConfiguration {
 
 	@Bean
-	public SecurityFilterChain securityFilterChain(HttpSecurity http, MvcRequestMatcher.Builder mvc) throws Exception {
+	public SecurityFilterChain securityFilterChain(HttpSecurity http, PathPatternRequestMatcher.Builder mvc)
+			throws Exception {
 		// @formatter:off
 		http
 				.authorizeHttpRequests((authorize) -> authorize
-						.requestMatchers(mvc.pattern("/login"), mvc.pattern("/resources/**")).permitAll()
+						.requestMatchers(mvc.matcher("/login"), mvc.matcher("/resources/**")).permitAll()
 						.anyRequest().authenticated()
 				)
 				.jee((jee) -> jee.mappableRoles("USER", "ADMIN"));
@@ -46,12 +45,6 @@ public class SecurityConfiguration {
 		return http.build();
 	}
 
-	@Scope("prototype")
-	@Bean
-	MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) {
-		return new MvcRequestMatcher.Builder(introspector);
-	}
-
 	// @formatter:off
 	@Bean
 	public UserDetailsService userDetailsService() {