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

Unified Diff: extensions/renderer/script_context.cc

Issue 226663003: Allow content script insertion on about:-URLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move GetEffectiveDocumentURL to ScriptContext Created 6 years, 7 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
« no previous file with comments | « extensions/renderer/script_context.h ('k') | extensions/renderer/script_context_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/script_context.cc
diff --git a/extensions/renderer/script_context.cc b/extensions/renderer/script_context.cc
index 33a9413632cbc407c2594410bec8aa3ebb8614c5..2a2e6f05f1cdd52e0407755da183c1d2cf31219f 100644
--- a/extensions/renderer/script_context.cc
+++ b/extensions/renderer/script_context.cc
@@ -8,6 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_split.h"
#include "base/values.h"
+#include "content/public/common/url_constants.h"
#include "content/public/renderer/render_view.h"
#include "content/public/renderer/v8_value_converter.h"
#include "extensions/common/extension.h"
@@ -15,8 +16,10 @@
#include "extensions/common/extension_urls.h"
#include "extensions/common/features/base_feature_provider.h"
#include "third_party/WebKit/public/web/WebDataSource.h"
+#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
+#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "v8/include/v8.h"
@@ -162,6 +165,35 @@ GURL ScriptContext::GetDataSourceURLForFrame(const blink::WebFrame* frame) {
return GURL(data_source->request().url());
}
+// static
+GURL ScriptContext::GetEffectiveDocumentURL(const blink::WebFrame* frame,
+ const GURL& document_url,
+ bool match_about_blank) {
+ // Common scenario. If |match_about_blank| is false (as is the case in most
+ // extensions), or if the frame is not an about:-page, just return
+ // |document_url| (supposedly the URL of the frame).
+ if (!match_about_blank || !document_url.SchemeIs(content::kAboutScheme))
+ return document_url;
+
+ // Non-sandboxed about:blank and about:srcdoc pages inherit their security
+ // origin from their parent frame/window. So, traverse the frame/window
+ // hierarchy to find the closest non-about:-page and return its URL.
+ const blink::WebFrame* parent = frame;
+ do {
+ parent = parent->parent() ? parent->parent() : parent->opener();
+ } while (parent != NULL &&
+ GURL(parent->document().url()).SchemeIs(content::kAboutScheme));
+
+ if (parent) {
+ // Only return the parent URL if the frame can access it.
+ const blink::WebDocument& parent_document = parent->document();
+ if (frame->document().securityOrigin().canAccess(
+ parent_document.securityOrigin()))
+ return parent_document.url();
+ }
+ return document_url;
+}
+
ScriptContext* ScriptContext::GetContext() { return this; }
void ScriptContext::OnResponseReceived(const std::string& name,
« no previous file with comments | « extensions/renderer/script_context.h ('k') | extensions/renderer/script_context_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698