Add "registerable domain" support to OriginAccessEntry.

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 28 matching lines @@
 
 using blink::SecurityOrigin;
 using blink::OriginAccessEntry;
 
 namespace {
 
 class OriginAccessEntryTestSuffixList : public blink::WebPublicSuffixList {
 public:
     virtual size_t getPublicSuffixLength(const blink::WebString&)
     {
-        return 3; // e.g. "com"
+        return m_length;
     }
+
+    void setPublicSuffix(const blink::WebString& suffix)
+    {
+        m_length = suffix.length();
+    }
+
+private:
+    size_t m_length;
 };
 
 class OriginAccessEntryTestPlatform : public blink::Platform {
 public:
     virtual blink::WebPublicSuffixList* publicSuffixList()
     {
         return &m_suffixList;
     }
 
     // Stub for pure virtual method.
     virtual void cryptographicallyRandomValues(unsigned char*, size_t) { ASSERT_NOT_REACHED(); }
 
+    void setPublicSuffix(const blink::WebString& suffix)
+    {
+        m_suffixList.setPublicSuffix(suffix);
+    }
+
 private:
     OriginAccessEntryTestSuffixList m_suffixList;
 };
 
 TEST(OriginAccessEntryTest, PublicSuffixListTest)
 {
     OriginAccessEntryTestPlatform platform;
+    platform.setPublicSuffix("com");
     blink::Platform::initialize(&platform);
 
     RefPtr<SecurityOrigin> origin = SecurityOrigin::createFromString("http://www.google.com");
     OriginAccessEntry entry1("http", "google.com", OriginAccessEntry::AllowSubdomains);
     OriginAccessEntry entry2("http", "hamster.com", OriginAccessEntry::AllowSubdomains);
     OriginAccessEntry entry3("http", "com", OriginAccessEntry::AllowSubdomains);
     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", "www.example.com", "http://example.com/", OriginAccessEntry::DoesNotMatchOrigin },
+        { "http", "www.example.com", "http://www.example.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "www.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;
+    platform.setPublicSuffix("com");
     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);
         EXPECT_EQ(test.expected, entry1.matchesOrigin(*originToTest));
     }
 
     blink::Platform::shutdown();
 }
 
+TEST(OriginAccessEntryTest, AllowRegisterableDomainsTest)
+{
+    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", "www.example.com", "http://example.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "www.example.com", "http://www.example.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "www.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 },
+    };
+
+    OriginAccessEntryTestPlatform platform;
+    platform.setPublicSuffix("com");
+    blink::Platform::initialize(&platform);
+
+    for (const auto& test : inputs) {
+        RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
+        OriginAccessEntry entry1(test.protocol, test.host, OriginAccessEntry::AllowRegisterableDomains);
+
+        SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin << ", Domain: " << entry1.registerable().utf8().data());
+        EXPECT_EQ(test.expected, entry1.matchesOrigin(*originToTest));
+    }
+
+    blink::Platform::shutdown();
+}
+
+TEST(OriginAccessEntryTest, AllowRegisterableDomainsTestWithDottedSuffix)
+{
+    struct TestCase {
+        const char* protocol;
+        const char* host;
+        const char* origin;
+        OriginAccessEntry::MatchResult expected;
+    } inputs[] = {
+        { "http", "example.appspot.com", "http://example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "example.appspot.com", "http://www.example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "example.appspot.com", "http://www.www.example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "www.example.appspot.com", "http://example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "www.example.appspot.com", "http://www.example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "www.example.appspot.com", "http://www.www.example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "appspot.com", "http://example.appspot.com/", OriginAccessEntry::MatchesOriginButIsPublicSuffix },
+        { "http", "appspot.com", "http://www.example.appspot.com/", OriginAccessEntry::MatchesOriginButIsPublicSuffix },
+        { "http", "appspot.com", "http://www.www.example.appspot.com/", OriginAccessEntry::MatchesOriginButIsPublicSuffix },
+        { "https", "example.appspot.com", "http://example.appspot.com/", OriginAccessEntry::DoesNotMatchOrigin },
+        { "https", "example.appspot.com", "http://www.example.appspot.com/", OriginAccessEntry::DoesNotMatchOrigin },
+        { "https", "example.appspot.com", "http://www.www.example.appspot.com/", OriginAccessEntry::DoesNotMatchOrigin },
+        { "http", "example.appspot.com", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
+        { "http", "", "http://example.appspot.com/", OriginAccessEntry::MatchesOrigin },
+        { "http", "", "http://beispiel.de/", OriginAccessEntry::MatchesOrigin },
+        { "https", "", "http://beispiel.de/", OriginAccessEntry::DoesNotMatchOrigin },
+    };
+
+    OriginAccessEntryTestPlatform platform;
+    platform.setPublicSuffix("appspot.com");
+    blink::Platform::initialize(&platform);
+
+    for (const auto& test : inputs) {
+        RefPtr<SecurityOrigin> originToTest = SecurityOrigin::createFromString(test.origin);
+        OriginAccessEntry entry1(test.protocol, test.host, OriginAccessEntry::AllowRegisterableDomains);
+
+        SCOPED_TRACE(testing::Message() << "Host: " << test.host << ", Origin: " << test.origin << ", Domain: " << entry1.registerable().utf8().data());
+        EXPECT_EQ(test.expected, entry1.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;
+    platform.setPublicSuffix("com");
     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);
         EXPECT_EQ(test.expected, entry1.matchesOrigin(*originToTest));
     }
 
     blink::Platform::shutdown();
@@ skipping 10 matching lines @@
         { "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;
+    platform.setPublicSuffix("com");
     blink::Platform::initialize(&platform);
 
     for (const auto& test : inputs) {
         SCOPED_TRACE(testing::Message() << "Host: " << test.host);
         OriginAccessEntry entry(test.protocol, test.host, OriginAccessEntry::DisallowSubdomains);
         EXPECT_EQ(test.isIPAddress, entry.hostIsIPAddress()) << test.host;
     }
 
     blink::Platform::shutdown();
 }
 
 TEST(OriginAccessEntryTest, IPAddressMatchingTest)
 {
     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;
+    platform.setPublicSuffix("com");
     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);
         EXPECT_EQ(test.expected, entry1.matchesOrigin(*originToTest));
 
         OriginAccessEntry entry2(test.protocol, test.host, OriginAccessEntry::DisallowSubdomains);
         EXPECT_EQ(test.expected, entry2.matchesOrigin(*originToTest));
     }
 
     blink::Platform::shutdown();
 }
 
 } // namespace