normalize the platform endpoint

Author: mkleene

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

@@ -23,10 +23,6 @@
 
 import kotlin.collections.MapsKt;
 
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.time.Duration;
@@ -128,38 +124,6 @@ public KASKeyCache getKeyCache() {
         return this.kasKeyCache;
     }
 
-    private String normalizeAddress(String urlString) {
-        URL url;
-        try {
-            url = new URL(urlString);
-        } catch (MalformedURLException e) {
-            url = tryParseHostAndPort(urlString);
-        }
-        final int port = url.getPort() == -1 ? ("http".equals(url.getProtocol()) ? 80 : 443 ) : url.getPort();
-        final String protocol = usePlaintext && "http".equals(url.getProtocol()) ? "http" : "https";
-
-        try {
-            return new URL(protocol, url.getHost(), port, "").toString();
-        } catch (MalformedURLException e) {
-            throw new SDKException("error creating KAS address", e);
-        }
-    }
-
-    private URL tryParseHostAndPort(String urlString) {
-        URI uri;
-        try {
-            uri = new URI(null, urlString, null, null, null).parseServerAuthority();
-        } catch (URISyntaxException e) {
-            throw new SDKException("error trying to parse host and port", e);
-        }
-
-        try {
-            return new URL(uri.getPort() == 80 ? "http" : "https", uri.getHost(), uri.getPort(), "");
-        } catch (MalformedURLException e) {
-            throw new SDKException("error trying to create URL from host and port", e);
-        }
-    }
-
     @Override
     public synchronized void close() {
     }
@@ -329,6 +293,6 @@ public byte[] unwrapNanoTDF(NanoTDFType.ECCurve curve, String header, String kas
 
     // make this protected so we can test the address normalization logic
     synchronized AccessServiceClient getStub(String url) {
-        return stubs.computeIfAbsent(normalizeAddress(url), channelFactory);
+        return stubs.computeIfAbsent(SDKBuilder.normalizeAddress(url, usePlaintext), channelFactory);
     }
 }

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

@@ -44,13 +44,19 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Function;
 
+import static io.opentdf.platform.sdk.TDF.logger;
+
 /**
  * A builder class for creating instances of the SDK class.
  */
@@ -74,6 +80,40 @@ public static SDKBuilder newBuilder() {
         return builder;
     }
 
+    static String normalizeAddress(String urlString, boolean usePlaintext) {
+        URL url;
+        try {
+            url = new URL(urlString);
+        } catch (MalformedURLException e) {
+            url = tryParseHostAndPort(urlString);
+        }
+        final int port = url.getPort() == -1 ? ("http".equals(url.getProtocol()) ? 80 : 443 ) : url.getPort();
+        final String protocol = usePlaintext && "http".equals(url.getProtocol()) ? "http" : "https";
+
+        try {
+            var returnUrl = new URL(protocol, url.getHost(), port, "").toString();
+            TDF.logger.debug("normalized url [{}] to [{}]", urlString, returnUrl);
+            return returnUrl;
+        } catch (MalformedURLException e) {
+            throw new SDKException("error creating KAS address", e);
+        }
+    }
+
+    private static URL tryParseHostAndPort(String urlString) {
+        URI uri;
+        try {
+            uri = new URI(null, urlString, null, null, null).parseServerAuthority();
+        } catch (URISyntaxException e) {
+            throw new SDKException("error trying to parse host and port", e);
+        }
+
+        try {
+            return new URL(uri.getPort() == 80 ? "http" : "https", uri.getHost(), uri.getPort(), "");
+        } catch (MalformedURLException e) {
+            throw new SDKException("error trying to create URL from host and port", e);
+        }
+    }
+
     public SDKBuilder sslFactory(SSLFactory sslFactory) {
         this.sslFactory = sslFactory;
         return this;
@@ -237,6 +277,7 @@ ServicesAndInternals buildServices() {
             throw new SDKException("Error generating DPoP key", e);
         }
 
+        this.platformEndpoint = normalizeAddress(this.platformEndpoint, this.usePlainText);
         var authInterceptor = getAuthInterceptor(dpopKey);
         var kasClient = getKASClient(dpopKey, authInterceptor);
         var protocolClient = getProtocolClient(platformEndpoint, authInterceptor);