Revert of Improve OriginAccessEntry support for IP addresses.

Source/platform/weborigin/OriginAccessEntryTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 62 matching lines @@
     OriginAccessEntry entry1("http", "google.com", OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsIPAddress);
     OriginAccessEntry entry2("http", "hamster.com", OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsIPAddress);
     OriginAccessEntry entry3("http", "com", OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsIPAddress);
     EXPECT_EQ(OriginAccessEntry::MatchesOrigin, entry1.matchesOrigin(*origin));
     EXPECT_EQ(OriginAccessEntry::DoesNotMatchOrigin, entry2.matchesOrigin(*origin));
     EXPECT_EQ(OriginAccessEntry::MatchesOriginButIsPublicSuffix, entry3.matchesOrigin(*origin));
 
     blink::Platform::shutdown();
 }
 
-TEST(OriginAccessEntryTest, AllowSubdomainsTest)
-{
-    struct TestCase {
-        const char* protocol;
-        const char* host;
-        const char* origin;
-        OriginAccessEntry::MatchResult expected;
-    } inputs[] = {
-        { "http", "example.com", "http://example.com/", OriginAccessEntry::MatchesOrigin },
-        { "http", "example.com", "http://www.example.com/", OriginAccessEntry::MatchesOrigin },
-        { "http", "example.com", "http://www.www.example.com/", OriginAccessEntry::MatchesOrigin },
-        { "http", "com", "http://example.com/", OriginAccessEntry::MatchesOriginButIsPublicSuffix },
-        { "http", "com", "http://www.example.com/", OriginAccessEntry::MatchesOriginButIsPublicSuffix },
-        { "http", "com", "http://www.www.example.com/", OriginAccessEntry::MatchesOriginButIsPublicSuffix },
-        { "https", "example.com", "http://example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "https", "example.com", "http://www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "https", "example.com", "http://www.www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "example.com", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "", "http://example.com/", OriginAccessEntry::MatchesOrigin },
-        { "http", "", "http://beispiel.de/", OriginAccessEntry::MatchesOrigin },
-        { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
-    };
-
-    // Initialize a PSL mock that whitelists any three-letter label as a TLD ('com', 'org', 'net', etc).
-    OriginAccessEntryTestPlatform platform;
-    blink::Platform::initialize(&platform);
-
-    for (const auto& test : inputs) {
-        SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
-        RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
-        OriginAccessEntry entry1(test.protocol, test.host, OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsIPAddress);
-        EXPECT_EQ(test.expected, entry1.matchesOrigin(*originToTest));
-
-        OriginAccessEntry entry2(test.protocol, test.host, OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsDomain);
-        EXPECT_EQ(test.expected, entry2.matchesOrigin(*originToTest));
-    }
-
-    blink::Platform::shutdown();
-}
-
-TEST(OriginAccessEntryTest, DisallowSubdomainsTest)
-{
-    struct TestCase {
-        const char* protocol;
-        const char* host;
-        const char* origin;
-        OriginAccessEntry::MatchResult expected;
-    } inputs[] = {
-        { "http", "example.com", "http://example.com/", OriginAccessEntry::MatchesOrigin },
-        { "http", "example.com", "http://www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "example.com", "http://www.www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "com", "http://example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "com", "http://www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "com", "http://www.www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "https", "example.com", "http://example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "https", "example.com", "http://www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "https", "example.com", "http://www.www.example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "example.com", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "", "http://example.com/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
-    };
-
-    // Initialize a PSL mock that whitelists any three-letter label as a TLD ('com', 'org', 'net', etc).
-    OriginAccessEntryTestPlatform platform;
-    blink::Platform::initialize(&platform);
-
-    for (const auto& test : inputs) {
-        SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
-        RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
-        OriginAccessEntry entry1(test.protocol, test.host, OriginAccessEntry::DisallowSubdomains, OriginAccessEntry::TreatIPAddressAsIPAddress);
-        EXPECT_EQ(test.expected, entry1.matchesOrigin(*originToTest));
-
-        OriginAccessEntry entry2(test.protocol, test.host, OriginAccessEntry::DisallowSubdomains, OriginAccessEntry::TreatIPAddressAsDomain);
-        EXPECT_EQ(test.expected, entry2.matchesOrigin(*originToTest));
-    }
-
-    blink::Platform::shutdown();
-}
-
-TEST(OriginAccessEntryTest, IPAddressTest)
-{
-    struct TestCase {
-        const char* protocol;
-        const char* host;
-        bool isIPAddress;
-    } inputs[] = {
-        { "http", "1.1.1.1", true },
-        { "http", "1.1.1.1.1", false },
-        { "http", "example.com", false },
-        { "http", "hostname.that.ends.with.a.number1", false },
-        { "http", "2001:db8::1", false },
-        { "http", "[2001:db8::1]", true },
-        { "http", "2001:db8::a", false },
-        { "http", "[2001:db8::a]", true },
-        { "http", "", false },
-    };
-
-    // Initialize a PSL mock that whitelists any three-letter label as a TLD ('com', 'org', 'net', etc).
-    OriginAccessEntryTestPlatform platform;
-    blink::Platform::initialize(&platform);
-
-    for (const auto& test : inputs) {
-        SCOPED_TRACE(testing::Message() << "Host: " << test.host);
-        OriginAccessEntry entry(test.protocol, test.host, OriginAccessEntry::DisallowSubdomains, OriginAccessEntry::TreatIPAddressAsDomain);
-        EXPECT_EQ(test.isIPAddress, entry.hostIsIPAddress()) << test.host;
-    }
-
-    blink::Platform::shutdown();
-}
-
-TEST(OriginAccessEntryTest, IPAddressAsDomainTest)
-{
-    struct TestCase {
-        const char* protocol;
-        const char* host;
-        const char* origin;
-        OriginAccessEntry::MatchResult expected;
-    } inputs[] = {
-        { "http", "192.0.0.123", "http://192.0.0.123/", OriginAccessEntry::MatchesOrigin },
-        { "http", "0.0.123", "http://192.0.0.123/", OriginAccessEntry::MatchesOrigin },
-        { "http", "0.123", "http://192.0.0.123/", OriginAccessEntry::MatchesOrigin },
-        { "http", "1.123", "http://192.0.0.123/", OriginAccessEntry::DoesNotMatchOrigin },
-    };
-
-    // Initialize a PSL mock that whitelists any three-letter label as a TLD ('.123', etc).
-    OriginAccessEntryTestPlatform platform;
-    blink::Platform::initialize(&platform);
-
-    for (const auto& test : inputs) {
-        SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
-        RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
-        OriginAccessEntry entry(test.protocol, test.host, OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsDomain);
-        EXPECT_EQ(test.expected, entry.matchesOrigin(*originToTest));
-    }
-
-    blink::Platform::shutdown();
-}
-
-TEST(OriginAccessEntryTest, IPAddressAsIPAddressTest)
-{
-    struct TestCase {
-        const char* protocol;
-        const char* host;
-        const char* origin;
-        OriginAccessEntry::MatchResult expected;
-    } inputs[] = {
-        { "http", "192.0.0.123", "http://192.0.0.123/", OriginAccessEntry::MatchesOrigin },
-        { "http", "0.0.123", "http://192.0.0.123/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "0.123", "http://192.0.0.123/", OriginAccessEntry::DoesNotMatchOrigin },
-        { "http", "1.123", "http://192.0.0.123/", OriginAccessEntry::DoesNotMatchOrigin },
-    };
-
-    // Initialize a PSL mock that whitelists any three-letter label as a TLD ('.123', etc).
-    OriginAccessEntryTestPlatform platform;
-    blink::Platform::initialize(&platform);
-
-    for (const auto& test : inputs) {
-        SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin);
-        RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
-        OriginAccessEntry entry(test.protocol, test.host, OriginAccessEntry::AllowSubdomains, OriginAccessEntry::TreatIPAddressAsIPAddress);
-        EXPECT_EQ(test.expected, entry.matchesOrigin(*originToTest));
-    }
-
-    blink::Platform::shutdown();
-}
 } // namespace