Merge pull request #2256 from jglick/EndpointToRegion

Make EndpointToRegion.guessRegionOrRegionNameForEndpoint tolerate the format 127.0.0.1:1234
aws · Apr 3, 2020 · 780ed5f · 780ed5f
2 parents 30c2048 + 78f8755
commit 780ed5f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/regions/EndpointToRegion.java b/aws-java-sdk-core/src/main/java/com/amazonaws/regions/EndpointToRegion.java
@@ -17,6 +17,7 @@
 import com.amazonaws.annotation.SdkProtectedApi;
 import com.amazonaws.util.AwsHostNameUtils;
 import java.net.URI;
+import java.net.URISyntaxException;
 
 /**
  * Utilities to attempt to convert from a hostname/endpoint to an AWS region.
@@ -68,7 +69,12 @@ private static RegionOrRegionName guessRegionOrRegionNameForEndpoint(String endp
             return new RegionOrRegionName();
         }
 
-        String host = URI.create(endpoint).getHost();
+        String host = null;
+        try {
+            host = new URI(endpoint).getHost();
+        } catch (URISyntaxException x) {
+            // proceed
+        }
         if (host == null) {
             host = URI.create("http://" + endpoint).getHost();
         }

diff --git a/aws-java-sdk-core/src/test/java/com/amazonaws/regions/EndpointToRegionTest.java b/aws-java-sdk-core/src/test/java/com/amazonaws/regions/EndpointToRegionTest.java
@@ -111,6 +111,18 @@ public void guessRegionForHostname_basedOnFollowingServiceName() {
         verifyRegionAndPartitionForHostname("us-gov-west-1", "aws-us-gov", "iam.us-gov-west-1.banana.com", "iam");
     }
 
+    @Test
+    public void guessRegionForHostname_ipAddress() {
+        assertNull(guessRegionNameForEndpoint("http://localhost"));
+        assertNull(guessRegionNameForEndpoint("http://localhost:1234"));
+        assertNull(guessRegionNameForEndpoint("http://127.0.0.1"));
+        assertNull(guessRegionNameForEndpoint("http://127.0.0.1:1234"));
+        assertNull(guessRegionNameForEndpoint("localhost"));
+        assertNull(guessRegionNameForEndpoint("localhost:1234"));
+        assertNull(guessRegionNameForEndpoint("127.0.0.1"));
+        assertNull(guessRegionNameForEndpoint("127.0.0.1:1234"));
+    }
+
     /**
      * We migrated from AwsHostNameUtils.parseRegion to EndpointToRegion.guessRegionNameForHostname, because EndpointToRegion
      * can consider the contents of endpoints.json.