From 5bd47b6c2da4f5c4bbe1bd933fd93dbf431d11d4 Mon Sep 17 00:00:00 2001 From: Joe Grandja <10884212+jgrandja@users.noreply.github.com> Date: Tue, 4 Mar 2025 05:53:35 -0500 Subject: [PATCH] Polish gh-1907 --- .../extgrant/CustomCodeGrantAuthenticationProvider.java | 2 +- .../web/OAuth2AuthorizationEndpointFilter.java | 9 ++++----- .../web/OAuth2ClientAuthenticationFilter.java | 7 +++---- .../web/OAuth2DeviceAuthorizationEndpointFilter.java | 7 +++---- .../web/OAuth2DeviceVerificationEndpointFilter.java | 7 +++---- .../authorization/web/OAuth2TokenEndpointFilter.java | 7 +++---- .../web/OAuth2TokenRevocationEndpointFilter.java | 7 +++---- .../OAuth2ErrorAuthenticationFailureHandler.java | 6 +++--- .../FederatedIdentityAuthenticationSuccessHandler.java | 6 +++--- .../federation/FederatedIdentityIdTokenCustomizer.java | 2 +- 10 files changed, 27 insertions(+), 33 deletions(-) diff --git a/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java b/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java index 69faec74..5c69259f 100644 --- a/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java +++ b/docs/src/main/java/sample/extgrant/CustomCodeGrantAuthenticationProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java index 8ad80fe0..cda3548b 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java @@ -173,9 +173,8 @@ public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilte try { Authentication authentication = this.authenticationConverter.convert(request); - if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) { - abstractAuthenticationToken - .setDetails(this.authenticationDetailsSource.buildDetails(request)); + if (authentication instanceof AbstractAuthenticationToken authenticationToken) { + authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request)); } Authentication authenticationResult = this.authenticationManager.authenticate(authentication); @@ -188,13 +187,13 @@ public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilte return; } - if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken oAuth2AuthorizationConsentAuthenticationToken) { + if (authenticationResult instanceof OAuth2AuthorizationConsentAuthenticationToken authorizationConsentAuthenticationToken) { if (this.logger.isTraceEnabled()) { this.logger.trace("Authorization consent is required"); } sendAuthorizationConsent(request, response, (OAuth2AuthorizationCodeRequestAuthenticationToken) authentication, - oAuth2AuthorizationConsentAuthenticationToken); + authorizationConsentAuthenticationToken); return; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java index 765ae842..e8714ddc 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2ClientAuthenticationFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -132,9 +132,8 @@ public final class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter try { Authentication authenticationRequest = this.authenticationConverter.convert(request); - if (authenticationRequest instanceof AbstractAuthenticationToken abstractAuthenticationToken) { - abstractAuthenticationToken - .setDetails(this.authenticationDetailsSource.buildDetails(request)); + if (authenticationRequest instanceof AbstractAuthenticationToken authenticationToken) { + authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request)); } if (authenticationRequest != null) { validateClientIdentifier(authenticationRequest); diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java index c7bc0bac..e98d43b7 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -129,9 +129,8 @@ public final class OAuth2DeviceAuthorizationEndpointFilter extends OncePerReques try { Authentication deviceAuthorizationRequestAuthentication = this.authenticationConverter.convert(request); - if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) { - abstractAuthenticationToken - .setDetails(this.authenticationDetailsSource.buildDetails(request)); + if (deviceAuthorizationRequestAuthentication instanceof AbstractAuthenticationToken authenticationToken) { + authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request)); } Authentication deviceAuthorizationRequestAuthenticationResult = this.authenticationManager diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java index 7172ce1d..a479bfc3 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceVerificationEndpointFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -155,9 +155,8 @@ public final class OAuth2DeviceVerificationEndpointFilter extends OncePerRequest try { Authentication authentication = this.authenticationConverter.convert(request); - if (authentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) { - abstractAuthenticationToken - .setDetails(this.authenticationDetailsSource.buildDetails(request)); + if (authentication instanceof AbstractAuthenticationToken authenticationToken) { + authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request)); } Authentication authenticationResult = this.authenticationManager.authenticate(authentication); diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java index a62ab742..829b25a9 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenEndpointFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -161,9 +161,8 @@ public final class OAuth2TokenEndpointFilter extends OncePerRequestFilter { if (authorizationGrantAuthentication == null) { throwError(OAuth2ErrorCodes.UNSUPPORTED_GRANT_TYPE, OAuth2ParameterNames.GRANT_TYPE); } - if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) { - abstractAuthenticationToken - .setDetails(this.authenticationDetailsSource.buildDetails(request)); + if (authorizationGrantAuthentication instanceof AbstractAuthenticationToken authenticationToken) { + authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request)); } OAuth2AccessTokenAuthenticationToken accessTokenAuthentication = (OAuth2AccessTokenAuthenticationToken) this.authenticationManager diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java index 5b6ce9db..506ce998 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenRevocationEndpointFilter.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2024 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -114,9 +114,8 @@ public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFil try { Authentication tokenRevocationAuthentication = this.authenticationConverter.convert(request); - if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken abstractAuthenticationToken) { - abstractAuthenticationToken - .setDetails(this.authenticationDetailsSource.buildDetails(request)); + if (tokenRevocationAuthentication instanceof AbstractAuthenticationToken authenticationToken) { + authenticationToken.setDetails(this.authenticationDetailsSource.buildDetails(request)); } Authentication tokenRevocationAuthenticationResult = this.authenticationManager diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java index 9731cea8..1831cf56 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/authentication/OAuth2ErrorAuthenticationFailureHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,8 +55,8 @@ public final class OAuth2ErrorAuthenticationFailureHandler implements Authentica ServletServerHttpResponse httpResponse = new ServletServerHttpResponse(response); httpResponse.setStatusCode(HttpStatus.BAD_REQUEST); - if (authenticationException instanceof OAuth2AuthenticationException oAuth2AuthenticationException) { - OAuth2Error error = oAuth2AuthenticationException.getError(); + if (authenticationException instanceof OAuth2AuthenticationException oauth2AuthenticationException) { + OAuth2Error error = oauth2AuthenticationException.getError(); this.errorResponseConverter.write(error, null, httpResponse); } else { diff --git a/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java index 50fe5be8..5a0e546e 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityAuthenticationSuccessHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -52,8 +52,8 @@ public final class FederatedIdentityAuthenticationSuccessHandler implements Auth if (authentication instanceof OAuth2AuthenticationToken) { if (authentication.getPrincipal() instanceof OidcUser oidcUser) { this.oidcUserHandler.accept(oidcUser); - } else if (authentication.getPrincipal() instanceof OAuth2User oAuth2User) { - this.oauth2UserHandler.accept(oAuth2User); + } else if (authentication.getPrincipal() instanceof OAuth2User oauth2User) { + this.oauth2UserHandler.accept(oauth2User); } } diff --git a/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java index 2e17a81a..e8a4cbfc 100644 --- a/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java +++ b/samples/demo-authorizationserver/src/main/java/sample/federation/FederatedIdentityIdTokenCustomizer.java @@ -1,5 +1,5 @@ /* - * Copyright 2020-2023 the original author or authors. + * Copyright 2020-2025 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.