Prevent double url encoding for secure ribbon urls (#1389)

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java

@@ -52,11 +52,10 @@ public class RibbonLoadBalancerClient implements LoadBalancerClient {
 		RibbonLoadBalancerContext context = this.clientFactory
 				.getLoadBalancerContext(serviceId);
 		Server server = new Server(instance.getHost(), instance.getPort());
-		boolean secure = isSecure(server, serviceId);
-		URI uri = original;
-		if (secure) {
-			uri = UriComponentsBuilder.fromUri(uri).scheme("https").build().toUri();
-		}
+		IClientConfig clientConfig = clientFactory.getClientConfig(serviceId);
+		ServerIntrospector serverIntrospector = serverIntrospector(serviceId);
+		URI uri = RibbonUtils.updateToHttpsIfNeeded(original, clientConfig,
+				serverIntrospector, server);
 		return context.reconstructURIWithServer(server, uri);
 	}
 

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClientTests.java

@@ -38,6 +38,7 @@ import com.netflix.loadbalancer.Server;
 import com.netflix.loadbalancer.ServerStats;
 
 import lombok.SneakyThrows;
+import org.springframework.web.util.DefaultUriTemplateHandler;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
@@ -108,6 +109,31 @@ public class RibbonLoadBalancerClientTests {
 	}
 
 	@Test
+	public void testReconstructSecureUriWithSpecialCharsPath() {
+		testReconstructUriWithPath("https", "/foo=|");
+	}
+
+	@Test
+	public void testReconstructUnsecureUriWithSpecialCharsPath() {
+		testReconstructUriWithPath("http", "/foo=|");
+	}
+
+	private void testReconstructUriWithPath(String scheme, String path) {
+		RibbonServer server = getRibbonServer();
+		IClientConfig config = mock(IClientConfig.class);
+		when(config.get(CommonClientConfigKey.IsSecure)).thenReturn(true);
+		when(clientFactory.getClientConfig(server.getServiceId())).thenReturn(config);
+
+		RibbonLoadBalancerClient client = getRibbonLoadBalancerClient(server);
+		ServiceInstance serviceInstance = client.choose(server.getServiceId());
+
+		URI expanded = new DefaultUriTemplateHandler()
+				.expand(scheme + "://" + server.getServiceId() + path);
+		URI reconstructed = client.reconstructURI(serviceInstance, expanded);
+		assertEquals(expanded.getPath(), reconstructed.getPath());
+	}
+
+	@Test
 	@SneakyThrows
 	public void testReconstructUriWithSecureClientConfig() {
 		RibbonServer server = getRibbonServer();