<!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>[195257] releases/WebKitGTK/webkit-2.10</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/195257">195257</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2016-01-19 00:22:49 -0800 (Tue, 19 Jan 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194927">r194927</a> - XSS Auditor should navigate to empty substitute data on full page block

https://bugs.webkit.org/show_bug.cgi?id=152868

&lt;rdar://problem/18658448&gt;

Reviewed by David Kilzer and Andy Estes.

Derived from Blink patch (by Tom Sepez &lt;tsepez@chromium.org&gt;):

&lt;https://src.chromium.org/viewvc/blink?view=rev&amp;revision=179240&gt;

Source/WebCore:

Test: http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url.html

* html/parser/XSSAuditorDelegate.cpp:

(WebCore::XSSAuditorDelegate::didBlockScript): Modified to call NavigationScheduler::schedulePageBlock().

* loader/NavigationScheduler.cpp:

(WebCore::ScheduledPageBlock::ScheduledPageBlock): Added.

(WebCore::NavigationScheduler::schedulePageBlock): Navigate to empty substitute data with

the same URL as the originating document.

* loader/NavigationScheduler.h:

LayoutTests:

Added additional test block-does-not-leak-that-page-was-blocked-using-empty-data-url.html to explicitly

tests that we do redirect to an empty data URL when a full page block is triggered.

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-allow-block-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-allow-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-block-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-filter-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-invalid-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-unset-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-filter-block-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-invalid-block-expected.txt:

* http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-unset-block-expected.txt:

* http/tests/security/xssAuditor/block-does-not-leak-location-expected.txt:

* http/tests/security/xssAuditor/block-does-not-leak-referrer-expected.txt:

* http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url-expected.txt: Added.

* http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url.html: Added.

* http/tests/security/xssAuditor/full-block-base-href-expected.txt:

* http/tests/security/xssAuditor/full-block-iframe-javascript-url-expected.txt:

* http/tests/security/xssAuditor/full-block-javascript-link-expected.txt:

* http/tests/security/xssAuditor/full-block-link-onclick-expected.txt:

* http/tests/security/xssAuditor/full-block-object-tag-expected.txt:

* http/tests/security/xssAuditor/full-block-script-tag-cross-domain-expected.txt:

* http/tests/security/xssAuditor/full-block-script-tag-expected.txt:

* http/tests/security/xssAuditor/full-block-script-tag-with-source-expected.txt:

* http/tests/security/xssAuditor/full-block-script-tag.html:

* http/tests/security/xssAuditor/xss-protection-parsing-03-expected.txt:

* http/tests/security/xssAuditor/xss-protection-parsing-04-expected.txt:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionallowblockexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-allow-block-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionblockallowexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-allow-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionblockblockexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-block-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionblockfilterexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-filter-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionblockinvalidexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-invalid-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionblockunsetexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-unset-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionfilterblockexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-filter-block-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectioninvalidblockexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-invalid-block-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionunsetblockexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-unset-block-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorblockdoesnotleaklocationexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/block-does-not-leak-location-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorblockdoesnotleakreferrerexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/block-does-not-leak-referrer-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockbasehrefexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-base-href-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockiframejavascripturlexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-iframe-javascript-url-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockjavascriptlinkexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-javascript-link-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblocklinkonclickexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-link-onclick-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockobjecttagexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-object-tag-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockscripttagcrossdomainexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-script-tag-cross-domain-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockscripttagexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-script-tag-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockscripttagwithsourceexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-script-tag-with-source-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorfullblockscripttaghtml">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/full-block-script-tag.html</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorxssprotectionparsing03expectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/xss-protection-parsing-03-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorxssprotectionparsing04expectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/xss-protection-parsing-04-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlparserXSSAuditorDelegatecpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/XSSAuditorDelegate.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreloaderNavigationSchedulercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/NavigationScheduler.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreloaderNavigationSchedulerh">releases/WebKitGTK/webkit-2.10/Source/WebCore/loader/NavigationScheduler.h</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorblockdoesnotleakthatpagewasblockedusingemptydataurlexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url-expected.txt</a></li>

