From bdfbe3a87ef7d2b693d5ecb7dcf870d3ed53caed Mon Sep 17 00:00:00 2001 From: pahli Date: Wed, 31 May 2017 22:09:35 +0200 Subject: [PATCH] make secure ports for DefaultServerIntrospector configurable --- .../ribbon/DefaultServerIntrospector.java | 12 ++-- .../DefaultServerIntrospectorDefaultTest.java | 61 +++++++++++++++++++ .../ribbon/DefaultServerIntrospectorTest.java | 61 +++++++++++++++++++ 3 files changed, 129 insertions(+), 5 deletions(-) create mode 100644 spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java create mode 100644 spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java index 8c9053d6..11e515e7 100644 --- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java +++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospector.java @@ -16,22 +16,24 @@ package org.springframework.cloud.netflix.ribbon; -import java.util.Arrays; +import com.netflix.loadbalancer.Server; +import org.springframework.beans.factory.annotation.Value; + import java.util.Collections; import java.util.List; import java.util.Map; -import com.netflix.loadbalancer.Server; - /** * @author Spencer Gibb */ public class DefaultServerIntrospector implements ServerIntrospector { - private static final List SECURE_PORTS = Arrays.asList(443, 8443); + + @Value("#{T(java.util.Arrays).asList('${ribbon.securePorts:443,8443}')}") + private List securePorts; @Override public boolean isSecure(Server server) { - return SECURE_PORTS.contains(server.getPort()); + return securePorts.contains(server.getPort()); } @Override diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java new file mode 100644 index 00000000..0636d066 --- /dev/null +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorDefaultTest.java @@ -0,0 +1,61 @@ +/* + * 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.ribbon; + +import com.netflix.loadbalancer.Server; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * @author Rico Pahlisch + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = DefaultServerIntrospectorDefaultTest.TestConfiguration.class) +public class DefaultServerIntrospectorDefaultTest { + + @Autowired + private ServerIntrospector serverIntrospector; + + @Test + public void testDefaultSslPorts(){ + Server serverMock = mock(Server.class); + when(serverMock.getPort()).thenReturn(443); + Assert.assertTrue(serverIntrospector.isSecure(serverMock)); + when(serverMock.getPort()).thenReturn(8443); + Assert.assertTrue(serverIntrospector.isSecure(serverMock)); + + when(serverMock.getPort()).thenReturn(16443); + Assert.assertFalse(serverIntrospector.isSecure(serverMock)); + } + + @Configuration + protected static class TestConfiguration { + @Bean + public DefaultServerIntrospector defaultServerIntrospector(){ + return new DefaultServerIntrospector(); + } + } +} diff --git a/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java new file mode 100644 index 00000000..3bc9f404 --- /dev/null +++ b/spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/DefaultServerIntrospectorTest.java @@ -0,0 +1,61 @@ +/* + * 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.ribbon; + +import com.netflix.loadbalancer.Server; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.test.context.TestPropertySource; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +/** + * @author Rico Pahlisch + */ +@RunWith(SpringJUnit4ClassRunner.class) +@SpringBootTest(classes = DefaultServerIntrospectorTest.TestConfiguration.class) +@TestPropertySource(properties = { "ribbon.securePorts=12345" }) +public class DefaultServerIntrospectorTest { + + @Autowired + private ServerIntrospector serverIntrospector; + + @Test + public void testSecurePortConfiguration(){ + Server serverMock = mock(Server.class); + when(serverMock.getPort()).thenReturn(12345); + Assert.assertTrue(serverIntrospector.isSecure(serverMock)); + + when(serverMock.getPort()).thenReturn(443); + Assert.assertFalse(serverIntrospector.isSecure(serverMock)); + } + + @Configuration + protected static class TestConfiguration { + @Bean + public DefaultServerIntrospector defaultServerIntrospector(){ + return new DefaultServerIntrospector(); + } + } +}