Change ParseHostAndPort() to not include brackets around IPv6 literals.

There were several consumers assuming that the returned hosts had no brackets.

BUG=417417

Review URL: https://codereview.chromium.org/602973002

Cr-Commit-Position: refs/heads/master@{#296569}

1 files changed, 17 insertions, 0 deletions

diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 704add2..d63dfe8 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -376,6 +376,23 @@ bool ParseHostAndPort(std::string::const_iterator host_and_port_begin,
   if (port_component.len == 0)
     return false;  // Reject inputs like "foo:"
 
+  unsigned char tmp_ipv6_addr[16];
+
+  // If the hostname starts with a bracket, it is either an IPv6 literal or
+  // invalid. If it is an IPv6 literal then strip the brackets.
+  if (hostname_component.len > 0 &&
+      auth_begin[hostname_component.begin] == '[') {
+    if (auth_begin[hostname_component.end() - 1] == ']' &&
+        url::IPv6AddressToNumber(
+            auth_begin, hostname_component, tmp_ipv6_addr)) {
+      // Strip the brackets.
+      hostname_component.begin++;
+      hostname_component.len -= 2;
+    } else {
+      return false;
+    }
+  }
+
   // Pass results back to caller.
   host->assign(auth_begin + hostname_component.begin, hostname_component.len);
   *port = parsed_port_number;