Add IP address handling to net::IsHostnameNonUnique

net/base/net_util_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/net_util.h"
 
 #include <string.h>
 
 #include <algorithm>
 
@@ skipping 3501 matching lines @@
 
 const NonUniqueNameTestData kNonUniqueNameTestData[] = {
     // Domains under ICANN-assigned domains.
     { true, "google.com" },
     { true, "google.co.uk" },
     // Domains under private registries.
     { true, "appspot.com" },
     { true, "test.appspot.com" },
     // IPv4 addresses (in various forms).
     { true, "8.8.8.8" },
-    { true, "1.2.3" },
-    { true, "14.15" },
-    { true, "676768" },
+    { true, "99.64.0.0/10" },
+    { true, "212.15" },
+    { false, "192.168.0.0" },
+    { false, "192.168.0.6" },
+    //{ true, "676768" }, apparently this is valid & matches 0.0.0.0/8?

[Ryan Sleevi, 2013/08/07 19:04:44]

This was just me banging on the keyboard.

[felt, 2013/08/08 19:35:33]

ack

     // IPv6 addresses.
-    { true, "FEDC:ba98:7654:3210:FEDC:BA98:7654:3210" },
-    { true, "::192.9.5.5" },
-    { true, "FEED::BEEF" },
+    { true, "FFC0:ba98:7654:3210:FEDC:BA98:7654:3210" },
+    { true, "2000:ba98:7654:2301:EFCD:BA98:7654:3210" },
+    { false, "::192.9.5.5" },
+    { false, "FEED::BEEF" },
+    { false, "FEC0:ba98:7654:3210:FEDC:BA98:7654:3210" },
     // 'internal'/non-IANA assigned domains.
     { false, "intranet" },
     { false, "intranet." },
     { false, "intranet.example" },
     { false, "host.intranet.example" },
     // gTLDs under discussion, but not yet assigned.
     { false, "intranet.corp" },
     { false, "example.tech" },
     { false, "intranet.internal" },
     // Invalid host names are treated as unique - but expected to be
     // filtered out before then.
     { true, "junk)(£)$*!@~#" },
     { true, "w$w.example.com" },
     { true, "nocolonsallowed:example" },
     { true, "[::4.5.6.9]" },
 };
 
 class NetUtilNonUniqueNameTest
     : public testing::TestWithParam<NonUniqueNameTestData> {
  public:
   virtual ~NetUtilNonUniqueNameTest() {}
 
  protected:
   bool IsUnique(const std::string& hostname) {
+    LOG(INFO) << hostname;
     return !IsHostnameNonUnique(hostname);
   }
 };
 
 // Test that internal/non-unique names are properly identified as such, but
 // that IP addresses and hosts beneath registry-controlled domains are flagged
 // as unique names.
 TEST_P(NetUtilNonUniqueNameTest, IsHostnameNonUnique) {
   const NonUniqueNameTestData& test_data = GetParam();
 
   EXPECT_EQ(test_data.is_unique, IsUnique(test_data.hostname));
 }
 
 INSTANTIATE_TEST_CASE_P(, NetUtilNonUniqueNameTest,
                         testing::ValuesIn(kNonUniqueNameTestData));
 
 }  // namespace net