<!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>[163827] branches/safari-537.75-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/163827">163827</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-02-10 15:40:23 -0800 (Mon, 10 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/158676">r158676</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestsChangeLog">branches/safari-537.75-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCorehtmlparserXSSAuditorcpp">branches/safari-537.75-branch/Source/WebCore/html/parser/XSSAuditor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchLayoutTestshttptestssecurityxssAuditoriframesrcdocpropertyblockedexpectedtxt">branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked-expected.txt</a></li>
<li><a href="#branchessafari53775branchLayoutTestshttptestssecurityxssAuditoriframesrcdocpropertyblockedhtml">branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html</a></li>
<li><a href="#branchessafari53775branchLayoutTestshttptestssecurityxssAuditorresourcesechoframesrcpl">branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/resources/echo-frame-src.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/LayoutTests/ChangeLog (163826 => 163827)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-10 23:34:13 UTC (rev 163826)
+++ branches/safari-537.75-branch/LayoutTests/ChangeLog 2014-02-10 23:40:23 UTC (rev 163827)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-10 Lucas Forschler <lforschler@apple.com>
+
+ Merge r158676
+
+ 2013-11-05 Daniel Bates <dabates@apple.com>
+
+ XSSAuditor should catch reflected srcdoc properties even without a <frame> tag injection
+
+ From Blink r160615 by <tsepez@chromium.org>
+ https://src.chromium.org/viewvc/blink?view=rev&revision=160615
+
+ * http/tests/security/xssAuditor/iframe-srcdoc-property-blocked-expected.txt: Added.
+ * http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html: Added.
+ * http/tests/security/xssAuditor/resources/echo-frame-src.pl: Added.
+
</ins><span class="cx"> 2014-01-24 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154470
</span></span></pre></div>
<a id="branchessafari53775branchLayoutTestshttptestssecurityxssAuditoriframesrcdocpropertyblockedexpectedtxtfromrev158676trunkLayoutTestshttptestssecurityxssAuditoriframesrcdocpropertyblockedexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked-expected.txt (from rev 158676, trunk/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked-expected.txt) (0 => 163827)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked-expected.txt (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked-expected.txt 2014-02-10 23:40:23 UTC (rev 163827)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+CONSOLE MESSAGE: line 4: The XSS Auditor refused to execute a script in 'http://localhost:8000/security/xssAuditor/resources/echo-frame-src.pl?q=%22srcdoc=%22%3Cscript%3Ealert(0)%3C/script%3E' because its source code was found within the request. The auditor was enabled as the server sent neither an 'X-XSS-Protection' nor 'Content-Security-Policy' header.
+Catch injected srcdoc properties when there is punctuation enabling the auditor
+
+
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestshttptestssecurityxssAuditoriframesrcdocpropertyblockedhtmlfromrev158676trunkLayoutTestshttptestssecurityxssAuditoriframesrcdocpropertyblockedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html (from rev 158676, trunk/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html) (0 => 163827)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html 2014-02-10 23:40:23 UTC (rev 163827)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.setXSSAuditorEnabled(true);
+}
+</script>
+</head>
+<body>
+<p>Catch injected srcdoc properties when there is punctuation enabling the auditor</p>
+<iframe src='http://localhost:8000/security/xssAuditor/resources/echo-frame-src.pl?q=%22srcdoc=%22<script>alert(0)</script>'>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari53775branchLayoutTestshttptestssecurityxssAuditorresourcesechoframesrcplfromrev158676trunkLayoutTestshttptestssecurityxssAuditorresourcesechoframesrcpl"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/resources/echo-frame-src.pl (from rev 158676, trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-frame-src.pl) (0 => 163827)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/resources/echo-frame-src.pl (rev 0)
+++ branches/safari-537.75-branch/LayoutTests/http/tests/security/xssAuditor/resources/echo-frame-src.pl 2014-02-10 23:40:23 UTC (rev 163827)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+#!/usr/bin/perl -wT
+use strict;
+use CGI;
+
+my $cgi = new CGI;
+
+print "Content-Type: text/html; charset=UTF-8\n\n";
+
+print "<!DOCTYPE html>\n";
+print "<html>\n";
+print "<body>\n";
+print "<iframe src=\"".$cgi->param('q')."\"></iframe>\n";
+print "</body>\n";
+print "</html>\n";
</ins></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163826 => 163827)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-10 23:34:13 UTC (rev 163826)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-10 23:40:23 UTC (rev 163827)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-10 Lucas Forschler <lforschler@apple.com>
+
+ Merge r158676
+
+ 2013-11-05 Daniel Bates <dabates@apple.com>
+
+ XSSAuditor should catch reflected srcdoc properties even without a <frame> tag injection
+
+ From Blink r160615 by <tsepez@chromium.org>
+ https://src.chromium.org/viewvc/blink?view=rev&revision=160615
+
+ Test: http/tests/security/xssAuditor/iframe-srcdoc-property-blocked.html
+
+ * html/parser/XSSAuditor.cpp:
+ (WebCore::XSSAuditor::filterIframeToken):
+
</ins><span class="cx"> 2014-02-05 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154146, r155828, r156145
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCorehtmlparserXSSAuditorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/html/parser/XSSAuditor.cpp (163826 => 163827)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/html/parser/XSSAuditor.cpp 2014-02-10 23:34:13 UTC (rev 163826)
+++ branches/safari-537.75-branch/Source/WebCore/html/parser/XSSAuditor.cpp 2014-02-10 23:40:23 UTC (rev 163827)
</span><span class="lines">@@ -484,11 +484,10 @@
</span><span class="cx"> ASSERT(request.token.type() == HTMLToken::StartTag);
</span><span class="cx"> ASSERT(hasName(request.token, iframeTag));
</span><span class="cx">
</span><del>- bool didBlockScript = false;
- if (isContainedInRequest(decodedSnippetForName(request))) {
</del><ins>+ bool didBlockScript = eraseAttributeIfInjected(request, srcdocAttr, String(), ScriptLikeAttribute);
+ if (isContainedInRequest(decodedSnippetForName(request)))
</ins><span class="cx"> didBlockScript |= eraseAttributeIfInjected(request, srcAttr, String(), SrcLikeAttribute);
</span><del>- didBlockScript |= eraseAttributeIfInjected(request, srcdocAttr, String(), ScriptLikeAttribute);
- }
</del><ins>+
</ins><span class="cx"> return didBlockScript;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>