tab capture: Change the permissions for tabs.captureVisibleTab().

chrome/browser/extensions/active_tab_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/values.h"
@@ skipping 66 matching lines @@
 
   int tab_id() {
     return SessionID::IdForTab(web_contents());
   }
 
   ActiveTabPermissionGranter* active_tab_permission_granter() {
     return extensions::TabHelper::FromWebContents(web_contents())->
         active_tab_permission_granter();
   }
 
-  bool IsAllowed(const scoped_refptr<const Extension>& extension,
+  bool IsScriptAllowed(const scoped_refptr<const Extension>& extension,

[not at google - send to devlin, 2014/01/21 21:44:21]

Comment for whole file: this is a pretty severe change to this file. The
splitting up of allowed into IsScriptAllowed and IsCaptureAllowed also feels a
bit unnatural.

Perhaps just keep them as IsAllowed/IsBlocked and in the IsAllowed case accept
some kind of enum? Like ALL vs SCRIPT_ONLY or something (default as ALL).

[sadrul, 2014/01/23 20:11:14]

Done.

                  const GURL& url) {
-    return IsAllowed(extension, url, tab_id());
+    return IsScriptAllowed(extension, url, tab_id());
   }
 
-  bool IsAllowed(const scoped_refptr<const Extension>& extension,
+  bool IsScriptAllowed(const scoped_refptr<const Extension>& extension,
                  const GURL& url,
                  int tab_id) {
     return PermissionsData::CanExecuteScriptOnPage(
-               extension.get(), url, url, tab_id, NULL, -1, NULL) &&
-           PermissionsData::CanCaptureVisiblePage(
-               extension.get(), url, tab_id, NULL) &&
-           HasTabsPermission(extension, tab_id);
+               extension.get(), url, url, tab_id, NULL, -1, NULL);
   }
 
-  bool IsBlocked(const scoped_refptr<const Extension>& extension,
-                 const GURL& url) {
-    return IsBlocked(extension, url, tab_id());
+  bool IsCaptureAllowed(const scoped_refptr<const Extension>& extension) {
+    return HasTabsPermission(extension, tab_id()) &&
+        PermissionsData::CanCaptureVisiblePage(extension.get(), tab_id(), NULL);
   }
 
-  bool IsBlocked(const scoped_refptr<const Extension>& extension,
-                 const GURL& url,
-                 int tab_id) {
+  bool IsBothBlocked(const scoped_refptr<const Extension>& extension,
+                 const GURL& url) {
+    return IsBothBlocked(extension, url, tab_id());
+  }
+
+  bool IsBothBlocked(const scoped_refptr<const Extension>& extension,
+                     const GURL& url,
+                     int tab_id) {
     // Note: can't check HasTabsPermission because it isn't URL specific.
     return !PermissionsData::CanExecuteScriptOnPage(
                extension.get(), url, url, tab_id, NULL, -1, NULL) &&
            !PermissionsData::CanCaptureVisiblePage(
-               extension.get(), url, tab_id, NULL);
+               extension.get(), tab_id, NULL);

[not at google - send to devlin, 2014/01/21 21:44:21]

indentation around here needs updating

   }
 
   bool HasTabsPermission(const scoped_refptr<const Extension>& extension) {
     return HasTabsPermission(extension, tab_id());
   }
 
   bool HasTabsPermission(const scoped_refptr<const Extension>& extension,
                          int tab_id) {
     return PermissionsData::HasAPIPermissionForTab(
         extension.get(), tab_id, APIPermission::kTab);
@@ skipping 21 matching lines @@
 
   // An extension with both the activeTab and tabCapture permission.
   scoped_refptr<const Extension> extension_with_tab_capture;
 };
 
 TEST_F(ActiveTabTest, GrantToSinglePage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   // No access unless it's been granted.
-  EXPECT_TRUE(IsBlocked(extension, google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsBothBlocked(extension, google));
+  EXPECT_TRUE(IsBothBlocked(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
 
   EXPECT_FALSE(HasTabsPermission(extension));
   EXPECT_FALSE(HasTabsPermission(another_extension));
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab.get());
 
+  EXPECT_TRUE(IsCaptureAllowed(extension));
+  EXPECT_FALSE(IsCaptureAllowed(another_extension));
+  EXPECT_FALSE(IsCaptureAllowed(extension_without_active_tab));
+
   // Granted to extension and extension_without_active_tab, but the latter
   // doesn't have the activeTab permission so not granted.
-  EXPECT_TRUE(IsAllowed(extension, google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsScriptAllowed(extension, google));
+  EXPECT_TRUE(IsBothBlocked(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
 
   // Other subdomains shouldn't be given access.
   GURL mail_google("http://mail.google.com");
-  EXPECT_TRUE(IsBlocked(extension, mail_google));
-  EXPECT_TRUE(IsBlocked(another_extension, mail_google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, mail_google));
+  EXPECT_FALSE(IsScriptAllowed(extension, mail_google));
+  EXPECT_FALSE(IsScriptAllowed(another_extension, mail_google));
+  EXPECT_FALSE(IsScriptAllowed(extension_without_active_tab, mail_google));
 
   // Reloading the page should clear the active permissions.
   Reload();
 
-  EXPECT_TRUE(IsBlocked(extension, google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsBothBlocked(extension, google));
+  EXPECT_TRUE(IsBothBlocked(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
 
   EXPECT_FALSE(HasTabsPermission(extension));
   EXPECT_FALSE(HasTabsPermission(another_extension));
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
   // But they should still be able to be granted again.
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
-  EXPECT_TRUE(IsAllowed(extension, google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsCaptureAllowed(extension));
+
+  EXPECT_TRUE(IsScriptAllowed(extension, google));
+  EXPECT_TRUE(IsBothBlocked(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
 
   // And grant a few more times redundantly for good measure.
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
 
-  EXPECT_TRUE(IsAllowed(extension, google));
-  EXPECT_TRUE(IsAllowed(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsCaptureAllowed(extension));
+  EXPECT_TRUE(IsCaptureAllowed(another_extension));
+
+  EXPECT_TRUE(IsScriptAllowed(extension, google));
+  EXPECT_TRUE(IsScriptAllowed(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
 
   // Navigating to a new URL should clear the active permissions.
   GURL chromium("http://www.chromium.org");
   NavigateAndCommit(chromium);
 
-  EXPECT_TRUE(IsBlocked(extension, google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsBothBlocked(extension, google));
+  EXPECT_TRUE(IsBothBlocked(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
 
-  EXPECT_TRUE(IsBlocked(extension, chromium));
-  EXPECT_TRUE(IsBlocked(another_extension, chromium));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, chromium));
+  EXPECT_TRUE(IsBothBlocked(extension, chromium));
+  EXPECT_TRUE(IsBothBlocked(another_extension, chromium));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, chromium));
 
   EXPECT_FALSE(HasTabsPermission(extension));
   EXPECT_FALSE(HasTabsPermission(another_extension));
   EXPECT_FALSE(HasTabsPermission(extension_without_active_tab));
 
   // Should be able to grant to multiple extensions at the same time (if they
   // have the activeTab permission, of course).
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab.get());
 
-  EXPECT_TRUE(IsBlocked(extension, google));
-  EXPECT_TRUE(IsBlocked(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsCaptureAllowed(extension));
+  EXPECT_TRUE(IsCaptureAllowed(another_extension));
 
-  EXPECT_TRUE(IsAllowed(extension, chromium));
-  EXPECT_TRUE(IsAllowed(another_extension, chromium));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, chromium));
+  EXPECT_FALSE(IsScriptAllowed(extension, google));
+  EXPECT_FALSE(IsScriptAllowed(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
+
+  EXPECT_TRUE(IsScriptAllowed(extension, chromium));
+  EXPECT_TRUE(IsScriptAllowed(another_extension, chromium));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, chromium));
 
   // Should be able to go back to URLs that were previously cleared.
   NavigateAndCommit(google);
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
   active_tab_permission_granter()->GrantIfRequested(another_extension.get());
   active_tab_permission_granter()->GrantIfRequested(
       extension_without_active_tab.get());
 
-  EXPECT_TRUE(IsAllowed(extension, google));
-  EXPECT_TRUE(IsAllowed(another_extension, google));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, google));
+  EXPECT_TRUE(IsCaptureAllowed(extension));
+  EXPECT_TRUE(IsCaptureAllowed(another_extension));
 
-  EXPECT_TRUE(IsBlocked(extension, chromium));
-  EXPECT_TRUE(IsBlocked(another_extension, chromium));
-  EXPECT_TRUE(IsBlocked(extension_without_active_tab, chromium));
+  EXPECT_TRUE(IsScriptAllowed(extension, google));
+  EXPECT_TRUE(IsScriptAllowed(another_extension, google));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, google));
+
+  EXPECT_FALSE(IsScriptAllowed(extension, chromium));
+  EXPECT_FALSE(IsScriptAllowed(another_extension, chromium));
+  EXPECT_TRUE(IsBothBlocked(extension_without_active_tab, chromium));
 };
 
 TEST_F(ActiveTabTest, Uninstalling) {
   // Some semi-arbitrary setup.
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   EXPECT_TRUE(IsGrantedForTab(extension.get(), web_contents()));
-  EXPECT_TRUE(IsAllowed(extension, google));
+  EXPECT_TRUE(IsScriptAllowed(extension, google));
 
   // Uninstalling the extension should clear its tab permissions.
   UnloadedExtensionInfo details(extension.get(),
                                 UnloadedExtensionInfo::REASON_DISABLE);
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_UNLOADED,
       content::Source<Profile>(Profile::FromBrowserContext(
           web_contents()->GetBrowserContext())),
       content::Details<UnloadedExtensionInfo>(&details));
 
-  // Note: can't EXPECT_FALSE(IsAllowed) here because uninstalled extensions
-  // are just that... considered to be uninstalled, and the manager might
-  // just ignore them from here on.
+  // Note: can't EXPECT_FALSE(IsScriptAllowed) here because uninstalled
+  // extensions are just that... considered to be uninstalled, and the manager
+  // might just ignore them from here on.
 
   // Granting the extension again should give them back.
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   EXPECT_TRUE(IsGrantedForTab(extension.get(), web_contents()));
-  EXPECT_TRUE(IsAllowed(extension, google));
+  EXPECT_TRUE(IsScriptAllowed(extension, google));
 }
 
 TEST_F(ActiveTabTest, OnlyActiveTab) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
-  EXPECT_TRUE(IsAllowed(extension, google, tab_id()));
-  EXPECT_TRUE(IsBlocked(extension, google, tab_id() + 1));
+  EXPECT_TRUE(IsScriptAllowed(extension, google, tab_id()));
+  EXPECT_TRUE(IsBothBlocked(extension, google, tab_id() + 1));
   EXPECT_FALSE(HasTabsPermission(extension, tab_id() + 1));
 }
 
 TEST_F(ActiveTabTest, NavigateInPage) {
   GURL google("http://www.google.com");
   NavigateAndCommit(google);
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
   // Perform an in-page navigation. The extension should not lose the temporary
   // permission.
   GURL google_h1("http://www.google.com#h1");
   NavigateAndCommit(google_h1);
 
-  EXPECT_TRUE(IsAllowed(extension, google, tab_id()));
-  EXPECT_TRUE(IsAllowed(extension, google_h1, tab_id()));
+  EXPECT_TRUE(IsScriptAllowed(extension, google, tab_id()));
+  EXPECT_TRUE(IsScriptAllowed(extension, google_h1, tab_id()));
 
   GURL chromium("http://www.chromium.org");
   NavigateAndCommit(chromium);
 
-  EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, chromium, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google_h1, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, chromium, tab_id()));
 
   active_tab_permission_granter()->GrantIfRequested(extension.get());
 
-  EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
-  EXPECT_TRUE(IsAllowed(extension, chromium, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google_h1, tab_id()));
+  EXPECT_TRUE(IsScriptAllowed(extension, chromium, tab_id()));
 
   GURL chromium_h1("http://www.chromium.org#h1");
   NavigateAndCommit(chromium_h1);
 
-  EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
-  EXPECT_TRUE(IsAllowed(extension, chromium, tab_id()));
-  EXPECT_TRUE(IsAllowed(extension, chromium_h1, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google_h1, tab_id()));
+  EXPECT_TRUE(IsScriptAllowed(extension, chromium, tab_id()));
+  EXPECT_TRUE(IsScriptAllowed(extension, chromium_h1, tab_id()));
 
   Reload();
 
-  EXPECT_FALSE(IsAllowed(extension, google, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, google_h1, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, chromium, tab_id()));
-  EXPECT_FALSE(IsAllowed(extension, chromium_h1, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, google_h1, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, chromium, tab_id()));
+  EXPECT_FALSE(IsScriptAllowed(extension, chromium_h1, tab_id()));
 }
 
 TEST_F(ActiveTabTest, ChromeUrlGrants) {
   GURL internal("chrome://version");
   NavigateAndCommit(internal);
   active_tab_permission_granter()->GrantIfRequested(
       extension_with_tab_capture.get());
   // Do not grant tabs/hosts permissions for tab.
-  EXPECT_TRUE(IsBlocked(extension_with_tab_capture, internal, tab_id()));
+  EXPECT_TRUE(IsCaptureAllowed(extension_with_tab_capture));
+  EXPECT_FALSE(IsScriptAllowed(extension_with_tab_capture, internal, tab_id()));
   EXPECT_TRUE(PermissionsData::HasAPIPermissionForTab(
       extension_with_tab_capture.get(),
       tab_id(),
       APIPermission::kTabCaptureForTab));
 
-  EXPECT_TRUE(IsBlocked(extension_with_tab_capture, internal, tab_id() + 1));
+  EXPECT_TRUE(
+      IsBothBlocked(extension_with_tab_capture, internal, tab_id() + 1));
   EXPECT_FALSE(PermissionsData::HasAPIPermissionForTab(
       extension_with_tab_capture.get(),
       tab_id() + 1,
       APIPermission::kTabCaptureForTab));
 }
 
 }  // namespace
 }  // namespace extensions