From 51966d52d5c0b2f672011c647a54d23603b959f3 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Wed, 21 Jul 2021 11:24:35 -0400 Subject: [PATCH] Make AuthenticationProvider implementations final Closes gh-360 --- .../OAuth2AuthorizationCodeAuthenticationProvider.java | 4 ++-- .../OAuth2AuthorizationCodeRequestAuthenticationProvider.java | 2 +- .../authentication/OAuth2ClientAuthenticationProvider.java | 4 ++-- .../OAuth2ClientCredentialsAuthenticationProvider.java | 4 ++-- .../OAuth2RefreshTokenAuthenticationProvider.java | 4 ++-- .../OAuth2TokenIntrospectionAuthenticationProvider.java | 2 +- .../OAuth2TokenRevocationAuthenticationProvider.java | 2 +- .../OidcClientRegistrationAuthenticationProvider.java | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java index d8cda911..8d90240a 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeAuthenticationProvider.java @@ -69,7 +69,7 @@ import static org.springframework.security.oauth2.server.authorization.authentic * @see Section 4.1 Authorization Code Grant * @see Section 4.1.3 Access Token Request */ -public class OAuth2AuthorizationCodeAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2AuthorizationCodeAuthenticationProvider implements AuthenticationProvider { private static final OAuth2TokenType AUTHORIZATION_CODE_TOKEN_TYPE = new OAuth2TokenType(OAuth2ParameterNames.CODE); private static final OAuth2TokenType ID_TOKEN_TOKEN_TYPE = @@ -92,7 +92,7 @@ public class OAuth2AuthorizationCodeAuthenticationProvider implements Authentica this.jwtEncoder = jwtEncoder; } - public final void setJwtCustomizer(OAuth2TokenCustomizer jwtCustomizer) { + public void setJwtCustomizer(OAuth2TokenCustomizer jwtCustomizer) { Assert.notNull(jwtCustomizer, "jwtCustomizer cannot be null"); this.jwtCustomizer = jwtCustomizer; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java index 46993894..3dd47951 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2AuthorizationCodeRequestAuthenticationProvider.java @@ -63,7 +63,7 @@ import org.springframework.web.util.UriComponentsBuilder; * @see OAuth2AuthorizationConsentService * @see Section 4.1.1 Authorization Request */ -public class OAuth2AuthorizationCodeRequestAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2AuthorizationCodeRequestAuthenticationProvider implements AuthenticationProvider { private static final OAuth2TokenType STATE_TOKEN_TYPE = new OAuth2TokenType(OAuth2ParameterNames.STATE); private static final String PKCE_ERROR_URI = "https://datatracker.ietf.org/doc/html/rfc7636#section-4.4.1"; private static final Pattern LOOPBACK_ADDRESS_PATTERN = diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationProvider.java index 290f73c9..39ed684d 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationProvider.java @@ -55,7 +55,7 @@ import org.springframework.util.StringUtils; * @see OAuth2AuthorizationService * @see PasswordEncoder */ -public class OAuth2ClientAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2ClientAuthenticationProvider implements AuthenticationProvider { private static final OAuth2TokenType AUTHORIZATION_CODE_TOKEN_TYPE = new OAuth2TokenType(OAuth2ParameterNames.CODE); private final RegisteredClientRepository registeredClientRepository; private final OAuth2AuthorizationService authorizationService; @@ -84,7 +84,7 @@ public class OAuth2ClientAuthenticationProvider implements AuthenticationProvide * * @param passwordEncoder the {@link PasswordEncoder} used to validate the client secret */ - public final void setPasswordEncoder(PasswordEncoder passwordEncoder) { + public void setPasswordEncoder(PasswordEncoder passwordEncoder) { Assert.notNull(passwordEncoder, "passwordEncoder cannot be null"); this.passwordEncoder = passwordEncoder; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java index d8894217..96134f30 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientCredentialsAuthenticationProvider.java @@ -59,7 +59,7 @@ import static org.springframework.security.oauth2.server.authorization.authentic * @see Section 4.4 Client Credentials Grant * @see Section 4.4.2 Access Token Request */ -public class OAuth2ClientCredentialsAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2ClientCredentialsAuthenticationProvider implements AuthenticationProvider { private final OAuth2AuthorizationService authorizationService; private final JwtEncoder jwtEncoder; private OAuth2TokenCustomizer jwtCustomizer = (context) -> {}; @@ -79,7 +79,7 @@ public class OAuth2ClientCredentialsAuthenticationProvider implements Authentica this.jwtEncoder = jwtEncoder; } - public final void setJwtCustomizer(OAuth2TokenCustomizer jwtCustomizer) { + public void setJwtCustomizer(OAuth2TokenCustomizer jwtCustomizer) { Assert.notNull(jwtCustomizer, "jwtCustomizer cannot be null"); this.jwtCustomizer = jwtCustomizer; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java index 006d9da2..37d8a774 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2RefreshTokenAuthenticationProvider.java @@ -72,7 +72,7 @@ import static org.springframework.security.oauth2.server.authorization.authentic * @see Section 1.5 Refresh Token Grant * @see Section 6 Refreshing an Access Token */ -public class OAuth2RefreshTokenAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2RefreshTokenAuthenticationProvider implements AuthenticationProvider { private static final OAuth2TokenType ID_TOKEN_TOKEN_TYPE = new OAuth2TokenType(OidcParameterNames.ID_TOKEN); private static final StringKeyGenerator TOKEN_GENERATOR = new Base64StringKeyGenerator(Base64.getUrlEncoder().withoutPadding(), 96); private final OAuth2AuthorizationService authorizationService; @@ -94,7 +94,7 @@ public class OAuth2RefreshTokenAuthenticationProvider implements AuthenticationP this.jwtEncoder = jwtEncoder; } - public final void setJwtCustomizer(OAuth2TokenCustomizer jwtCustomizer) { + public void setJwtCustomizer(OAuth2TokenCustomizer jwtCustomizer) { Assert.notNull(jwtCustomizer, "jwtCustomizer cannot be null"); this.jwtCustomizer = jwtCustomizer; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java index 0e8039c7..46ccd503 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenIntrospectionAuthenticationProvider.java @@ -47,7 +47,7 @@ import static org.springframework.security.oauth2.server.authorization.authentic * @see OAuth2AuthorizationService * @see Section 2.1 Introspection Request */ -public class OAuth2TokenIntrospectionAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2TokenIntrospectionAuthenticationProvider implements AuthenticationProvider { private final RegisteredClientRepository registeredClientRepository; private final OAuth2AuthorizationService authorizationService; diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java index 8c7307ef..5b18ca4b 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2TokenRevocationAuthenticationProvider.java @@ -39,7 +39,7 @@ import static org.springframework.security.oauth2.server.authorization.authentic * @see OAuth2AuthorizationService * @see Section 2.1 Revocation Request */ -public class OAuth2TokenRevocationAuthenticationProvider implements AuthenticationProvider { +public final class OAuth2TokenRevocationAuthenticationProvider implements AuthenticationProvider { private final OAuth2AuthorizationService authorizationService; /** diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java index d6399a2e..9bae30aa 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/authentication/OidcClientRegistrationAuthenticationProvider.java @@ -54,7 +54,7 @@ import org.springframework.util.CollectionUtils; * @see OAuth2AuthorizationService * @see 3. Client Registration Endpoint */ -public class OidcClientRegistrationAuthenticationProvider implements AuthenticationProvider { +public final class OidcClientRegistrationAuthenticationProvider implements AuthenticationProvider { private static final StringKeyGenerator CLIENT_ID_GENERATOR = new Base64StringKeyGenerator( Base64.getUrlEncoder().withoutPadding(), 32); private static final StringKeyGenerator CLIENT_SECRET_GENERATOR = new Base64StringKeyGenerator(