Add interceptors to AuthorizationServerEndpointsConfigurer

Fixes spring-atticgh-209
arthurgurov · Jun 10, 2014 · 4145668 · 4145668
1 parent 20903ff
commit 4145668
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/...rity/oauth2/config/annotation/web/configurers/AuthorizationServerEndpointsConfigurer.java b/...rity/oauth2/config/annotation/web/configurers/AuthorizationServerEndpointsConfigurer.java
@@ -53,6 +53,8 @@
 import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore;
 import org.springframework.security.oauth2.provider.token.store.JwtAccessTokenConverter;
 import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
+import org.springframework.web.context.request.WebRequestInterceptor;
+import org.springframework.web.servlet.HandlerInterceptor;
 
 /**
  * Configure the properties and enhanced functionality of the Authorization Server endpoints. 
@@ -97,6 +99,8 @@ public final class AuthorizationServerEndpointsConfigurer {
 
 	private boolean approvalStoreDisabled;
 
+	private List<Object> interceptors = new ArrayList<Object>();
+
 	public AuthorizationServerTokenServices getTokenServices() {
 		return tokenServices;
 	}
@@ -176,6 +180,16 @@ public AuthorizationServerEndpointsConfigurer pathMapping(String defaultPath, St
 		return this;
 	}
 
+	public AuthorizationServerEndpointsConfigurer addInterceptor(HandlerInterceptor interceptor) {
+		this.interceptors.add(interceptor);
+		return this;
+	}
+
+	public AuthorizationServerEndpointsConfigurer addInterceptor(WebRequestInterceptor interceptor) {
+		this.interceptors.add(interceptor);
+		return this;
+	}
+
 	public AuthorizationServerEndpointsConfigurer authenticationManager(AuthenticationManager authenticationManager) {
 		this.authenticationManager = authenticationManager;
 		return this;
@@ -387,6 +401,7 @@ private FrameworkEndpointHandlerMapping frameworkEndpointHandlerMapping() {
 		if (frameworkEndpointHandlerMapping == null) {
 			frameworkEndpointHandlerMapping = new FrameworkEndpointHandlerMapping();
 			frameworkEndpointHandlerMapping.setMappings(patternMap);
+			frameworkEndpointHandlerMapping.setInterceptors(interceptors .toArray());
 		}
 		return frameworkEndpointHandlerMapping;
 	}

diff --git a/...org/springframework/security/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java b/...org/springframework/security/oauth2/provider/token/DefaultAuthenticationKeyGenerator.java
@@ -24,7 +24,7 @@
 import org.springframework.security.oauth2.provider.OAuth2Request;
 
 /**
- * Basic key generator taking into account the client id, scope, reource ids and username (principal name) if they
+ * Basic key generator taking into account the client id, scope, resource ids and username (principal name) if they
  * exist.
  * 
  * @author Dave Syer

diff --git a/...ingframework/security/oauth2/config/annotation/AuthorizationServerConfigurationTests.java b/...ingframework/security/oauth2/config/annotation/AuthorizationServerConfigurationTests.java
@@ -61,6 +61,7 @@
 import org.springframework.security.oauth2.provider.token.store.JwtTokenStore;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 /**
  * @author Dave Syer
@@ -133,7 +134,7 @@ protected static class AuthorizationServerUnconfigured {
 	protected static class AuthorizationServerVanilla extends AuthorizationServerConfigurerAdapter implements Runnable {
 		@Autowired
 		private AuthorizationEndpoint endpoint;
-		
+
 		@Autowired
 		private ClientDetailsService clientDetailsService;
 
@@ -160,7 +161,8 @@ public void run() {
 			Map<String, Object> request = handler.getUserApprovalRequest(authorizationRequest,
 					new UsernamePasswordAuthenticationToken("user", "password"));
 			assertTrue(request.containsKey("scopes"));
-			assertTrue(clientDetailsService.loadClientByClientId("my-trusted-client").getAdditionalInformation().containsKey("foo"));
+			assertTrue(clientDetailsService.loadClientByClientId("my-trusted-client").getAdditionalInformation()
+					.containsKey("foo"));
 		}
 	}
 
@@ -251,7 +253,9 @@ public TokenApprovalStore approvalStore() {
 
 		@Override
 		public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception {
-			endpoints.tokenStore(tokenStore).approvalStore(approvalStore()).userApprovalHandler(userApprovalHandler());
+			endpoints.tokenStore(tokenStore).approvalStore(approvalStore()).userApprovalHandler(userApprovalHandler())
+					.addInterceptor(new HandlerInterceptorAdapter() {
+					});
 		}
 
 		@Override