diff options
| author | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 02:11:29 +0000 |
|---|---|---|
| committer | kalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-09 02:11:29 +0000 |
| commit | 3eb826e28ab94410820ac8cae4fcdee5b330400b (patch) | |
| tree | ec50d25fba62bf2fecc2b4f9dec610f617f298d7 /chrome/renderer | |
| parent | 59915cac692a5685fbeec5392e2c35dbcd8b28cb (diff) | |
| download | chromium_src-3eb826e28ab94410820ac8cae4fcdee5b330400b.zip chromium_src-3eb826e28ab94410820ac8cae4fcdee5b330400b.tar.gz chromium_src-3eb826e28ab94410820ac8cae4fcdee5b330400b.tar.bz2 | |
Check that extensions referenced in chrome-extension://id URLs for unprivileged
pages (iframes etc) exist in Dispatcher::ClassifyJavaScriptContext.
BUG=139869
Review URL: https://chromiumcodereview.appspot.com/10827239
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150685 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer')
| -rw-r--r-- | chrome/renderer/extensions/dispatcher.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/renderer/extensions/dispatcher.cc b/chrome/renderer/extensions/dispatcher.cc index 2f9ded3..27abaad 100644 --- a/chrome/renderer/extensions/dispatcher.cc +++ b/chrome/renderer/extensions/dispatcher.cc @@ -1060,8 +1060,10 @@ Feature::Context Dispatcher::ClassifyJavaScriptContext( if (IsExtensionActive(extension_id)) return Feature::BLESSED_EXTENSION_CONTEXT; - if (extensions_.ExtensionBindingsAllowed(url_info)) - return Feature::UNBLESSED_EXTENSION_CONTEXT; + if (extensions_.ExtensionBindingsAllowed(url_info)) { + return extensions_.Contains(extension_id) ? + Feature::UNBLESSED_EXTENSION_CONTEXT : Feature::UNSPECIFIED_CONTEXT; + } if (url_info.url().is_valid()) return Feature::WEB_PAGE_CONTEXT; |