<!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>[178817] branches/safari-600.1.4.15-branch/Source/WebCore</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/178817">178817</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-01-21 00:17:47 -0800 (Wed, 21 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/175771">r175771</a>. rdar://problem/19450090</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageContentSecurityPolicycpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (178816 => 178817)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:16:25 UTC (rev 178816)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-01-21 08:17:47 UTC (rev 178817)
</span><span class="lines">@@ -1,5 +1,41 @@
</span><span class="cx"> 2015-01-21 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r175771.
+
+ 2014-11-07 Alexey Proskuryakov <ap@apple.com>
+
+ CSP is enforced for eval in report-only mode on first page load
+ https://bugs.webkit.org/show_bug.cgi?id=138492
+ rdar://problem/15782525
+
+ Reviewed by Daniel Bates.
+
+ This is covered by existing tests when running as one test per process invocation.
+
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::CSPDirectiveList::allowEval): Allow when in report only mode. The allowEval
+ function itself needs to return false, because it's used in checkEvalAndReportViolation().
+ (WebCore::CSPDirectiveList::allowJavaScriptURLs): Apply the same fix, although it's
+ not changing the behavior - this function is never called with ContentSecurityPolicy::SuppressReport.
+ (WebCore::CSPDirectiveList::allowInlineEventHandlers): Ditto.
+ (WebCore::CSPDirectiveList::allowInlineScript): Ditto.
+ (WebCore::CSPDirectiveList::allowInlineStyle): Ditto.
+ (WebCore::CSPDirectiveList::allowPluginType): Ditto.
+ (WebCore::CSPDirectiveList::allowScriptFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowObjectFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowChildFrameFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowImageFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowStyleFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowFontFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowMediaFromSource): Ditto.
+ (WebCore::CSPDirectiveList::allowConnectToSource): Ditto.
+ (WebCore::CSPDirectiveList::allowFormAction): Ditto.
+ (WebCore::CSPDirectiveList::allowBaseURI): Ditto.
+ (WebCore::ContentSecurityPolicy::didReceiveHeader): Remove isReportOnly() check,
+ which is now inside allowEval().
+
+2015-01-21 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r175718.
</span><span class="cx">
</span><span class="cx"> 2014-11-06 Yongjun Zhang <yongjun_zhang@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/ContentSecurityPolicy.cpp (178816 => 178817)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/ContentSecurityPolicy.cpp 2015-01-21 08:16:25 UTC (rev 178816)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/ContentSecurityPolicy.cpp 2015-01-21 08:17:47 UTC (rev 178817)
</span><span class="lines">@@ -996,7 +996,7 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to execute JavaScript URL because it violates the following Content Security Policy directive: ")));
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkInlineAndReportViolation(operativeDirective(m_scriptSrc.get()), consoleMessage, contextURL, contextLine, true)
</span><del>- : checkInline(operativeDirective(m_scriptSrc.get()));
</del><ins>+ : (m_reportOnly || checkInline(operativeDirective(m_scriptSrc.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowInlineEventHandlers(const String& contextURL, const WTF::OrdinalNumber& contextLine, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="lines">@@ -1004,7 +1004,7 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to execute inline event handler because it violates the following Content Security Policy directive: ")));
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkInlineAndReportViolation(operativeDirective(m_scriptSrc.get()), consoleMessage, contextURL, contextLine, true)
</span><del>- : checkInline(operativeDirective(m_scriptSrc.get()));
</del><ins>+ : (m_reportOnly || checkInline(operativeDirective(m_scriptSrc.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="lines">@@ -1012,7 +1012,7 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to execute inline script because it violates the following Content Security Policy directive: ")));
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkInlineAndReportViolation(operativeDirective(m_scriptSrc.get()), consoleMessage, contextURL, contextLine, true) :
</span><del>- checkInline(operativeDirective(m_scriptSrc.get()));
</del><ins>+ (m_reportOnly || checkInline(operativeDirective(m_scriptSrc.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="lines">@@ -1020,7 +1020,7 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to apply inline style because it violates the following Content Security Policy directive: ")));
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkInlineAndReportViolation(operativeDirective(m_styleSrc.get()), consoleMessage, contextURL, contextLine, false) :
</span><del>- checkInline(operativeDirective(m_styleSrc.get()));
</del><ins>+ (m_reportOnly || checkInline(operativeDirective(m_styleSrc.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowEval(JSC::ExecState* state, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="lines">@@ -1028,21 +1028,21 @@
</span><span class="cx"> DEPRECATED_DEFINE_STATIC_LOCAL(String, consoleMessage, (ASCIILiteral("Refused to evaluate script because it violates the following Content Security Policy directive: ")));
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkEvalAndReportViolation(operativeDirective(m_scriptSrc.get()), consoleMessage, String(), WTF::OrdinalNumber::beforeFirst(), state) :
</span><del>- checkEval(operativeDirective(m_scriptSrc.get()));
</del><ins>+ (m_reportOnly || checkEval(operativeDirective(m_scriptSrc.get())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowPluginType(const String& type, const String& typeAttribute, const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkMediaTypeAndReportViolation(m_pluginTypes.get(), type, typeAttribute, "Refused to load '" + url.stringCenterEllipsizedToLength() + "' (MIME type '" + typeAttribute + "') because it violates the following Content Security Policy Directive: ") :
</span><del>- checkMediaType(m_pluginTypes.get(), type, typeAttribute);
</del><ins>+ (m_reportOnly || checkMediaType(m_pluginTypes.get(), type, typeAttribute));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowScriptFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_scriptSrc.get()), url, scriptSrc) :
</span><del>- checkSource(operativeDirective(m_scriptSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_scriptSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowObjectFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="lines">@@ -1051,7 +1051,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_objectSrc.get()), url, objectSrc) :
</span><del>- checkSource(operativeDirective(m_objectSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_objectSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowChildFrameFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="lines">@@ -1060,42 +1060,42 @@
</span><span class="cx"> return true;
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_frameSrc.get()), url, frameSrc) :
</span><del>- checkSource(operativeDirective(m_frameSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_frameSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowImageFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_imgSrc.get()), url, imgSrc) :
</span><del>- checkSource(operativeDirective(m_imgSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_imgSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowStyleFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_styleSrc.get()), url, styleSrc) :
</span><del>- checkSource(operativeDirective(m_styleSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_styleSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowFontFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_fontSrc.get()), url, fontSrc) :
</span><del>- checkSource(operativeDirective(m_fontSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_fontSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowMediaFromSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_mediaSrc.get()), url, mediaSrc) :
</span><del>- checkSource(operativeDirective(m_mediaSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_mediaSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowConnectToSource(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(operativeDirective(m_connectSrc.get()), url, connectSrc) :
</span><del>- checkSource(operativeDirective(m_connectSrc.get()), url);
</del><ins>+ (m_reportOnly || checkSource(operativeDirective(m_connectSrc.get()), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CSPDirectiveList::gatherReportURIs(DOMStringList& list) const
</span><span class="lines">@@ -1108,14 +1108,14 @@
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(m_formAction.get(), url, formAction) :
</span><del>- checkSource(m_formAction.get(), url);
</del><ins>+ (m_reportOnly || checkSource(m_formAction.get(), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSPDirectiveList::allowBaseURI(const URL& url, ContentSecurityPolicy::ReportingStatus reportingStatus) const
</span><span class="cx"> {
</span><span class="cx"> return reportingStatus == ContentSecurityPolicy::SendReport ?
</span><span class="cx"> checkSourceAndReportViolation(m_baseURI.get(), url, baseURI) :
</span><del>- checkSource(m_baseURI.get(), url);
</del><ins>+ (m_reportOnly || checkSource(m_baseURI.get(), url));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // policy = directive-list
</span><span class="lines">@@ -1371,7 +1371,7 @@
</span><span class="cx"> // header1,header2 OR header1
</span><span class="cx"> // ^ ^
</span><span class="cx"> std::unique_ptr<CSPDirectiveList> policy = CSPDirectiveList::create(this, String(begin, position - begin), type);
</span><del>- if (!policy->isReportOnly() && !policy->allowEval(0, SuppressReport))
</del><ins>+ if (!policy->allowEval(0, SuppressReport))
</ins><span class="cx"> m_scriptExecutionContext->disableEval(policy->evalDisabledErrorMessage());
</span><span class="cx">
</span><span class="cx"> m_policies.append(policy.release());
</span></span></pre>
</div>
</div>
</body>
</html>