fix: parse hostnames with no ports correctly (#292)

This pull request addresses a parsing issue within the AddressNormalizer utility, specifically for hostnames provided without an explicit scheme or port. The updated logic now accurately identifies these hostnames and constructs the URI with the correct default scheme (HTTP or HTTPS) and port.

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

Author: mkleene

sdk/src/main/java/io/opentdf/platform/sdk/AddressNormalizer.java

@@ -22,11 +22,20 @@ static String normalizeAddress(String urlString, boolean usePlaintext) {
 
         final String scheme = usePlaintext ? "http" : "https";
         if (uri.getHost() == null) {
-            // if there is no host then we are likely dealing with a host and port
-            try {
-                uri = new URI(scheme, null, uri.getScheme(), Integer.parseInt(uri.getSchemeSpecificPart()), null, null, null);
-            } catch (URISyntaxException e) {
-                throw new SDKException("error trying to create URL for host and port[" + urlString + "]", e);
+            // if there is no host and no scheme, then we assume the input is a hostname with no port or scheme
+            if (uri.getScheme() == null) {
+                try {
+                    uri = new URI(scheme, null, uri.getSchemeSpecificPart(), -1, null, null, null);
+                } catch (URISyntaxException e) {
+                    throw new SDKException("error trying to create URL for hostname [" + urlString + "]", e);
+                }
+            } else {
+                // otherwise, we have a scheme but no host, so we assume the scheme is actually the host and the SSP is the port
+                try {
+                    uri = new URI(scheme, null, uri.getScheme(), Integer.parseInt(uri.getSchemeSpecificPart()), null, null, null);
+                } catch (URISyntaxException | NumberFormatException e) {
+                    throw new SDKException("error trying to create URL for host and port[" + urlString + "]", e);
+                }
             }
         }
         final int port;

sdk/src/test/java/io/opentdf/platform/sdk/AddressNormalizerTest.java

@@ -5,6 +5,7 @@
 
 import static io.opentdf.platform.sdk.AddressNormalizer.normalizeAddress;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class AddressNormalizerTest {
 
@@ -14,6 +15,7 @@ void testAddressNormalizationWithHTTPSClient() {
         // default to https if no scheme is provided
         assertThat(normalizeAddress("example.org:1234", false)).isEqualTo("https://example.org:1234");
         assertThat(normalizeAddress("ftp://example.org", false)).isEqualTo("https://example.org:443");
+        assertThat(normalizeAddress("keycloak.vm", false)).isEqualTo("https://keycloak.vm:443");
     }
 
     @Test
@@ -23,5 +25,15 @@ void testAddressNormaliationWithInsecureHTTPClient() {
         // default to http if no scheme is provided
         assertThat(normalizeAddress("example.org:1234", true)).isEqualTo("http://example.org:1234");
         assertThat(normalizeAddress("sftp://example.org", true)).isEqualTo("http://example.org:80");
+        assertThat(normalizeAddress("keycloak.vm", true)).isEqualTo("http://keycloak.vm:80");
+    }
+
+    @Test
+    void testAddressNormalizationWithInvalidPort() {
+        var thrown = assertThrows(SDKException.class, () -> normalizeAddress("example.org:notaport", true));
+        assertThat(thrown.getMessage()).contains("example.org:notaport");
+
+        thrown = assertThrows(SDKException.class, () -> normalizeAddress("http://example.org:notaport", true));
+        assertThat(thrown.getMessage()).contains("http://example.org:notaport");
     }
 }