From 25a1881127eca416c145dfd1299f44a3aa11efa7 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 22 May 2017 09:47:49 -0600 Subject: [PATCH] Ignore feign.hystrix.enabled. Let SecurityContextConcurrencyStrategy be installed as the hystrix concurrency strategy regardless of if feign's hystrix support is installed. fixes gh-1969 --- .../HystrixSecurityAutoConfiguration.java | 5 --- .../security/HystrixSecurityNoFeignTests.java | 42 +++++++++++++++++++ .../security/HystrixSecurityTests.java | 14 ++++++- 3 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityNoFeignTests.java diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java index 37cc3620..272f234e 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityAutoConfiguration.java @@ -74,11 +74,6 @@ public class HystrixSecurityAutoConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(name = "feign.hystrix.enabled", matchIfMissing = false) - static class HystrixEnabled { - - } - @ConditionalOnProperty(name = "hystrix.shareSecurityContext") static class ShareSecurityContext { diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityNoFeignTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityNoFeignTests.java new file mode 100644 index 00000000..e9a36fd3 --- /dev/null +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityNoFeignTests.java @@ -0,0 +1,42 @@ +/* + * Copyright 2013-2017 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 + * + * http://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.cloud.netflix.hystrix.security; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringRunner; + +import com.netflix.hystrix.strategy.HystrixPlugins; +import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@DirtiesContext +@SpringBootTest(classes = HystrixSecurityApplication.class) +public class HystrixSecurityNoFeignTests { + + @Test + public void testSecurityConcurrencyStrategyInstalled() { + HystrixConcurrencyStrategy concurrencyStrategy = HystrixPlugins.getInstance().getConcurrencyStrategy(); + assertThat(concurrencyStrategy).isInstanceOf(SecurityContextConcurrencyStrategy.class); + } + +} diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityTests.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityTests.java index 5f22f975..3ed019e3 100644 --- a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityTests.java +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/hystrix/security/HystrixSecurityTests.java @@ -18,6 +18,8 @@ package org.springframework.cloud.netflix.hystrix.security; import java.util.Base64; +import com.netflix.hystrix.strategy.HystrixPlugins; +import com.netflix.hystrix.strategy.concurrency.HystrixConcurrencyStrategy; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -33,6 +35,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.web.client.RestTemplate; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests that a secured web service returning values using a feign client properly access * the security context from a hystrix command. @@ -40,7 +44,9 @@ import org.springframework.web.client.RestTemplate; */ @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext -@SpringBootTest(classes = HystrixSecurityApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, properties = {"username.ribbon.listOfServers=localhost:${local.server.port}","feign.hystrix.enabled=true"}) +@SpringBootTest(classes = HystrixSecurityApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT, + properties = { "username.ribbon.listOfServers=localhost:${local.server.port}", + "feign.hystrix.enabled=true"}) public class HystrixSecurityTests { @Autowired private CustomConcurrenyStrategy customConcurrenyStrategy; @@ -54,6 +60,12 @@ public class HystrixSecurityTests { @Value("${security.user.password}") private String password; + @Test + public void testSecurityConcurrencyStrategyInstalled() { + HystrixConcurrencyStrategy concurrencyStrategy = HystrixPlugins.getInstance().getConcurrencyStrategy(); + assertThat(concurrencyStrategy).isInstanceOf(SecurityContextConcurrencyStrategy.class); + } + @Test public void testFeignHystrixSecurity() { HttpHeaders headers = HystrixSecurityTests.createBasicAuthHeader(username,