Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: chrome/browser/extensions/api/web_request/web_request_permissions.cc

Issue 14358004: Almost all actions in Declarative Web Request require all_urls host permissions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: All URLs -> all hosts; also rebased Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/web_request/web_request_permissions.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions.cc b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
index 9baaef4c46b58c7be34db7701774ddf9fee5e093..cf981c915e81c48ff6d93e3ad3071727ee509f5d 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions.cc
@@ -97,7 +97,7 @@ bool WebRequestPermissions::CanExtensionAccessURL(
const std::string& extension_id,
const GURL& url,
bool crosses_incognito,
- bool enforce_host_permissions) {
+ HostPermissionsCheck host_permissions_check) {
// extension_info_map can be NULL in testing.
if (!extension_info_map)
return true;
@@ -111,13 +111,21 @@ bool WebRequestPermissions::CanExtensionAccessURL(
if (crosses_incognito && !extension_info_map->CanCrossIncognito(extension))
return false;
- if (enforce_host_permissions) {
- // about: URLs are not covered in host permissions, but are allowed anyway.
- bool host_permissions_ok = (url.SchemeIs(chrome::kAboutScheme) ||
- extension->HasHostPermission(url) ||
- url.GetOrigin() == extension->url());
- if (!host_permissions_ok)
- return false;
+ switch (host_permissions_check) {
+ case DO_NOT_CHECK_HOST:
+ break;
+ case REQUIRE_HOST_PERMISSION:
+ // about: URLs are not covered in host permissions, but are allowed
+ // anyway.
+ if (!((url.SchemeIs(chrome::kAboutScheme) ||
+ extension->HasHostPermission(url) ||
+ url.GetOrigin() == extension->url())))
+ return false;
+ break;
+ case REQUIRE_ALL_URLS:
+ if (!extension->HasEffectiveAccessToAllHosts())
+ return false;
+ break;
}
return true;

Powered by Google App Engine
This is Rietveld 408576698