From 20d47ecaa0fac79b8ace19cf7ce20ee1a9292795 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Wed, 21 Jul 2021 11:05:31 -0400 Subject: [PATCH] Make Filter implementations final Closes gh-359 --- .../oidc/web/OidcClientRegistrationEndpointFilter.java | 2 +- .../web/OidcProviderConfigurationEndpointFilter.java | 2 +- .../authorization/web/NimbusJwkSetEndpointFilter.java | 2 +- .../web/OAuth2AuthorizationEndpointFilter.java | 10 +++++----- ...Auth2AuthorizationServerMetadataEndpointFilter.java | 2 +- .../web/OAuth2ClientAuthenticationFilter.java | 8 ++++---- .../authorization/web/OAuth2TokenEndpointFilter.java | 8 ++++---- .../web/OAuth2TokenIntrospectionEndpointFilter.java | 2 +- .../web/OAuth2TokenRevocationEndpointFilter.java | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java index 7c7f1863..38b601ea 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcClientRegistrationEndpointFilter.java @@ -51,7 +51,7 @@ import org.springframework.web.filter.OncePerRequestFilter; * @see OidcClientRegistration * @see 3. Client Registration Endpoint */ -public class OidcClientRegistrationEndpointFilter extends OncePerRequestFilter { +public final class OidcClientRegistrationEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for OpenID Client Registration requests. */ diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java index 4b8d4a3b..b340c04b 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/oidc/web/OidcProviderConfigurationEndpointFilter.java @@ -47,7 +47,7 @@ import java.io.IOException; * @see ProviderSettings * @see 4.1. OpenID Provider Configuration Request */ -public class OidcProviderConfigurationEndpointFilter extends OncePerRequestFilter { +public final class OidcProviderConfigurationEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for OpenID Provider Configuration requests. */ diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java index 48f76b35..40a53510 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/NimbusJwkSetEndpointFilter.java @@ -45,7 +45,7 @@ import org.springframework.web.filter.OncePerRequestFilter; * @see JSON Web Key (JWK) * @see Section 5 JWK Set Format */ -public class NimbusJwkSetEndpointFilter extends OncePerRequestFilter { +public final class NimbusJwkSetEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for JWK Set requests. */ 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 e0fcea86..d2014cc7 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 @@ -75,7 +75,7 @@ import org.springframework.web.util.UriComponentsBuilder; * @see Section 4.1.1 Authorization Request * @see Section 4.1.2 Authorization Response */ -public class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilter { +public final class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for authorization requests. */ @@ -205,7 +205,7 @@ public class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilter { * * @param authenticationConverter the {@link AuthenticationConverter} used when attempting to extract an Authorization Request (or Consent) from {@link HttpServletRequest} */ - public final void setAuthenticationConverter(AuthenticationConverter authenticationConverter) { + public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) { Assert.notNull(authenticationConverter, "authenticationConverter cannot be null"); this.authenticationConverter = authenticationConverter; } @@ -216,7 +216,7 @@ public class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilter { * * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used for handling an {@link OAuth2AuthorizationCodeRequestAuthenticationToken} */ - public final void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) { + public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) { Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null"); this.authenticationSuccessHandler = authenticationSuccessHandler; } @@ -227,7 +227,7 @@ public class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilter { * * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used for handling an {@link OAuth2AuthorizationCodeRequestAuthenticationException} */ - public final void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) { + public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) { Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null"); this.authenticationFailureHandler = authenticationFailureHandler; } @@ -238,7 +238,7 @@ public class OAuth2AuthorizationEndpointFilter extends OncePerRequestFilter { * * @param consentPage the URI of the custom consent page to redirect to if consent is required (e.g. "/oauth2/consent") */ - public final void setConsentPage(String consentPage) { + public void setConsentPage(String consentPage) { this.consentPage = consentPage; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java index 28f9bf51..422beb31 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationServerMetadataEndpointFilter.java @@ -48,7 +48,7 @@ import org.springframework.web.util.UriComponentsBuilder; * @see ProviderSettings * @see 3. Obtaining Authorization Server Metadata */ -public class OAuth2AuthorizationServerMetadataEndpointFilter extends OncePerRequestFilter { +public final class OAuth2AuthorizationServerMetadataEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for OAuth 2.0 Authorization Server Metadata requests. */ 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 9a793e5f..e347329b 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 @@ -62,7 +62,7 @@ import org.springframework.web.filter.OncePerRequestFilter; * @see Section 2.3 Client Authentication * @see Section 3.2.1 Token Endpoint Client Authentication */ -public class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter { +public final class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter { private final AuthenticationManager authenticationManager; private final RequestMatcher requestMatcher; private final HttpMessageConverter errorHttpResponseConverter = new OAuth2ErrorHttpMessageConverter(); @@ -121,7 +121,7 @@ public class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter { * * @param authenticationConverter used for converting a {@link HttpServletRequest} to an {@link OAuth2ClientAuthenticationToken} */ - public final void setAuthenticationConverter(AuthenticationConverter authenticationConverter) { + public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) { Assert.notNull(authenticationConverter, "authenticationConverter cannot be null"); this.authenticationConverter = authenticationConverter; } @@ -131,7 +131,7 @@ public class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter { * * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used for handling successful authentications */ - public final void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) { + public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) { Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null"); this.authenticationSuccessHandler = authenticationSuccessHandler; } @@ -141,7 +141,7 @@ public class OAuth2ClientAuthenticationFilter extends OncePerRequestFilter { * * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used for handling failed authentications */ - public final void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) { + public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) { Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null"); this.authenticationFailureHandler = authenticationFailureHandler; } 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 e1db5bf8..c578c886 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 @@ -91,7 +91,7 @@ import org.springframework.web.filter.OncePerRequestFilter; * @see OAuth2ClientCredentialsAuthenticationProvider * @see Section 3.2 Token Endpoint */ -public class OAuth2TokenEndpointFilter extends OncePerRequestFilter { +public final class OAuth2TokenEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for access token requests. */ @@ -176,7 +176,7 @@ public class OAuth2TokenEndpointFilter extends OncePerRequestFilter { * * @param authenticationConverter the {@link AuthenticationConverter} used when attempting to extract an Access Token Request from {@link HttpServletRequest} */ - public final void setAuthenticationConverter(AuthenticationConverter authenticationConverter) { + public void setAuthenticationConverter(AuthenticationConverter authenticationConverter) { Assert.notNull(authenticationConverter, "authenticationConverter cannot be null"); this.authenticationConverter = authenticationConverter; } @@ -187,7 +187,7 @@ public class OAuth2TokenEndpointFilter extends OncePerRequestFilter { * * @param authenticationSuccessHandler the {@link AuthenticationSuccessHandler} used for handling an {@link OAuth2AccessTokenAuthenticationToken} */ - public final void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) { + public void setAuthenticationSuccessHandler(AuthenticationSuccessHandler authenticationSuccessHandler) { Assert.notNull(authenticationSuccessHandler, "authenticationSuccessHandler cannot be null"); this.authenticationSuccessHandler = authenticationSuccessHandler; } @@ -198,7 +198,7 @@ public class OAuth2TokenEndpointFilter extends OncePerRequestFilter { * * @param authenticationFailureHandler the {@link AuthenticationFailureHandler} used for handling an {@link OAuth2AuthenticationException} */ - public final void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) { + public void setAuthenticationFailureHandler(AuthenticationFailureHandler authenticationFailureHandler) { Assert.notNull(authenticationFailureHandler, "authenticationFailureHandler cannot be null"); this.authenticationFailureHandler = authenticationFailureHandler; } diff --git a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java index fbdb0159..7ff3de19 100644 --- a/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java +++ b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2TokenIntrospectionEndpointFilter.java @@ -58,7 +58,7 @@ import org.springframework.web.filter.OncePerRequestFilter; * @see Section 2.1 Introspection Request * @since 0.1.1 */ -public class OAuth2TokenIntrospectionEndpointFilter extends OncePerRequestFilter { +public final class OAuth2TokenIntrospectionEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for token introspection requests. */ 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 400993ae..df9a2399 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 the original author or authors. + * Copyright 2020-2021 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. @@ -53,7 +53,7 @@ import java.io.IOException; * @see Section 2.1 Revocation Request * @since 0.0.3 */ -public class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFilter { +public final class OAuth2TokenRevocationEndpointFilter extends OncePerRequestFilter { /** * The default endpoint {@code URI} for token revocation requests. */