Don't grant special privs to any http URL, ever.

BUG=172984 Review URL: https://chromiumcodereview.appspot.com/12089059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179583 0039d316-1c4b-4281-b951-d872f2087c98
chromium · Jan 30, 2013 · a571620 · a571620
1 parent a95ef63
commit a571620
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
@@ -673,10 +673,10 @@ bool ChromeContentRendererClient::IsNaClAllowed(
   // Temporarily allow these URLs to run NaCl apps. We should remove this
   // code when PNaCl ships.
   bool is_whitelisted_url =
-      ((top_url.SchemeIs("http") || top_url.SchemeIs("https")) &&
+      top_url.SchemeIs("https") &&
       (top_url.host() == "plus.google.com" ||
           top_url.host() == "plus.sandbox.google.com") &&
-      top_url.path().find("/games") == 0);
+      top_url.path().find("/games") == 0;
 
   // Allow Chrome Web Store extensions, built-in extensions, extensions
   // under development, invocations from whitelisted URLs, and all invocations

diff --git a/chrome/renderer/chrome_content_renderer_client_unittest.cc b/chrome/renderer/chrome_content_renderer_client_unittest.cc
@@ -136,7 +136,7 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
   // interfaces.
   {
     WebPluginParams params;
-    EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
+    EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
         GURL(), GURL("http://plus.google.com/games"),
         kNaClRestricted, kExtensionRestricted, kExtensionNotFromWebStore,
         &params));
@@ -151,7 +151,7 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
         kNaClRestricted, kExtensionRestricted, kExtensionNotFromWebStore,
         &params));
     EXPECT_FALSE(AllowsDevInterfaces(params));
-    EXPECT_TRUE(ChromeContentRendererClient::IsNaClAllowed(
+    EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
         GURL(), GURL("http://plus.sandbox.google.com/games"),
         kNaClRestricted, kExtensionRestricted, kExtensionNotFromWebStore,
         &params));
@@ -191,7 +191,7 @@ TEST_F(ChromeContentRendererClientTest, NaClRestriction) {
   {
     WebPluginParams params;
     EXPECT_FALSE(ChromeContentRendererClient::IsNaClAllowed(
-        GURL(), GURL("http://plus.google.com.evil.com/games"),
+        GURL(), GURL("https://plus.google.com.evil.com/games"),
         kNaClRestricted, kExtensionRestricted, kExtensionNotFromWebStore,
         &params));
   }