diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java index e0aece2244..a6f6482a94 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/builders/FilterComparator.java @@ -89,7 +89,7 @@ final class FilterComparator implements Comparator, Serializable { order); order += STEP; filterToOrder.put( - "org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationProcessingFilter", + "org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationFilter", order); order += STEP; put(UsernamePasswordAuthenticationFilter.class, order); diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/AuthorizationCodeAuthenticationFilterConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/AuthorizationCodeAuthenticationFilterConfigurer.java index bd58eccfd3..c764ca8ed7 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/AuthorizationCodeAuthenticationFilterConfigurer.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/client/AuthorizationCodeAuthenticationFilterConfigurer.java @@ -33,7 +33,7 @@ import org.springframework.security.oauth2.client.user.CustomUserTypesOAuth2User import org.springframework.security.oauth2.client.user.DefaultOAuth2UserService; import org.springframework.security.oauth2.client.user.DelegatingOAuth2UserService; import org.springframework.security.oauth2.client.user.OAuth2UserService; -import org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationProcessingFilter; +import org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationFilter; import org.springframework.security.oauth2.client.web.AuthorizationGrantTokenExchanger; import org.springframework.security.oauth2.client.web.nimbus.NimbusAuthorizationCodeTokenExchanger; import org.springframework.security.oauth2.core.AccessToken; @@ -53,7 +53,7 @@ import java.util.Map; * @author Joe Grandja */ final class AuthorizationCodeAuthenticationFilterConfigurer, R extends RequestMatcher> extends - AbstractAuthenticationFilterConfigurer, AuthorizationCodeAuthenticationProcessingFilter> { + AbstractAuthenticationFilterConfigurer, AuthorizationCodeAuthenticationFilter> { private R authorizationResponseMatcher; private AuthorizationGrantAuthenticator authorizationCodeAuthenticator; @@ -65,7 +65,7 @@ final class AuthorizationCodeAuthenticationFilterConfigurer authorizationResponseMatcher(R authorizationResponseMatcher) { @@ -148,7 +148,7 @@ final class AuthorizationCodeAuthenticationFilterConfigurerSection 4.1 Authorization Code Grant Flow * @see Section 4.1.2 Authorization Response */ -public class AuthorizationCodeAuthenticationProcessingFilter extends AbstractAuthenticationProcessingFilter { +public class AuthorizationCodeAuthenticationFilter extends AbstractAuthenticationProcessingFilter { public static final String DEFAULT_AUTHORIZATION_RESPONSE_BASE_URI = "/oauth2/authorize/code"; private static final String AUTHORIZATION_REQUEST_NOT_FOUND_ERROR_CODE = "authorization_request_not_found"; private static final String INVALID_STATE_PARAMETER_ERROR_CODE = "invalid_state_parameter"; @@ -94,7 +94,7 @@ public class AuthorizationCodeAuthenticationProcessingFilter extends AbstractAut private AuthorizationRequestRepository authorizationRequestRepository = new HttpSessionAuthorizationRequestRepository(); private final ClientRegistrationIdentifierStrategy providerIdentifierStrategy = new ProviderIdentifierStrategy(); - public AuthorizationCodeAuthenticationProcessingFilter() { + public AuthorizationCodeAuthenticationFilter() { super(new AuthorizationResponseMatcher()); } diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationCodeRequestRedirectFilter.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationCodeRequestRedirectFilter.java index da97192a89..c49706d4ad 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationCodeRequestRedirectFilter.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationCodeRequestRedirectFilter.java @@ -47,7 +47,7 @@ import java.util.Map; * It uses an {@link AuthorizationRequestUriBuilder} to build the OAuth 2.0 Authorization Request, * which is used as the redirect URI to the Authorization Endpoint. * The redirect URI will include the client identifier, requested scope(s), state, response type, and a redirection URI - * which the authorization server will send the user-agent back to (handled by {@link AuthorizationCodeAuthenticationProcessingFilter}) + * which the authorization server will send the user-agent back to (handled by {@link AuthorizationCodeAuthenticationFilter}) * once access is granted (or denied) by the end-user (resource owner). * * @author Joe Grandja @@ -57,7 +57,7 @@ import java.util.Map; * @see AuthorizationRequestUriBuilder * @see ClientRegistration * @see ClientRegistrationRepository - * @see AuthorizationCodeAuthenticationProcessingFilter + * @see AuthorizationCodeAuthenticationFilter * @see Section 4.1 Authorization Code Grant Flow * @see Section 4.1.1 Authorization Request */ diff --git a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java index 12d87cfad3..f110c1248e 100644 --- a/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java +++ b/oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/AuthorizationRequestRepository.java @@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletResponse; *

* Used by the {@link AuthorizationCodeRequestRedirectFilter} for persisting the Authorization Request * before it initiates the authorization code grant flow. - * As well, used by the {@link AuthorizationCodeAuthenticationProcessingFilter} when resolving + * As well, used by the {@link AuthorizationCodeAuthenticationFilter} when resolving * the associated Authorization Request during the handling of the Authorization Response. * * @author Joe Grandja diff --git a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/AuthorizationCodeAuthenticationProcessingFilterTests.java b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/AuthorizationCodeAuthenticationFilterTests.java similarity index 91% rename from oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/AuthorizationCodeAuthenticationProcessingFilterTests.java rename to oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/AuthorizationCodeAuthenticationFilterTests.java index d36590bd95..08c6eada39 100644 --- a/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/AuthorizationCodeAuthenticationProcessingFilterTests.java +++ b/oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/AuthorizationCodeAuthenticationFilterTests.java @@ -49,17 +49,17 @@ import java.util.Map; import static org.mockito.Mockito.mock; /** - * Tests {@link AuthorizationCodeAuthenticationProcessingFilter}. + * Tests {@link AuthorizationCodeAuthenticationFilter}. * * @author Joe Grandja */ -public class AuthorizationCodeAuthenticationProcessingFilterTests { +public class AuthorizationCodeAuthenticationFilterTests { @Test public void doFilterWhenNotAuthorizationCodeResponseThenContinueChain() throws Exception { ClientRegistration clientRegistration = TestUtil.googleClientRegistration(); - AuthorizationCodeAuthenticationProcessingFilter filter = Mockito.spy(setupFilter(clientRegistration)); + AuthorizationCodeAuthenticationFilter filter = Mockito.spy(setupFilter(clientRegistration)); String requestURI = "/path"; MockHttpServletRequest request = new MockHttpServletRequest("GET", requestURI); @@ -77,7 +77,7 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { public void doFilterWhenAuthorizationCodeErrorResponseThenAuthenticationFailureHandlerIsCalled() throws Exception { ClientRegistration clientRegistration = TestUtil.githubClientRegistration(); - AuthorizationCodeAuthenticationProcessingFilter filter = Mockito.spy(setupFilter(clientRegistration)); + AuthorizationCodeAuthenticationFilter filter = Mockito.spy(setupFilter(clientRegistration)); AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class); filter.setAuthenticationFailureHandler(failureHandler); @@ -106,7 +106,7 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { AuthenticationManager authenticationManager = mock(AuthenticationManager.class); Mockito.when(authenticationManager.authenticate(Matchers.any(Authentication.class))).thenReturn(clientAuthentication); - AuthorizationCodeAuthenticationProcessingFilter filter = Mockito.spy(setupFilter(authenticationManager, clientRegistration)); + AuthorizationCodeAuthenticationFilter filter = Mockito.spy(setupFilter(authenticationManager, clientRegistration)); AuthenticationSuccessHandler successHandler = mock(AuthenticationSuccessHandler.class); filter.setAuthenticationSuccessHandler(successHandler); AuthorizationRequestRepository authorizationRequestRepository = new HttpSessionAuthorizationRequestRepository(); @@ -135,7 +135,7 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { public void doFilterWhenAuthorizationCodeSuccessResponseAndNoMatchingAuthorizationRequestThenThrowOAuth2AuthenticationExceptionAuthorizationRequestNotFound() throws Exception { ClientRegistration clientRegistration = TestUtil.githubClientRegistration(); - AuthorizationCodeAuthenticationProcessingFilter filter = Mockito.spy(setupFilter(clientRegistration)); + AuthorizationCodeAuthenticationFilter filter = Mockito.spy(setupFilter(clientRegistration)); AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class); filter.setAuthenticationFailureHandler(failureHandler); @@ -156,7 +156,7 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { public void doFilterWhenAuthorizationCodeSuccessResponseWithInvalidStateParamThenThrowOAuth2AuthenticationExceptionInvalidStateParameter() throws Exception { ClientRegistration clientRegistration = TestUtil.githubClientRegistration(); - AuthorizationCodeAuthenticationProcessingFilter filter = Mockito.spy(setupFilter(clientRegistration)); + AuthorizationCodeAuthenticationFilter filter = Mockito.spy(setupFilter(clientRegistration)); AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class); filter.setAuthenticationFailureHandler(failureHandler); AuthorizationRequestRepository authorizationRequestRepository = new HttpSessionAuthorizationRequestRepository(); @@ -180,7 +180,7 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { public void doFilterWhenAuthorizationCodeSuccessResponseWithInvalidRedirectUriParamThenThrowOAuth2AuthenticationExceptionInvalidRedirectUriParameter() throws Exception { ClientRegistration clientRegistration = TestUtil.githubClientRegistration(); - AuthorizationCodeAuthenticationProcessingFilter filter = Mockito.spy(setupFilter(clientRegistration)); + AuthorizationCodeAuthenticationFilter filter = Mockito.spy(setupFilter(clientRegistration)); AuthenticationFailureHandler failureHandler = mock(AuthenticationFailureHandler.class); filter.setAuthenticationFailureHandler(failureHandler); AuthorizationRequestRepository authorizationRequestRepository = new HttpSessionAuthorizationRequestRepository(); @@ -201,7 +201,7 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { verifyThrowsOAuth2AuthenticationExceptionWithErrorCode(filter, failureHandler, "invalid_redirect_uri_parameter"); } - private void verifyThrowsOAuth2AuthenticationExceptionWithErrorCode(AuthorizationCodeAuthenticationProcessingFilter filter, + private void verifyThrowsOAuth2AuthenticationExceptionWithErrorCode(AuthorizationCodeAuthenticationFilter filter, AuthenticationFailureHandler failureHandler, String errorCode) throws Exception { @@ -218,18 +218,18 @@ public class AuthorizationCodeAuthenticationProcessingFilterTests { Assertions.assertThat(oauth2AuthenticationException.getErrorObject().getErrorCode()).isEqualTo(errorCode); } - private AuthorizationCodeAuthenticationProcessingFilter setupFilter(ClientRegistration... clientRegistrations) throws Exception { + private AuthorizationCodeAuthenticationFilter setupFilter(ClientRegistration... clientRegistrations) throws Exception { AuthenticationManager authenticationManager = mock(AuthenticationManager.class); return setupFilter(authenticationManager, clientRegistrations); } - private AuthorizationCodeAuthenticationProcessingFilter setupFilter( + private AuthorizationCodeAuthenticationFilter setupFilter( AuthenticationManager authenticationManager, ClientRegistration... clientRegistrations) throws Exception { ClientRegistrationRepository clientRegistrationRepository = TestUtil.clientRegistrationRepository(clientRegistrations); - AuthorizationCodeAuthenticationProcessingFilter filter = new AuthorizationCodeAuthenticationProcessingFilter(); + AuthorizationCodeAuthenticationFilter filter = new AuthorizationCodeAuthenticationFilter(); filter.setClientRegistrationRepository(clientRegistrationRepository); filter.setAuthenticationManager(authenticationManager); diff --git a/samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java b/samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java index 7e23b43260..236a356185 100644 --- a/samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java +++ b/samples/boot/oauth2login/src/integration-test/java/org/springframework/security/samples/OAuth2LoginApplicationTests.java @@ -40,7 +40,7 @@ import org.springframework.security.oauth2.client.authentication.AuthorizationCo import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.user.OAuth2UserService; -import org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationProcessingFilter; +import org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationFilter; import org.springframework.security.oauth2.client.web.AuthorizationCodeRequestRedirectFilter; import org.springframework.security.oauth2.client.web.AuthorizationGrantTokenExchanger; import org.springframework.security.oauth2.core.AccessToken; @@ -73,7 +73,7 @@ import static org.mockito.Mockito.when; /** * Integration tests for the OAuth 2.0 client filters {@link AuthorizationCodeRequestRedirectFilter} - * and {@link AuthorizationCodeAuthenticationProcessingFilter}. + * and {@link AuthorizationCodeAuthenticationFilter}. * These filters work together to realize the Authorization Code Grant flow. * * @author Joe Grandja