Restrict the externally_connectable manifest key to effectively a single origin

chrome/common/extensions/manifest_handlers/externally_connectable_unittest.cc

 // Copyright 2013 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 <algorithm>
 
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "chrome/common/extensions/manifest_handlers/externally_connectable.h"
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
@@ skipping 44 matching lines @@
   EXPECT_TRUE(info->matches.MatchesURL(GURL("http://build.chromium.org/")));
   EXPECT_TRUE(
       info->matches.MatchesURL(GURL("http://build.chromium.org/index.html")));
   EXPECT_FALSE(info->matches.MatchesURL(GURL("https://build.chromium.org")));
   EXPECT_FALSE(info->matches.MatchesURL(GURL("https://build.chromium.org/")));
   EXPECT_FALSE(
       info->matches.MatchesURL(GURL("http://foo.chromium.org/index.html")));
 
   EXPECT_FALSE(info->matches.MatchesURL(GURL("http://yahoo.com")));
   EXPECT_FALSE(info->matches.MatchesURL(GURL("http://yahoo.com/")));
+
+  // TLD-style patterns should match just the TLD.
+  EXPECT_TRUE(info->matches.MatchesURL(GURL("http://appspot.com/foo.html")));
+  EXPECT_TRUE(info->matches.MatchesURL(GURL("http://com")));
+  EXPECT_TRUE(info->matches.MatchesURL(GURL("http://go/here")));
+
+  // TLD-style patterns should *not* match any subdomains of the TLD.
+  EXPECT_FALSE(
+      info->matches.MatchesURL(GURL("http://codereview.appspot.com/foo.html")));
+  EXPECT_FALSE(
+      info->matches.MatchesURL(GURL("http://chromium.com/index.html")));
+  EXPECT_FALSE(info->matches.MatchesURL(GURL("http://here.go/somewhere")));
+
+  // Paths that don't have any wildcards should match the exact domain, but
+  // ignore the trailing slash. This is kind of a corner case, so let's test it.
+  EXPECT_TRUE(info->matches.MatchesURL(GURL("http://no.wildcard.path")));
+  EXPECT_TRUE(info->matches.MatchesURL(GURL("http://no.wildcard.path/")));
+  EXPECT_FALSE(info->matches.MatchesURL(
+        GURL("http://no.wildcard.path/index.html")));
 }
 
 TEST_F(ExternallyConnectableTest, IDs) {
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("externally_connectable_ids.json");
   ASSERT_TRUE(extension);
 
   ExternallyConnectableInfo* info = ExternallyConnectableInfo::Get(extension);
   ASSERT_TRUE(info);
 
@@ skipping 72 matching lines @@
 }
 
 TEST_F(ExternallyConnectableTest, ErrorBadMatches) {
   RunTestcase(
       Testcase("externally_connectable_error_bad_matches.json",
                ErrorUtils::FormatErrorMessage(errors::kErrorInvalidMatchPattern,
                                               "www.yahoo.com")),
       EXPECT_TYPE_ERROR);
 }
 
+TEST_F(ExternallyConnectableTest, ErrorNoAllURLs) {
+  RunTestcase(
+      Testcase(
+          "externally_connectable_error_all_urls.json",
+          ErrorUtils::FormatErrorMessage(errors::kErrorWildcardHostsNotAllowed,
+                                         "<all_urls>")),
+      EXPECT_TYPE_ERROR);
+}
+
+TEST_F(ExternallyConnectableTest, ErrorWildcardHost) {
+  RunTestcase(
+      Testcase(
+          "externally_connectable_error_wildcard_host.json",
+          ErrorUtils::FormatErrorMessage(errors::kErrorWildcardHostsNotAllowed,
+                                         "http://*/*")),
+      EXPECT_TYPE_ERROR);
+}
+
+TEST_F(ExternallyConnectableTest, ErrorNoTLD) {
+  RunTestcase(
+      Testcase(
+          "externally_connectable_error_tld.json",
+          ErrorUtils::FormatErrorMessage(
+              errors::kErrorTopLevelDomainsNotAllowed,
+              "co.uk",
+              "http://*.co.uk/*")),
+      EXPECT_TYPE_ERROR);
+}
+
+TEST_F(ExternallyConnectableTest, ErrorNoEffectiveTLD) {
+  RunTestcase(
+      Testcase(
+          "externally_connectable_error_effective_tld.json",
+          ErrorUtils::FormatErrorMessage(
+              errors::kErrorTopLevelDomainsNotAllowed,
+              "appspot.com",
+              "http://*.appspot.com/*")),
+      EXPECT_TYPE_ERROR);
+}
+
+TEST_F(ExternallyConnectableTest, ErrorUnknownTLD) {
+  RunTestcase(
+      Testcase(
+          "externally_connectable_error_unknown_tld.json",
+          ErrorUtils::FormatErrorMessage(
+              errors::kErrorTopLevelDomainsNotAllowed,
+              "notatld",
+              "http://*.notatld/*")),
+      EXPECT_TYPE_ERROR);
+}
+
 }  // namespace extensions