third_party/WebKit/Source/core/dom/Document.cpp - Issue 1507023004: Harden the implementation of '--disable-web-security'

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/dom/Document.cpp

Issue 1507023004: Harden the implementation of '--disable-web-security' (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: exclude //content/shell Created 5 years 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

« content/renderer/renderer_blink_platform_impl.cc ('K') | « content/shell/renderer/layout_test/layout_test_content_renderer_client.cc ('k') | third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h » ('j') | third_party/WebKit/Source/platform/weborigin/SecurityOrigin.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/Document.cpp

diff --git a/third_party/WebKit/Source/core/dom/Document.cpp b/third_party/WebKit/Source/core/dom/Document.cpp

index 5163577596583956aac44fb63d5c25e8caec1774..977a96494509155f82e701dd86b07426d62a99c9 100644

--- a/third_party/WebKit/Source/core/dom/Document.cpp

+++ b/third_party/WebKit/Source/core/dom/Document.cpp

@@ -4793,7 +4793,7 @@ void Document::initSecurityContext(const DocumentInit& initializer)

} else if (securityOrigin()->isLocal()) {

if (settings->allowUniversalAccessFromFileURLs()) {

// Some clients want local URLs to have universal access, but that setting is dangerous for other clients.

- securityOrigin()->grantUniversalAccess();

+ securityOrigin()->grantUniversalAccessForFileOrigins();

} else if (!settings->allowFileAccessFromFileURLs()) {

// Some clients do not want local URLs to have access to other local URLs.

securityOrigin()->blockLocalAccessFromLocalOrigin();