Fix handling of docker uri (#5130)

- Addresses docker uri that have colon in the port. 

See #5111

Author: Corneil du Plessis

spring-cloud-dataflow-container-registry/src/main/java/org/springframework/cloud/dataflow/container/registry/authorization/DockerConfigJsonSecretToRegistryConfigurationConverter.java

@@ -16,6 +16,7 @@
 
 package org.springframework.cloud.dataflow.container.registry.authorization;
 
+import java.net.URI;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -43,6 +44,7 @@
 
 /**
  * @author Christian Tzolov
+ * @author Corneil du Plessis
  */
 public class DockerConfigJsonSecretToRegistryConfigurationConverter implements Converter<String, Map<String, ContainerRegistryConfiguration>> {
 
@@ -164,9 +166,29 @@ public Optional<String> getDockerTokenServiceUri(String registryHost, boolean di
 
 		try {
 			RestTemplate restTemplate = this.containerImageRestTemplate.getContainerRestTemplate(disableSSl, useHttpProxy);
-			restTemplate.exchange(
-					UriComponentsBuilder.newInstance().scheme("https").host(registryHost).path("v2/").build().toUri(),
-					HttpMethod.GET, new HttpEntity<>(new HttpHeaders()), Map.class);
+			String host = registryHost;
+			Integer port = null;
+			if (registryHost.contains(":")) {
+				int colon = registryHost.lastIndexOf(":");
+				String portString = registryHost.substring(colon+1);
+				try {
+					int intPort = Integer.parseInt(portString);
+					if (Integer.toString(intPort).equals(portString) && intPort > 0 && intPort < 32767) {
+						port = intPort;
+						host = registryHost.substring(0, colon);
+					}
+				} catch (NumberFormatException x) {
+					// not valid integer
+				}
+			}
+			UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.newInstance().scheme("https").host(host);
+			if (port != null) {
+				uriComponentsBuilder.port(port);
+			}
+			uriComponentsBuilder.path("v2/");
+			URI uri = uriComponentsBuilder.build().toUri();
+			logger.info("getDockerTokenServiceUri:" + uri);
+			restTemplate.exchange(uri, HttpMethod.GET, new HttpEntity<>(new HttpHeaders()), Map.class);
 			return Optional.empty();
 		}
 		catch (HttpClientErrorException httpError) {
@@ -209,6 +231,8 @@ public Optional<String> getDockerTokenServiceUri(String registryHost, boolean di
 			return Optional.of(tokenServiceUri);
 		}
 		catch (Exception e) {
+			// Log error because we cannot change the contract that returns empty optional.
+			logger.error("Ignoring:" + e, e);
 			return Optional.empty();
 		}
 	}

spring-cloud-dataflow-container-registry/src/test/java/org/springframework/cloud/dataflow/container/registry/authorization/DockerConfigJsonSecretToContainerRegistryConfigurationConverterTest.java

@@ -47,6 +47,7 @@
 
 /**
  * @author Christian Tzolov
+ * @author Corneil du Plessis
  */
 public class DockerConfigJsonSecretToContainerRegistryConfigurationConverterTest {
 
@@ -107,6 +108,27 @@ public void testConvertBasicAuthRegistry() throws URISyntaxException {
 		assertThat(registryConfiguration.getAuthorizationType(), is(ContainerRegistryConfiguration.AuthorizationType.basicauth));
 	}
 
+	@Test
+	public void testConvertWithPort() throws URISyntaxException {
+
+		when(mockRestTemplate.exchange(
+				eq(new URI("https://demo.repository.io/v2/_catalog")), eq(HttpMethod.GET), any(), eq(Map.class)))
+				.thenReturn(new ResponseEntity<>(new HashMap<>(), HttpStatus.OK));
+
+		String b = "{\"auths\":{\"demo.repository.io:5050\":{\"username\":\"testuser\",\"password\":\"testpassword\",\"auth\":\"YWRtaW46SGFyYm9yMTIzNDU=\"}}}";
+		Map<String, ContainerRegistryConfiguration> result = converter.convert(b);
+
+		assertThat(result).hasSize(1);
+		assertThat(result).containsKey("demo.repository.io:5050");
+
+		ContainerRegistryConfiguration registryConfiguration = result.get("demo.repository.io:5050");
+
+		assertThat(registryConfiguration.getRegistryHost()).isEqualTo("demo.repository.io:5050");
+		assertThat(registryConfiguration.getUser()).isEqualTo("testuser");
+		assertThat(registryConfiguration.getSecret()).isEqualTo("testpassword");
+		assertThat(registryConfiguration.getAuthorizationType()).isEqualTo(ContainerRegistryConfiguration.AuthorizationType.basicauth);
+	}
+
 	@Test
 	public void testConvertDockerHubRegistry() throws URISyntaxException {