3c6571044d
Closes gh-219
210 lines
9.0 KiB
Java
210 lines
9.0 KiB
Java
/*
|
|
* Copyright 2020 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.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* https://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
package org.springframework.security.oauth2.server.authorization.web;
|
|
|
|
import org.junit.After;
|
|
import org.junit.Before;
|
|
import org.junit.Test;
|
|
import org.springframework.http.HttpStatus;
|
|
import org.springframework.http.converter.HttpMessageConverter;
|
|
import org.springframework.mock.http.client.MockClientHttpResponse;
|
|
import org.springframework.mock.web.MockHttpServletRequest;
|
|
import org.springframework.mock.web.MockHttpServletResponse;
|
|
import org.springframework.security.authentication.AuthenticationManager;
|
|
import org.springframework.security.core.Authentication;
|
|
import org.springframework.security.core.context.SecurityContext;
|
|
import org.springframework.security.core.context.SecurityContextHolder;
|
|
import org.springframework.security.oauth2.core.OAuth2AccessToken;
|
|
import org.springframework.security.oauth2.core.OAuth2Error;
|
|
import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
|
|
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames2;
|
|
import org.springframework.security.oauth2.core.http.converter.OAuth2ErrorHttpMessageConverter;
|
|
import org.springframework.security.oauth2.core.OAuth2TokenType;
|
|
import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken;
|
|
import org.springframework.security.oauth2.server.authorization.authentication.OAuth2TokenRevocationAuthenticationToken;
|
|
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
|
|
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
|
|
|
|
import javax.servlet.FilterChain;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import java.time.Duration;
|
|
import java.time.Instant;
|
|
import java.util.Arrays;
|
|
import java.util.HashSet;
|
|
import java.util.function.Consumer;
|
|
|
|
import static org.assertj.core.api.Assertions.assertThat;
|
|
import static org.assertj.core.api.Assertions.assertThatThrownBy;
|
|
import static org.mockito.ArgumentMatchers.any;
|
|
import static org.mockito.Mockito.mock;
|
|
import static org.mockito.Mockito.verify;
|
|
import static org.mockito.Mockito.verifyNoInteractions;
|
|
import static org.mockito.Mockito.when;
|
|
|
|
/**
|
|
* Tests for {@link OAuth2TokenRevocationEndpointFilter}.
|
|
*
|
|
* @author Vivek Babu
|
|
* @author Joe Grandja
|
|
*/
|
|
public class OAuth2TokenRevocationEndpointFilterTests {
|
|
private AuthenticationManager authenticationManager;
|
|
private OAuth2TokenRevocationEndpointFilter filter;
|
|
private final HttpMessageConverter<OAuth2Error> errorHttpResponseConverter =
|
|
new OAuth2ErrorHttpMessageConverter();
|
|
|
|
@Before
|
|
public void setUp() {
|
|
this.authenticationManager = mock(AuthenticationManager.class);
|
|
this.filter = new OAuth2TokenRevocationEndpointFilter(this.authenticationManager);
|
|
}
|
|
|
|
@After
|
|
public void cleanup() {
|
|
SecurityContextHolder.clearContext();
|
|
}
|
|
|
|
@Test
|
|
public void constructorWhenAuthenticationManagerNullThenThrowIllegalArgumentException() {
|
|
assertThatThrownBy(() -> new OAuth2TokenRevocationEndpointFilter(null))
|
|
.isInstanceOf(IllegalArgumentException.class)
|
|
.hasMessage("authenticationManager cannot be null");
|
|
}
|
|
|
|
@Test
|
|
public void constructorWhenTokenRevocationEndpointUriNullThenThrowIllegalArgumentException() {
|
|
assertThatThrownBy(() -> new OAuth2TokenRevocationEndpointFilter(this.authenticationManager, null))
|
|
.isInstanceOf(IllegalArgumentException.class)
|
|
.hasMessage("tokenRevocationEndpointUri cannot be empty");
|
|
}
|
|
|
|
@Test
|
|
public void doFilterWhenNotTokenRevocationRequestThenNotProcessed() throws Exception {
|
|
String requestUri = "/path";
|
|
MockHttpServletRequest request = new MockHttpServletRequest("POST", requestUri);
|
|
request.setServletPath(requestUri);
|
|
MockHttpServletResponse response = new MockHttpServletResponse();
|
|
FilterChain filterChain = mock(FilterChain.class);
|
|
|
|
this.filter.doFilter(request, response, filterChain);
|
|
|
|
verify(filterChain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
|
|
}
|
|
|
|
@Test
|
|
public void doFilterWhenTokenRevocationRequestGetThenNotProcessed() throws Exception {
|
|
String requestUri = OAuth2TokenRevocationEndpointFilter.DEFAULT_TOKEN_REVOCATION_ENDPOINT_URI;
|
|
MockHttpServletRequest request = new MockHttpServletRequest("GET", requestUri);
|
|
request.setServletPath(requestUri);
|
|
MockHttpServletResponse response = new MockHttpServletResponse();
|
|
FilterChain filterChain = mock(FilterChain.class);
|
|
|
|
this.filter.doFilter(request, response, filterChain);
|
|
|
|
verify(filterChain).doFilter(any(HttpServletRequest.class), any(HttpServletResponse.class));
|
|
}
|
|
|
|
@Test
|
|
public void doFilterWhenTokenRevocationRequestMissingTokenThenInvalidRequestError() throws Exception {
|
|
doFilterWhenTokenRevocationRequestInvalidParameterThenError(
|
|
OAuth2ParameterNames2.TOKEN,
|
|
OAuth2ErrorCodes.INVALID_REQUEST,
|
|
request -> request.removeParameter(OAuth2ParameterNames2.TOKEN));
|
|
}
|
|
|
|
@Test
|
|
public void doFilterWhenTokenRevocationRequestMultipleTokenThenInvalidRequestError() throws Exception {
|
|
doFilterWhenTokenRevocationRequestInvalidParameterThenError(
|
|
OAuth2ParameterNames2.TOKEN,
|
|
OAuth2ErrorCodes.INVALID_REQUEST,
|
|
request -> request.addParameter(OAuth2ParameterNames2.TOKEN, "token-2"));
|
|
}
|
|
|
|
@Test
|
|
public void doFilterWhenTokenRevocationRequestMultipleTokenTypeHintThenInvalidRequestError() throws Exception {
|
|
doFilterWhenTokenRevocationRequestInvalidParameterThenError(
|
|
OAuth2ParameterNames2.TOKEN_TYPE_HINT,
|
|
OAuth2ErrorCodes.INVALID_REQUEST,
|
|
request -> request.addParameter(OAuth2ParameterNames2.TOKEN_TYPE_HINT, OAuth2TokenType.ACCESS_TOKEN.getValue()));
|
|
}
|
|
|
|
@Test
|
|
public void doFilterWhenTokenRevocationRequestValidThenSuccessResponse() throws Exception {
|
|
RegisteredClient registeredClient = TestRegisteredClients.registeredClient().build();
|
|
Authentication clientPrincipal = new OAuth2ClientAuthenticationToken(registeredClient);
|
|
OAuth2AccessToken accessToken = new OAuth2AccessToken(
|
|
OAuth2AccessToken.TokenType.BEARER, "token",
|
|
Instant.now(), Instant.now().plus(Duration.ofHours(1)),
|
|
new HashSet<>(Arrays.asList("scope1", "scope2")));
|
|
OAuth2TokenRevocationAuthenticationToken tokenRevocationAuthentication =
|
|
new OAuth2TokenRevocationAuthenticationToken(
|
|
accessToken, clientPrincipal);
|
|
|
|
when(this.authenticationManager.authenticate(any())).thenReturn(tokenRevocationAuthentication);
|
|
|
|
SecurityContext securityContext = SecurityContextHolder.createEmptyContext();
|
|
securityContext.setAuthentication(clientPrincipal);
|
|
SecurityContextHolder.setContext(securityContext);
|
|
|
|
MockHttpServletRequest request = createTokenRevocationRequest();
|
|
MockHttpServletResponse response = new MockHttpServletResponse();
|
|
FilterChain filterChain = mock(FilterChain.class);
|
|
|
|
this.filter.doFilter(request, response, filterChain);
|
|
|
|
verifyNoInteractions(filterChain);
|
|
verify(this.authenticationManager).authenticate(any());
|
|
|
|
assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
|
|
}
|
|
|
|
private void doFilterWhenTokenRevocationRequestInvalidParameterThenError(String parameterName, String errorCode,
|
|
Consumer<MockHttpServletRequest> requestConsumer) throws Exception {
|
|
|
|
MockHttpServletRequest request = createTokenRevocationRequest();
|
|
requestConsumer.accept(request);
|
|
MockHttpServletResponse response = new MockHttpServletResponse();
|
|
FilterChain filterChain = mock(FilterChain.class);
|
|
|
|
this.filter.doFilter(request, response, filterChain);
|
|
|
|
verifyNoInteractions(filterChain);
|
|
|
|
assertThat(response.getStatus()).isEqualTo(HttpStatus.BAD_REQUEST.value());
|
|
OAuth2Error error = readError(response);
|
|
assertThat(error.getErrorCode()).isEqualTo(errorCode);
|
|
assertThat(error.getDescription()).isEqualTo("OAuth 2.0 Token Revocation Parameter: " + parameterName);
|
|
}
|
|
|
|
private OAuth2Error readError(MockHttpServletResponse response) throws Exception {
|
|
MockClientHttpResponse httpResponse = new MockClientHttpResponse(
|
|
response.getContentAsByteArray(), HttpStatus.valueOf(response.getStatus()));
|
|
return this.errorHttpResponseConverter.read(OAuth2Error.class, httpResponse);
|
|
}
|
|
|
|
private static MockHttpServletRequest createTokenRevocationRequest() {
|
|
String requestUri = OAuth2TokenRevocationEndpointFilter.DEFAULT_TOKEN_REVOCATION_ENDPOINT_URI;
|
|
MockHttpServletRequest request = new MockHttpServletRequest("POST", requestUri);
|
|
request.setServletPath(requestUri);
|
|
|
|
request.addParameter(OAuth2ParameterNames2.TOKEN, "token");
|
|
request.addParameter(OAuth2ParameterNames2.TOKEN_TYPE_HINT, OAuth2TokenType.ACCESS_TOKEN.getValue());
|
|
|
|
return request;
|
|
}
|
|
}
|