third_party/WebKit/Source/core/frame/DOMWindow.cpp - Issue 1887553002: Make sure binding security checks don't pass if the frame is remote.

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/frame/DOMWindow.cpp

Issue 1887553002: Make sure binding security checks don't pass if the frame is remote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fixes for --site-per-process and more periods. Created 4 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

« content/browser/frame_host/render_frame_host_manager_browsertest.cc ('K') | « third_party/WebKit/Source/bindings/core/v8/BindingSecurity.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/DOMWindow.cpp

diff --git a/third_party/WebKit/Source/core/frame/DOMWindow.cpp b/third_party/WebKit/Source/core/frame/DOMWindow.cpp

index 084b65ec30319fcf20e9834bcd310d10a18a933b..a02e3cc70b21c70290d911d236fb7b061dc26b05 100644

--- a/third_party/WebKit/Source/core/frame/DOMWindow.cpp

+++ b/third_party/WebKit/Source/core/frame/DOMWindow.cpp

@@ -263,7 +263,10 @@ String DOMWindow::crossDomainAccessErrorMessage(const LocalDOMWindow* callingWin

// FIXME: This message, and other console messages, have extra newlines. Should remove them.

const SecurityOrigin* activeOrigin = callingWindow->document()->getSecurityOrigin();

const SecurityOrigin* targetOrigin = frame()->securityContext()->getSecurityOrigin();

- ASSERT(!activeOrigin->canAccessCheckSuborigins(targetOrigin));

+ // It's possible for a remote frame to be same origin with respect to a

+ // local frame, but it must still be treated as a disallowed cross-domain

+ // access. See https://crbug.com/601629.

+ ASSERT(frame()->isRemoteFrame() || !activeOrigin->canAccessCheckSuborigins(targetOrigin));

String message = "Blocked a frame with origin \"" + activeOrigin->toString() + "\" from accessing a frame with origin \"" + targetOrigin->toString() + "\". ";