JAVA-15236 Update spring-security-legacy-oidc module under spring-security-modules to remove usage of deprecated WebSecurityConfigurerAdapter (#12835)
This commit is contained in:
parent
991e0673b2
commit
f4d7618759
|
@ -4,23 +4,24 @@ import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||||
import org.springframework.security.config.annotation.web.builders.WebSecurity;
|
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
||||||
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
|
import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer;
|
||||||
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
|
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
|
||||||
import org.springframework.security.oauth2.client.filter.OAuth2ClientContextFilter;
|
import org.springframework.security.oauth2.client.filter.OAuth2ClientContextFilter;
|
||||||
|
import org.springframework.security.web.SecurityFilterChain;
|
||||||
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
|
import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint;
|
||||||
import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
|
import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@EnableWebSecurity
|
@EnableWebSecurity
|
||||||
public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
public class SecurityConfig {
|
||||||
@Autowired
|
@Autowired
|
||||||
private OAuth2RestTemplate restTemplate;
|
private OAuth2RestTemplate restTemplate;
|
||||||
|
|
||||||
@Override
|
@Bean
|
||||||
public void configure(WebSecurity web) throws Exception {
|
public WebSecurityCustomizer webSecurityCustomizer() {
|
||||||
web.ignoring().antMatchers("/resources/**");
|
return (web) -> web.ignoring()
|
||||||
|
.antMatchers("/resources/**");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
@ -30,19 +31,17 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
||||||
return filter;
|
return filter;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Bean
|
||||||
protected void configure(HttpSecurity http) throws Exception {
|
public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
|
||||||
// @formatter:off
|
http.addFilterAfter(new OAuth2ClientContextFilter(), AbstractPreAuthenticatedProcessingFilter.class)
|
||||||
http
|
|
||||||
.addFilterAfter(new OAuth2ClientContextFilter(), AbstractPreAuthenticatedProcessingFilter.class)
|
|
||||||
.addFilterAfter(myFilter(), OAuth2ClientContextFilter.class)
|
.addFilterAfter(myFilter(), OAuth2ClientContextFilter.class)
|
||||||
.httpBasic().authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/google-login"))
|
.httpBasic()
|
||||||
|
.authenticationEntryPoint(new LoginUrlAuthenticationEntryPoint("/google-login"))
|
||||||
.and()
|
.and()
|
||||||
.authorizeRequests()
|
.authorizeRequests()
|
||||||
// .antMatchers("/","/index*").permitAll()
|
// .antMatchers("/","/index*").permitAll()
|
||||||
.anyRequest().authenticated()
|
.anyRequest()
|
||||||
;
|
.authenticated();
|
||||||
|
return http.build();
|
||||||
// @formatter:on
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
Reference in New Issue