<!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>[287210] releases/WebKitGTK/webkit-2.34</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/287210">287210</a></dd>
<dt>Author</dt> <dd>aperez@igalia.com</dd>
<dt>Date</dt> <dd>2021-12-17 14:48:11 -0800 (Fri, 17 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/282084">r282084</a> - [wpt-improvement] Improve CSP support for window reuse
https://bugs.webkit.org/show_bug.cgi?id=229882
<rdar://78416553>

Reviewed by Chris Dumez.

LayoutTests/imported/w3c:

Rebaseline a test that now passes.

* web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed-expected.txt:

Source/WebCore:

If window.open is used to host content with a CSP sandbox header, we should always
create a new window, rather than reusing the existing one, unless the header
includes 'allow-same-site'.

This improves our WPT score.

Tested by: imported/w3c/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed.html

* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::responseReceived): Parse the HTTP headers earlier so we can
make decisions based on their state.
* loader/DocumentWriter.cpp:
(WebCore::DocumentWriter::begin): Don't reuse the current window if 'allow-same-site'
is not allowed.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit234LayoutTestsimportedw3cChangeLog">releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit234LayoutTestsimportedw3cwebplatformtestscontentsecuritypolicysandboxwindowreusesandboxedexpectedtxt">releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit234SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit234SourceWebCoreloaderDocumentLoadercpp">releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit234SourceWebCoreloaderDocumentWritercpp">releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentWriter.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit234LayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/ChangeLog (287209 => 287210)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/ChangeLog        2021-12-17 22:48:02 UTC (rev 287209)
+++ releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/ChangeLog   2021-12-17 22:48:11 UTC (rev 287210)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2021-09-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [wpt-improvement] Improve CSP support for window reuse
+        https://bugs.webkit.org/show_bug.cgi?id=229882
+        <rdar://78416553>
+
+        Reviewed by Chris Dumez.
+
+        Rebaseline a test that now passes.
+
+        * web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed-expected.txt:
+
</ins><span class="cx"> 2021-09-02  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [COOP] html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html WPT test is failing
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit234LayoutTestsimportedw3cwebplatformtestscontentsecuritypolicysandboxwindowreusesandboxedexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed-expected.txt (287209 => 287210)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed-expected.txt   2021-12-17 22:48:02 UTC (rev 287209)
+++ releases/WebKitGTK/webkit-2.34/LayoutTests/imported/w3c/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed-expected.txt      2021-12-17 22:48:11 UTC (rev 287210)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx"> 
</span><del>-FAIL Window object should not be reused assert_equals: expected (undefined) undefined but got (string) "test"
</del><ins>+PASS Window object should not be reused
</ins><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit234SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog (287209 => 287210)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog  2021-12-17 22:48:02 UTC (rev 287209)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/ChangeLog     2021-12-17 22:48:11 UTC (rev 287210)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-09-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [wpt-improvement] Improve CSP support for window reuse
+        https://bugs.webkit.org/show_bug.cgi?id=229882
+        <rdar://78416553>
+
+        Reviewed by Chris Dumez.
+
+        If window.open is used to host content with a CSP sandbox header, we should always
+        create a new window, rather than reusing the existing one, unless the header
+        includes 'allow-same-site'.
+
+        This improves our WPT score.
+
+        Tested by: imported/w3c/web-platform-tests/content-security-policy/sandbox/window-reuse-sandboxed.html
+
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::responseReceived): Parse the HTTP headers earlier so we can
+        make decisions based on their state.
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::begin): Don't reuse the current window if 'allow-same-site'
+        is not allowed.
+
</ins><span class="cx"> 2021-09-02  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [COOP] html/cross-origin-opener-policy/coop-navigate-same-origin-csp-sandbox.html WPT test is failing
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit234SourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentLoader.cpp (287209 => 287210)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentLoader.cpp  2021-12-17 22:48:02 UTC (rev 287209)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentLoader.cpp     2021-12-17 22:48:11 UTC (rev 287210)
</span><span class="lines">@@ -781,12 +781,6 @@
</span><span class="cx">     if (!m_frame->document() || !m_frame->document()->settings().crossOriginOpenerPolicyEnabled())
</span><span class="cx">         return true;
</span><span class="cx"> 
</span><del>-    if (!response.httpHeaderField(HTTPHeaderName::ContentSecurityPolicy).isNull()) {
-        m_contentSecurityPolicy = makeUnique<ContentSecurityPolicy>(URL { response.url() }, nullptr);
-        m_contentSecurityPolicy->didReceiveHeaders(ContentSecurityPolicyResponseHeaders { response }, m_request.httpReferrer(), ContentSecurityPolicy::ReportParsingErrors::No);
-    } else
-        m_contentSecurityPolicy = nullptr;
-
</del><span class="cx">     auto [responseOrigin, responseCOOP] = computeResponseOriginAndCOOP(response, *m_frame->document(), m_triggeringAction.requester(), m_contentSecurityPolicy.get());
</span><span class="cx"> 
</span><span class="cx">     // https://html.spec.whatwg.org/multipage/browsing-the-web.html#process-a-navigate-fetch (Step 12.5.6.2)
</span><span class="lines">@@ -924,6 +918,12 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT_UNUSED(resource, m_mainResource == &resource);
</span><span class="cx"> 
</span><ins>+    if (!response.httpHeaderField(HTTPHeaderName::ContentSecurityPolicy).isNull()) {
+        m_contentSecurityPolicy = makeUnique<ContentSecurityPolicy>(URL { response.url() }, nullptr);
+        m_contentSecurityPolicy->didReceiveHeaders(ContentSecurityPolicyResponseHeaders { response }, m_request.httpReferrer(), ContentSecurityPolicy::ReportParsingErrors::No);
+    } else
+        m_contentSecurityPolicy = nullptr;
+
</ins><span class="cx"> #if ENABLE(RESOURCE_LOAD_STATISTICS)
</span><span class="cx">     // FIXME(218779): Remove this quirk once microsoft.com completes their login flow redesign.
</span><span class="cx">     if (m_frame && m_frame->document()) {
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit234SourceWebCoreloaderDocumentWritercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentWriter.cpp (287209 => 287210)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentWriter.cpp  2021-12-17 22:48:02 UTC (rev 287209)
+++ releases/WebKitGTK/webkit-2.34/Source/WebCore/loader/DocumentWriter.cpp     2021-12-17 22:48:11 UTC (rev 287210)
</span><span class="lines">@@ -142,6 +142,12 @@
</span><span class="cx">         && m_frame->document()->isSecureTransitionTo(url)
</span><span class="cx">         && (m_frame->window() && !m_frame->window()->wasWrappedWithoutInitializedSecurityOrigin() && m_frame->window()->mayReuseForNavigation());
</span><span class="cx"> 
</span><ins>+    if (shouldReuseDefaultView) {
+        ASSERT(m_frame->loader().documentLoader());
+        if (auto* contentSecurityPolicy = m_frame->loader().documentLoader()->contentSecurityPolicy())
+            shouldReuseDefaultView = !(contentSecurityPolicy->sandboxFlags() & SandboxOrigin);
+    }
+
</ins><span class="cx">     // Temporarily extend the lifetime of the existing document so that FrameLoader::clear() doesn't destroy it as
</span><span class="cx">     // we need to retain its ongoing set of upgraded requests in new navigation contexts per <http://www.w3.org/TR/upgrade-insecure-requests/>
</span><span class="cx">     // and we may also need to inherit its Content Security Policy below.
</span></span></pre>
</div>
</div>

</body>
</html>