handle brackets in ipv6 authority string

Author: sbiscigl

src/aws-cpp-sdk-core/include/aws/core/http/URI.h

@@ -71,12 +71,14 @@ namespace Aws
             void SetScheme(Scheme value);
 
             /**
-            * Gets the domain portion of the uri
+            * Gets the authority portion of the URI. Differs from the authority definition in RFC 3986. user information
+            * and the port information are not included. It is functionally the host as defined by  RFC 3986 with encoding included.
             */
             inline const Aws::String& GetAuthority() const { return m_authority; }
 
             /**
-            * Sets the domain portion of the uri
+            * Sets the authority portion of the URI. Differs from the authority definition in RFC 3986. user information
+            * and the port information are not included. It is functionally the host as defined by  RFC 3986 with encoding included.
             */
             inline void SetAuthority(const Aws::String& value) { m_authority = value; }
 
@@ -213,6 +215,17 @@ namespace Aws
              */
             static Aws::String URLEncodePathRFC3986(const Aws::String& path, bool rfcCompliantEncoding = false);
 
+            /**
+             * The host portion of the URI as described in rfc3986.
+             *
+             * The host subcomponent of authority is identified by an IPv6 literal
+             * encapsulated within square brackets, an IPv4 address in dotted-
+             * decimal form, or a registered name.
+             *
+             * @return The host portion of the URI
+             */
+            Aws::String GetHost() const;
+
         private:
             void ParseURIParts(const Aws::String& uri);
             void ExtractAndSetScheme(const Aws::String& uri);

src/aws-cpp-sdk-core/source/client/AWSClient.cpp

@@ -259,7 +259,7 @@ HttpResponseOutcome AWSClient::AttemptExhaustively(const Aws::Http::URI& uri,
     const char* signerRegionOverride,
     const char* signerServiceNameOverride) const
 {
-    if (!Aws::Utils::IsValidHost(uri.GetAuthority()))
+    if (!Aws::Utils::IsValidHost(uri.GetHost()))
     {
         return HttpResponseOutcome(AWSError<CoreErrors>(CoreErrors::VALIDATION, "", "Invalid DNS Label found in URI host", false/*retryable*/));
     }
@@ -415,7 +415,7 @@ HttpResponseOutcome AWSClient::AttemptExhaustively(const Aws::Http::URI& uri,
     const char* signerRegionOverride,
     const char* signerServiceNameOverride) const
 {
-    if (!Aws::Utils::IsValidHost(uri.GetAuthority()))
+    if (!Aws::Utils::IsValidHost(uri.GetHost()))
     {
         return HttpResponseOutcome(AWSError<CoreErrors>(CoreErrors::VALIDATION, "", "Invalid DNS Label found in URI host", false/*retryable*/));
     }

src/aws-cpp-sdk-core/source/http/URI.cpp

@@ -600,3 +600,15 @@ bool URI::CompareURIParts(const URI& other) const
 {
     return m_scheme == other.m_scheme && m_authority == other.m_authority && GetPath() == other.GetPath() && m_queryString == other.m_queryString;
 }
+
+Aws::String URI::GetHost() const {
+  Aws::String host{m_authority};
+  const auto begin = host.find('[');
+  const auto end = host.rfind(']');
+  if (begin != Aws::String::npos && end != Aws::String::npos && begin + 1 < end) {
+    host = host.substr(begin + 1, end - begin - 1);
+  } else if (begin != Aws::String::npos && end != Aws::String::npos && begin + 1 == end) {
+    host = "";
+  }
+  return host;
+}

tests/aws-cpp-sdk-core-tests/http/URITest.cpp

@@ -383,3 +383,35 @@ TEST_F(URITest, TestGetRFC3986URLEncodedPathCompliant)
 
     Aws::Http::SetCompliantRfc3986Encoding(false);
 }
+
+TEST_F(URITest, TestHostParsesCorrectly) {
+    URI uri = "https://test.com";
+    EXPECT_STREQ("test.com", uri.GetHost().c_str());
+
+    uri = "https://test.com:9000";
+    EXPECT_STREQ("test.com", uri.GetHost().c_str());
+
+    uri = "https://[::]";
+    EXPECT_STREQ("::", uri.GetHost().c_str());
+
+    uri = "https://[::]:9000";
+    EXPECT_STREQ("::", uri.GetHost().c_str());
+
+    uri = "https://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]";
+    EXPECT_STREQ("2001:0db8:85a3:0000:0000:8a2e:0370:7334", uri.GetHost().c_str());
+
+    uri = "https://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]:9000";
+    EXPECT_STREQ("2001:0db8:85a3:0000:0000:8a2e:0370:7334", uri.GetHost().c_str());
+
+    uri = "https://[]";
+    EXPECT_STREQ("", uri.GetHost().c_str());
+
+    uri = "https://[]:9000";
+    EXPECT_STREQ("", uri.GetHost().c_str());
+
+    uri = "https://127.0.0.1";
+    EXPECT_STREQ("127.0.0.1", uri.GetHost().c_str());
+
+    uri = "https://127.0.0.1:9000";
+    EXPECT_STREQ("127.0.0.1", uri.GetHost().c_str());
+}