| Index: net/base/net_util_unittest.cc
|
| diff --git a/net/base/net_util_unittest.cc b/net/base/net_util_unittest.cc
|
| index 78911d0bbbcfae278dede1394333ccc5af834eef..4e47ad23fc917f18dbab755c1e8a4e5900ebd717 100644
|
| --- a/net/base/net_util_unittest.cc
|
| +++ b/net/base/net_util_unittest.cc
|
| @@ -477,9 +477,13 @@ TEST(NetUtilTest, GetAddressFamily) {
|
|
|
| TEST(NetUtilTest, IsLocalhost) {
|
| EXPECT_TRUE(IsLocalhost("localhost"));
|
| + EXPECT_TRUE(IsLocalhost("localhost."));
|
| EXPECT_TRUE(IsLocalhost("localhost.localdomain"));
|
| + EXPECT_TRUE(IsLocalhost("localhost.localdomain."));
|
| EXPECT_TRUE(IsLocalhost("localhost6"));
|
| + EXPECT_TRUE(IsLocalhost("localhost6."));
|
| EXPECT_TRUE(IsLocalhost("localhost6.localdomain6"));
|
| + EXPECT_TRUE(IsLocalhost("localhost6.localdomain6."));
|
| EXPECT_TRUE(IsLocalhost("127.0.0.1"));
|
| EXPECT_TRUE(IsLocalhost("127.0.1.0"));
|
| EXPECT_TRUE(IsLocalhost("127.1.0.0"));
|
| @@ -489,9 +493,12 @@ TEST(NetUtilTest, IsLocalhost) {
|
| EXPECT_TRUE(IsLocalhost("::1"));
|
| EXPECT_TRUE(IsLocalhost("0:0:0:0:0:0:0:1"));
|
| EXPECT_TRUE(IsLocalhost("foo.localhost"));
|
| + EXPECT_TRUE(IsLocalhost("foo.localhost."));
|
|
|
| EXPECT_FALSE(IsLocalhost("localhostx"));
|
| + EXPECT_FALSE(IsLocalhost("localhost.x"));
|
| EXPECT_FALSE(IsLocalhost("foo.localdomain"));
|
| + EXPECT_FALSE(IsLocalhost("foo.localdomain.x"));
|
| EXPECT_FALSE(IsLocalhost("localhost6x"));
|
| EXPECT_FALSE(IsLocalhost("localhost.localdomain6"));
|
| EXPECT_FALSE(IsLocalhost("localhost6.localdomain"));
|
| @@ -506,6 +513,51 @@ TEST(NetUtilTest, IsLocalhost) {
|
| EXPECT_FALSE(IsLocalhost("foo.localhoste"));
|
| }
|
|
|
| +TEST(NetUtilTest, IsLocalhostHostname) {
|
| + bool isLocalhost6;
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost", &isLocalhost6));
|
| + EXPECT_FALSE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost.", &isLocalhost6));
|
| + EXPECT_FALSE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost.localdomain", &isLocalhost6));
|
| + EXPECT_FALSE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost.localdomain.", &isLocalhost6));
|
| + EXPECT_FALSE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("foo.localhost", &isLocalhost6));
|
| + EXPECT_FALSE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("foo.localhost.", &isLocalhost6));
|
| + EXPECT_FALSE(isLocalhost6);
|
| +
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost6", &isLocalhost6));
|
| + EXPECT_TRUE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost6.", &isLocalhost6));
|
| + EXPECT_TRUE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost6.localdomain6", &isLocalhost6));
|
| + EXPECT_TRUE(isLocalhost6);
|
| + EXPECT_TRUE(IsLocalhostHostname("localhost6.localdomain6.", &isLocalhost6));
|
| + EXPECT_TRUE(isLocalhost6);
|
| +
|
| + EXPECT_FALSE(IsLocalhostHostname("127.0.0.1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("::1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("0:0:0:0:0:0:0:1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("localhostx", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("localhost.x", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("foo.localdomain", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("foo.localdomain.x", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("localhost6x", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("localhost.localdomain6", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("localhost6.localdomain", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("127.0.0.1.1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname(".127.0.0.255", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("::2", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("::1:1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("0:0:0:0:1:0:0:1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("::1:1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("0:0:0:0:0:0:0:0:1", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("foo.localhost.com", &isLocalhost6));
|
| + EXPECT_FALSE(IsLocalhostHostname("foo.localhoste", &isLocalhost6));
|
| +}
|
| +
|
| TEST(NetUtilTest, IsLocalhostTLD) {
|
| EXPECT_TRUE(IsLocalhostTLD("foo.localhost"));
|
| EXPECT_TRUE(IsLocalhostTLD("foo.localhost."));
|
|
|