Skip to content

Commit 0ab01ea

Browse files
committed
Update Deprecated Security Usage
1 parent eecd7d9 commit 0ab01ea

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

config/src/main/java/org/springframework/security/config/annotation/web/builders/WebSecurity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,8 @@ private boolean addAuthorizationManager(SecurityFilterChain securityFilterChain,
385385
if (filter instanceof AuthorizationFilter authorization) {
386386
AuthorizationManager<HttpServletRequest> authorizationManager = authorization.getAuthorizationManager();
387387
builder.add(securityFilterChain::matches,
388-
(authentication, context) -> authorizationManager.check(authentication, context.getRequest()));
388+
(authentication, context) -> (AuthorizationDecision) authorizationManager
389+
.authorize(authentication, context.getRequest()));
389390
mappings = true;
390391
}
391392
}

config/src/main/java/org/springframework/security/config/http/OAuth2ResourceServerBeanDefinitionParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationConverter;
4141
import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationProvider;
4242
import org.springframework.security.oauth2.server.resource.authentication.OpaqueTokenAuthenticationProvider;
43-
import org.springframework.security.oauth2.server.resource.introspection.NimbusOpaqueTokenIntrospector;
43+
import org.springframework.security.oauth2.server.resource.introspection.SpringOpaqueTokenIntrospector;
4444
import org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationEntryPoint;
4545
import org.springframework.security.oauth2.server.resource.web.BearerTokenResolver;
4646
import org.springframework.security.oauth2.server.resource.web.DefaultBearerTokenResolver;
@@ -300,7 +300,7 @@ BeanMetadataElement getIntrospector(Element element) {
300300
String clientId = element.getAttribute(CLIENT_ID);
301301
String clientSecret = element.getAttribute(CLIENT_SECRET);
302302
BeanDefinitionBuilder introspectorBuilder = BeanDefinitionBuilder
303-
.rootBeanDefinition(NimbusOpaqueTokenIntrospector.class);
303+
.rootBeanDefinition(SpringOpaqueTokenIntrospector.class);
304304
introspectorBuilder.addConstructorArgValue(introspectionUri);
305305
introspectorBuilder.addConstructorArgValue(clientId);
306306
introspectorBuilder.addConstructorArgValue(clientSecret);

config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2736,7 +2736,7 @@ protected void configure(ServerHttpSecurity http) {
27362736
ServerHttpSecurity.this.defaultEntryPoints.add(new DelegateEntry(preferredMatcher, this.entryPoint));
27372737
AuthenticationWebFilter authenticationFilter = new AuthenticationWebFilter(this.authenticationManager);
27382738
authenticationFilter.setAuthenticationFailureHandler(authenticationFailureHandler());
2739-
authenticationFilter.setAuthenticationConverter(new ServerHttpBasicAuthenticationConverter());
2739+
authenticationFilter.setServerAuthenticationConverter(new ServerHttpBasicAuthenticationConverter());
27402740
authenticationFilter.setSecurityContextRepository(this.securityContextRepository);
27412741
authenticationFilter.setAuthenticationSuccessHandler(getAuthenticationSuccessHandler(http));
27422742
http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.HTTP_BASIC);
@@ -3014,7 +3014,7 @@ protected void configure(ServerHttpSecurity http) {
30143014
AuthenticationWebFilter authenticationFilter = new AuthenticationWebFilter(this.authenticationManager);
30153015
authenticationFilter.setRequiresAuthenticationMatcher(this.requiresAuthenticationMatcher);
30163016
authenticationFilter.setAuthenticationFailureHandler(this.authenticationFailureHandler);
3017-
authenticationFilter.setAuthenticationConverter(new ServerFormLoginAuthenticationConverter());
3017+
authenticationFilter.setServerAuthenticationConverter(new ServerFormLoginAuthenticationConverter());
30183018
authenticationFilter.setAuthenticationSuccessHandler(getAuthenticationSuccessHandler(http));
30193019
authenticationFilter.setSecurityContextRepository(this.securityContextRepository);
30203020
http.addFilterAt(authenticationFilter, SecurityWebFiltersOrder.FORM_LOGIN);

web/src/main/java/org/springframework/security/web/webauthn/registration/PublicKeyCredentialCreationOptionsFilter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
3333
import org.springframework.http.server.ServletServerHttpResponse;
3434
import org.springframework.security.authorization.AuthenticatedAuthorizationManager;
35-
import org.springframework.security.authorization.AuthorizationDecision;
3635
import org.springframework.security.authorization.AuthorizationManager;
36+
import org.springframework.security.authorization.AuthorizationResult;
3737
import org.springframework.security.core.Authentication;
3838
import org.springframework.security.core.context.SecurityContext;
3939
import org.springframework.security.core.context.SecurityContextHolder;
@@ -104,8 +104,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
104104

105105
Supplier<SecurityContext> context = this.securityContextHolderStrategy.getDeferredContext();
106106
Supplier<Authentication> authentication = () -> context.get().getAuthentication();
107-
AuthorizationDecision decision = this.authorization.check(authentication, request);
108-
if (!decision.isGranted()) {
107+
AuthorizationResult result = this.authorization.authorize(authentication, request);
108+
if (!result.isGranted()) {
109109
response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
110110
return;
111111
}

0 commit comments

Comments
 (0)