Skip to content

Commit 43b0693

Browse files
committed
update springboot 3.2.4
1 parent d0ca7a3 commit 43b0693

File tree

6 files changed

+35
-27
lines changed

6 files changed

+35
-27
lines changed

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>3.1.8</version>
9+
<version>3.2.4</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

1313
<groupId>com.codingapi.springboot</groupId>
1414
<artifactId>springboot-parent</artifactId>
15-
<version>3.2.0.dev</version>
15+
<version>3.2.0</version>
1616

1717
<url>https://github.com/codingapi/springboot-framewrok</url>
1818
<name>springboot-parent</name>

springboot-starter-data-fast/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>springboot-parent</artifactId>
77
<groupId>com.codingapi.springboot</groupId>
8-
<version>3.2.0.dev</version>
8+
<version>3.2.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

springboot-starter-security/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<artifactId>springboot-parent</artifactId>
88
<groupId>com.codingapi.springboot</groupId>
9-
<version>3.2.0.dev</version>
9+
<version>3.2.0</version>
1010
</parent>
1111

1212
<artifactId>springboot-starter-security</artifactId>

springboot-starter-security/src/main/java/com/codingapi/springboot/security/AutoConfiguration.java

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@
1616
import org.springframework.core.env.Environment;
1717
import org.springframework.security.authentication.AuthenticationProvider;
1818
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
19+
import org.springframework.security.config.Customizer;
1920
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
2021
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
22+
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
2123
import org.springframework.security.core.userdetails.User;
2224
import org.springframework.security.core.userdetails.UserDetails;
2325
import org.springframework.security.core.userdetails.UserDetailsService;
@@ -88,19 +90,26 @@ public AuthenticationTokenFilter authenticationTokenFilter() {
8890
public SecurityFilterChain filterChain(HttpSecurity security, TokenGateway tokenGateway, SecurityLoginHandler loginHandler,
8991
CodingApiSecurityProperties properties, AuthenticationTokenFilter authenticationTokenFilter) throws Exception {
9092
//disable basic auth
91-
security.httpBasic().disable();
93+
security.httpBasic(AbstractHttpConfigurer::disable);
9294

9395
//before add addCorsMappings to enable cors.
94-
security.cors();
95-
if (properties.isDisableCsrf()) {
96-
security.csrf().disable();
97-
}
98-
security.apply(new HttpSecurityConfigurer(tokenGateway, loginHandler, properties, authenticationTokenFilter));
99-
security
100-
.exceptionHandling()
101-
.authenticationEntryPoint(new MyUnAuthenticationEntryPoint())
102-
.accessDeniedHandler(new MyAccessDeniedHandler())
103-
.and()
96+
security.cors(httpSecurityCorsConfigurer -> {
97+
if (properties.isDisableCors()) {
98+
httpSecurityCorsConfigurer.disable();
99+
}
100+
});
101+
102+
security.csrf(httpSecurityCsrfConfigurer -> {
103+
if (properties.isDisableCsrf()) {
104+
httpSecurityCsrfConfigurer.disable();
105+
}
106+
});
107+
108+
109+
security.with(new HttpSecurityConfigurer(tokenGateway, loginHandler, properties, authenticationTokenFilter), Customizer.withDefaults());
110+
security.exceptionHandling(httpSecurityExceptionHandlingConfigurer ->
111+
httpSecurityExceptionHandlingConfigurer.authenticationEntryPoint(new MyUnAuthenticationEntryPoint())
112+
.accessDeniedHandler(new MyAccessDeniedHandler()))
104113
.authorizeHttpRequests(
105114
registry -> {
106115
registry.requestMatchers(properties.getIgnoreUrls()).permitAll()
@@ -109,15 +118,13 @@ public SecurityFilterChain filterChain(HttpSecurity security, TokenGateway token
109118
}
110119
)
111120
//default login url :/login
112-
.formLogin()
113-
.loginProcessingUrl(properties.getLoginProcessingUrl())
114-
.permitAll()
115-
.and()
121+
.formLogin(httpSecurityFormLoginConfigurer ->
122+
httpSecurityFormLoginConfigurer.loginPage(properties.getLoginProcessingUrl())
123+
)
116124
//default logout url :/logout
117-
.logout()
118-
.logoutUrl(properties.getLogoutUrl())
119-
.addLogoutHandler(new MyLogoutHandler())
120-
.logoutSuccessHandler(new MyLogoutSuccessHandler());
125+
.logout(httpSecurityLogoutConfigurer -> httpSecurityLogoutConfigurer.logoutUrl(properties.getLogoutUrl())
126+
.addLogoutHandler(new MyLogoutHandler())
127+
.logoutSuccessHandler(new MyLogoutSuccessHandler()));
121128

122129
return security.build();
123130
}

springboot-starter-security/src/main/java/com/codingapi/springboot/security/configurer/HttpSecurityConfigurer.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import com.codingapi.springboot.security.properties.CodingApiSecurityProperties;
99
import lombok.AllArgsConstructor;
1010
import org.springframework.security.authentication.AuthenticationManager;
11+
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
1112
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
12-
import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
13+
import org.springframework.security.web.DefaultSecurityFilterChain;
1314

1415
@AllArgsConstructor
15-
public class HttpSecurityConfigurer extends AbstractHttpConfigurer<HttpSecurityConfigurer, HttpSecurity> {
16+
public class HttpSecurityConfigurer extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity> {
1617

1718
private final TokenGateway tokenGateway;
1819

@@ -23,7 +24,7 @@ public class HttpSecurityConfigurer extends AbstractHttpConfigurer<HttpSecurityC
2324
@Override
2425
public void configure(HttpSecurity security) throws Exception {
2526
AuthenticationManager manager = security.getSharedObject(AuthenticationManager.class);
26-
security.addFilter(new MyLoginFilter(manager, tokenGateway, securityLoginHandler, securityJwtProperties));
27+
security.addFilter(new MyLoginFilter(manager, tokenGateway,securityLoginHandler, securityJwtProperties));
2728
security.addFilter(new MyAuthenticationFilter(manager, securityJwtProperties, tokenGateway, authenticationTokenFilter));
2829
}
2930
}

springboot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.codingapi.springboot</groupId>
77
<artifactId>springboot-parent</artifactId>
8-
<version>3.2.0.dev</version>
8+
<version>3.2.0</version>
99
</parent>
1010
<artifactId>springboot-starter</artifactId>
1111

0 commit comments

Comments
 (0)