<li><a href="#releasesWebKitGTKwebkit210LayoutTestshttptestssecurityxssAuditorblockdoesnotleakthatpagewasblockedusingemptydataurlhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url.html</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195256 => 195257)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2016-01-19 08:12:43 UTC (rev 195256)

+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2016-01-19 08:22:49 UTC (rev 195257)

</span><span class="lines">@@ -1,3 +1,42 @@

</span><ins>+2016-01-12  Daniel Bates  &lt;dabates@apple.com&gt;

+

+        XSS Auditor should navigate to empty substitute data on full page block

+        https://bugs.webkit.org/show_bug.cgi?id=152868

+        &lt;rdar://problem/18658448&gt;

+

+        Reviewed by David Kilzer and Andy Estes.

+

+        Derived from Blink patch (by Tom Sepez &lt;tsepez@chromium.org&gt;):

+        &lt;https://src.chromium.org/viewvc/blink?view=rev&amp;revision=179240&gt;

+

+        Added additional test block-does-not-leak-that-page-was-blocked-using-empty-data-url.html to explicitly

+        tests that we do redirect to an empty data URL when a full page block is triggered.

+

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-allow-block-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-allow-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-block-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-filter-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-invalid-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-block-unset-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-filter-block-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-invalid-block-expected.txt:

+        * http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-unset-block-expected.txt:

+        * http/tests/security/xssAuditor/block-does-not-leak-location-expected.txt:

+        * http/tests/security/xssAuditor/block-does-not-leak-referrer-expected.txt:

+        * http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url-expected.txt: Added.

+        * http/tests/security/xssAuditor/block-does-not-leak-that-page-was-blocked-using-empty-data-url.html: Added.

+        * http/tests/security/xssAuditor/full-block-base-href-expected.txt:

+        * http/tests/security/xssAuditor/full-block-iframe-javascript-url-expected.txt:

+        * http/tests/security/xssAuditor/full-block-javascript-link-expected.txt:

+        * http/tests/security/xssAuditor/full-block-link-onclick-expected.txt:

+        * http/tests/security/xssAuditor/full-block-object-tag-expected.txt:

+        * http/tests/security/xssAuditor/full-block-script-tag-cross-domain-expected.txt:

+        * http/tests/security/xssAuditor/full-block-script-tag-expected.txt:

+        * http/tests/security/xssAuditor/full-block-script-tag-with-source-expected.txt:

+        * http/tests/security/xssAuditor/full-block-script-tag.html:

+        * http/tests/security/xssAuditor/xss-protection-parsing-03-expected.txt:

+        * http/tests/security/xssAuditor/xss-protection-parsing-04-expected.txt:

+

</ins><span class="cx"> 2016-01-12  Antti Koivisto  &lt;antti@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Don't reuse memory cache entries with different charset

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit210LayoutTestshttptestssecuritycontentSecurityPolicy11reflectedxssandxssprotectionallowblockexpectedtxt"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-allow-block-expected.txt (195256 => 195257)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-allow-block-expected.txt        2016-01-19 08:12:43 UTC (rev 195256)

+++ releases/WebKitGTK/webkit-2.10/LayoutTests/http/tests/security/contentSecurityPolicy/1.1/reflected-xss-and-xss-protection-allow-block-expected.txt        2016-01-19 08:22:49 UTC (rev 195257)

</span><span class="lines">@@ -3,5 +3,5 @@

</span><span class="cx"> 

<span class="cx"> CONSOLE MESSAGE: Blocked a frame with origin &quot;http://127.0.0.1:8000&quot; from accessing a frame with origin &quot;null&quot;.  The frame requesting access has a protocol of &quot;http&quot;, the frame being accessed has a protocol of &quot;data&quot;. Protocols must match.

</span><span class="cx"> 