<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202175] branches/safari-601-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202175">202175</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 12:51:33 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/202151">r202151</a>. rdar://problem/26701322</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomDocumentcpp">branches/safari-601-branch/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformURLcpp">branches/safari-601-branch/Source/WebCore/platform/URL.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformURLh">branches/safari-601-branch/Source/WebCore/platform/URL.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumentexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumenthtml">branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumentexpectedtxt">branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumenthtml">branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (202174 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-06-17 19:50:45 UTC (rev 202174)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-06-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r202151.
+
+ 2016-06-16 John Wilander <wilander@apple.com>
+
+ Restrict security origin inheritance to empty, about:blank, and about:srcdoc URLs
+ https://bugs.webkit.org/show_bug.cgi?id=158855
+ <rdar://problem/26142632>
+
+ Reviewed by Alex Christensen.
+
+ * http/tests/dom/window-open-about-blank-and-access-document-expected.txt: Added.
+ * http/tests/dom/window-open-about-blank-and-access-document.html: Added.
+ * http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt: Added.
+ * http/tests/dom/window-open-about-webkit-org-and-access-document.html: Added.
+
</ins><span class="cx"> 2016-06-10 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r201287. rdar://problem/26228555
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumentexpectedtxtfromrev202171branchessafari601146branchLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumentexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt (from rev 202171, branches/safari-601.1.46-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt) (0 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document-expected.txt 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 1: Injected script running.
+
+PASS newWindow.document is defined.
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumenthtmlfromrev202171branchessafari601146branchLayoutTestshttptestsdomwindowopenaboutblankandaccessdocumenthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html (from rev 202171, branches/safari-601.1.46-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html) (0 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-blank-and-access-document.html 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="UTF-8">
+ <title>Tests opening a new about:blank window and accessing its document</title>
+ <script src="../resources/js-test-pre.js"></script>
+ <script>
+ var newWindow;
+
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.waitUntilDone();
+ }
+
+ function checkNewWindowDocumentIsUndefined () {
+ shouldBeDefined("newWindow.document");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function clickHandler() {
+ newWindow = window.open("about:blank");
+ try {
+ newWindow.document.write("<scri" + "pt>console.log('Injected script running.')</sc" + "ript>");
+ setTimeout(checkNewWindowDocumentIsUndefined, 500);
+ } catch (e) {
+ testFailed("Was not able to write to the new window's document.");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ }
+
+ function clickButton() {
+ var button = document.getElementById("test");
+ var buttonX = button.offsetLeft + button.offsetWidth / 2;
+ var buttonY = button.offsetTop + button.offsetHeight / 2;
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(buttonX, buttonY);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+ }
+ </script>
+</head>
+<body onload="clickButton()">
+<button id="test" onclick="clickHandler()"></button>
+<div id="console"></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumentexpectedtxtfromrev202171branchessafari601146branchLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumentexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt (from rev 202171, branches/safari-601.1.46-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt) (0 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document-expected.txt 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+CONSOLE MESSAGE: line 45: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "null". The frame requesting access has a protocol of "http", the frame being accessed has a protocol of "about". Protocols must match.
+
+CONSOLE MESSAGE: line 347: Blocked a frame with origin "http://127.0.0.1:8000" from accessing a frame with origin "null". The frame requesting access has a protocol of "http", the frame being accessed has a protocol of "about". Protocols must match.
+
+
+PASS newWindow.document is undefined.
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumenthtmlfromrev202171branchessafari601146branchLayoutTestshttptestsdomwindowopenaboutwebkitorgandaccessdocumenthtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html (from rev 202171, branches/safari-601.1.46-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html) (0 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/http/tests/dom/window-open-about-webkit-org-and-access-document.html 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <title>Tests opening a new about://webkit.org window and accessing its document</title>
+ <script src="../resources/js-test-pre.js"></script>
+ <script>
+ var newWindow;
+
+ if (window.testRunner) {
+ testRunner.setCanOpenWindows();
+ testRunner.waitUntilDone();
+ }
+
+ function checkNewWindowDocumentIsUndefined () {
+ shouldBeUndefined("newWindow.document");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ function clickHandler() {
+ newWindow = window.open("about://webkit.org");
+ try {
+ newWindow.document.write("<scri" + "pt>console.log('Injected script running.')</sc" + "ript>");
+ testFailed("Was able to write to the new window's document.");
+ if (window.testRunner)
+ testRunner.notifyDone();
+ } catch (e) {
+ setTimeout(checkNewWindowDocumentIsUndefined, 500);
+ }
+ }
+
+ function clickButton() {
+ var button = document.getElementById("test");
+ var buttonX = button.offsetLeft + button.offsetWidth / 2;
+ var buttonY = button.offsetTop + button.offsetHeight / 2;
+ if (window.eventSender) {
+ eventSender.mouseMoveTo(buttonX, buttonY);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ }
+ }
+ </script>
+</head>
+<body onload="clickButton()">
+<button id="test" onclick="clickHandler()"></button>
+<div id="console"></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (202174 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2016-06-17 19:50:45 UTC (rev 202174)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2016-06-17 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r202151.
+
+ 2016-06-16 John Wilander <wilander@apple.com>
+
+ Restrict security origin inheritance to empty, about:blank, and about:srcdoc URLs
+ https://bugs.webkit.org/show_bug.cgi?id=158855
+ <rdar://problem/26142632>
+
+ Reviewed by Alex Christensen.
+
+ Tests: http/tests/dom/window-open-about-blank-and-access-document.html
+ http/tests/dom/window-open-about-webkit-org-and-access-document.html
+
+ Document.cpp previously checked whether a document should inherit its owner's
+ security origin by checking if the URL is either empty or blank. URL.cpp in
+ turn only checks if the protocol is "about:" in the isBlankURL() function.
+ Thus all about:* URLs inherited security origin. This patch restricts
+ security origin inheritance to empty, about:blank, and about:srcdoc URLs.
+
+ Quotes and links from the WHATWG spec regarding about:srcdoc:
+
+ 7.1 Browsing contexts
+ A browsing context can have a creator browsing context, the browsing context
+ that was responsible for its creation. If a browsing context has a parent
+ browsing context, then that is its creator browsing context. Otherwise, if the
+ browsing context has an opener browsing context, then that is its creator
+ browsing context. Otherwise, the browsing context has no creator browsing
+ context.
+ https://html.spec.whatwg.org/multipage/browsers.html#concept-document-bc
+
+ 7.1.1 Nested browsing contexts
+ Certain elements (for example, iframe elements) can instantiate further
+ browsing contexts. These are called nested browsing contexts. If a browsing
+ context P has a Document D with an element E that nests another browsing
+ context C inside it, then C is said to be nested through D, and E is said to
+ be the browsing context container of C. If the browsing context container
+ element E is in the Document D, then P is said to be the parent browsing
+ context of C and C is said to be a child browsing context of P. Otherwise,
+ the nested browsing context C has no parent browsing context.
+ https://html.spec.whatwg.org/multipage/browsers.html#nested-browsing-context
+
+ 4.8.5 The iframe element
+ The iframe element represents a nested browsing context.
+ ...
+ If the srcdoc attribute is specified
+ Navigate the element's child browsing context to a new response whose
+ url list consists of about:srcdoc ...
+ https://html.spec.whatwg.org/multipage/embedded-content.html#attr-iframe-srcdoc
+
+ * dom/Document.cpp:
+ (WebCore::Document::initSecurityContext):
+ Now uses the URL::shouldInheritSecurityOriginFromOwner() function instead.
+ (WebCore::Document::initContentSecurityPolicy):
+ Now uses the URL::shouldInheritSecurityOriginFromOwner() function instead.
+ (WebCore::shouldInheritSecurityOriginFromOwner): Deleted.
+ Moved to URL::shouldInheritSecurityOriginFromOwner() and restricted the check.
+ * platform/URL.cpp:
+ (WebCore::URL::shouldInheritSecurityOriginFromOwner):
+ * platform/URL.h:
+ Moved the function from Document and restricted the check to only allow
+ security origin inheritance for empty, about:blank, and about:srcdoc URLs.
+
</ins><span class="cx"> 2016-05-16 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r200986.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/Document.cpp (202174 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/Document.cpp 2016-06-17 19:50:45 UTC (rev 202174)
+++ branches/safari-601-branch/Source/WebCore/dom/Document.cpp 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -321,19 +321,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool shouldInheritSecurityOriginFromOwner(const URL& url)
-{
- // http://www.whatwg.org/specs/web-apps/current-work/#origin-0
- //
- // If a Document has the address "about:blank"
- // The origin of the Document is the origin it was assigned when its browsing context was created.
- //
- // Note: We generalize this to all "blank" URLs and invalid URLs because we
- // treat all of these URLs as about:blank.
- //
- return url.isEmpty() || url.isBlankURL();
-}
-
</del><span class="cx"> static Widget* widgetForElement(Element* focusedElement)
</span><span class="cx"> {
</span><span class="cx"> if (!focusedElement)
</span><span class="lines">@@ -4986,7 +4973,7 @@
</span><span class="cx"> setBaseURLOverride(parentDocument->baseURL());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!shouldInheritSecurityOriginFromOwner(m_url))
</del><ins>+ if (!m_url.shouldInheritSecurityOriginFromOwner())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // If we do not obtain a meaningful origin from the URL, then we try to
</span><span class="lines">@@ -5019,7 +5006,7 @@
</span><span class="cx">
</span><span class="cx"> void Document::initContentSecurityPolicy()
</span><span class="cx"> {
</span><del>- if (!m_frame->tree().parent() || (!shouldInheritSecurityOriginFromOwner(m_url) && !isPluginDocument()))
</del><ins>+ if (!m_frame->tree().parent() || (!m_url.shouldInheritSecurityOriginFromOwner() && !isPluginDocument()))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> contentSecurityPolicy()->copyStateFrom(m_frame->tree().parent()->document()->contentSecurityPolicy());
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformURLcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/URL.cpp (202174 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/URL.cpp 2016-06-17 19:50:45 UTC (rev 202174)
+++ branches/safari-601-branch/Source/WebCore/platform/URL.cpp 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -1980,6 +1980,13 @@
</span><span class="cx"> return protocolIs("about");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool URL::shouldInheritSecurityOriginFromOwner() const
+{
+ return isEmpty()
+ || m_string == blankURL().string()
+ || m_string == "about:srcdoc";
+}
+
</ins><span class="cx"> bool isDefaultPortForProtocol(unsigned short port, const String& protocol)
</span><span class="cx"> {
</span><span class="cx"> if (protocol.isEmpty())
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformURLh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/URL.h (202174 => 202175)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/URL.h 2016-06-17 19:50:45 UTC (rev 202174)
+++ branches/safari-601-branch/Source/WebCore/platform/URL.h 2016-06-17 19:51:33 UTC (rev 202175)
</span><span class="lines">@@ -129,6 +129,7 @@
</span><span class="cx"> bool protocolIsInHTTPFamily() const;
</span><span class="cx"> WEBCORE_EXPORT bool isLocalFile() const;
</span><span class="cx"> bool isBlankURL() const;
</span><ins>+ bool shouldInheritSecurityOriginFromOwner() const;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT bool setProtocol(const String&);
</span><span class="cx"> void setHost(const String&);
</span></span></pre>
</div>
</div>
</body>
</html>