Ensure RestTemplate interceptors remain mutable

Fixes gh-4553
spring-projects · Nov 19, 2015 · 8708a07 · 8708a07
1 parent 3dda029
commit 8708a07
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/...boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java b/...boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfiguration.java
@@ -114,8 +114,7 @@ public OAuth2RestTemplate userInfoRestTemplate() {
 				this.details = DEFAULT_RESOURCE_DETAILS;
 			}
 			OAuth2RestTemplate template = getTemplate();
-			template.setInterceptors(Arrays.<ClientHttpRequestInterceptor>asList(
-					new AcceptJsonRequestInterceptor()));
+			template.getInterceptors().add(new AcceptJsonRequestInterceptor());
 			AuthorizationCodeAccessTokenProvider accessTokenProvider = new AuthorizationCodeAccessTokenProvider();
 			accessTokenProvider.setTokenRequestEnhancer(new AcceptJsonRequestEnhancer());
 			template.setAccessTokenProvider(accessTokenProvider);

diff --git a/...autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java b/...autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java
@@ -16,6 +16,7 @@
 
 package org.springframework.boot.autoconfigure.security.oauth2.resource;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -41,11 +42,17 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpRequestExecution;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.ClientHttpResponse;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
+import org.springframework.security.oauth2.client.OAuth2RestTemplate;
 import org.springframework.security.oauth2.provider.token.DefaultTokenServices;
 import org.springframework.security.oauth2.provider.token.RemoteTokenServices;
 import org.springframework.social.connect.ConnectionFactoryLocator;
+import org.springframework.stereotype.Component;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import static org.junit.Assert.assertEquals;
@@ -147,6 +154,19 @@ public void preferUserInfo() {
 		assertNotNull(services);
 	}
 
+	@Test
+	public void userInfoWithCustomizer() {
+		EnvironmentTestUtils.addEnvironment(this.environment,
+				"security.oauth2.resource.userInfoUri:http://example.com",
+				"security.oauth2.resource.tokenInfoUri:http://example.com",
+				"security.oauth2.resource.preferTokenInfo:false");
+		this.context = new SpringApplicationBuilder(ResourceConfiguration.class,
+				Customizer.class).environment(this.environment).web(false).run();
+		UserInfoTokenServices services = this.context
+				.getBean(UserInfoTokenServices.class);
+		assertNotNull(services);
+	}
+
 	@Test
 	public void switchToJwt() {
 		EnvironmentTestUtils.addEnvironment(this.environment,
@@ -245,4 +265,21 @@ public EmbeddedServletContainerFactory embeddedServletContainerFactory() {
 
 	}
 
+	@Component
+	protected static class Customizer implements UserInfoRestTemplateCustomizer {
+
+		@Override
+		public void customize(OAuth2RestTemplate template) {
+			template.getInterceptors().add(new ClientHttpRequestInterceptor() {
+
+				@Override
+				public ClientHttpResponse intercept(HttpRequest request, byte[] body,
+						ClientHttpRequestExecution execution) throws IOException {
+					return execution.execute(request, body);
+				}
+			});
+		}
+
+	}
+
 }