Strip ipv6 brackets in CreateFromUri

Author: carlos-apex

source/io/Socks5ProxyOptions.cpp

@@ -9,6 +9,15 @@
 #include <climits>
 #include <utility>
 
+namespace {
+    Aws::Crt::String s_NormalizeProxyHostLiteral(const Aws::Crt::String &host) {
+        if (host.length() >= 2 && host.front() == '[' && host.back() == ']') {
+            return host.substr(1, host.length() - 2);
+        }
+        return host;
+    }
+} // namespace
+
 namespace Aws
 {
     namespace Crt
@@ -343,6 +352,7 @@ namespace Aws
                 }
 
                 String host(reinterpret_cast<const char *>(hostCursor.ptr), hostCursor.len);
+                host = s_NormalizeProxyHostLiteral(host);
 
                 uint32_t port = uri.GetPort();
                 if (port == 0)

tests/Socks5ProxyOptionsTest.cpp

@@ -80,6 +80,27 @@ static int s_TestSocks5ProxyOptionsCreateFromUriAuth(struct aws_allocator *alloc
 }
 AWS_TEST_CASE(Socks5ProxyOptionsCreateFromUriAuth, s_TestSocks5ProxyOptionsCreateFromUriAuth)
 
+static int s_TestSocks5ProxyOptionsCreateFromUriIpv6Literal(struct aws_allocator *allocator, void *)
+{
+    ApiHandle apiHandle(allocator);
+
+    const char *proxyUri = "socks5://[::1]:1080";
+    Uri uri(aws_byte_cursor_from_c_str(proxyUri), allocator);
+    ASSERT_TRUE(uri);
+
+    auto options = Socks5ProxyOptions::CreateFromUri(uri, 1000, allocator);
+    ASSERT_TRUE(options.has_value());
+
+    const aws_socks5_proxy_options *raw = options->GetUnderlyingHandle();
+    ASSERT_NOT_NULL(raw);
+    ASSERT_NOT_NULL(raw->host);
+    ASSERT_STR_EQUALS("::1", aws_string_c_str(raw->host));
+    ASSERT_INT_EQUALS(1080, raw->port);
+
+    return AWS_OP_SUCCESS;
+}
+AWS_TEST_CASE(Socks5ProxyOptionsCreateFromUriIpv6Literal, s_TestSocks5ProxyOptionsCreateFromUriIpv6Literal)
+
 static int s_TestSocks5ProxyOptionsCreateFromUriInvalid(struct aws_allocator *allocator, void *)
 {
     ApiHandle apiHandle(allocator);