<!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>[200130] trunk/Source</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/200130">200130</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-27 09:48:59 -0700 (Wed, 27 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>CSP: Add app-specific workaround for Ecobee and Quora
https://bugs.webkit.org/show_bug.cgi?id=157005
<rdar://problem/25560776>
Reviewed by Brent Fulgham.
Source/WebCore:
* page/Settings.in: Add setting allowContentSecurityPolicySourceStarToMatchAnyProtocol (disabled by default).
* page/csp/ContentSecurityPolicy.cpp:
(WebCore::ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtocol): Added.
* page/csp/ContentSecurityPolicy.h:
* page/csp/ContentSecurityPolicySourceList.cpp:
(WebCore::ContentSecurityPolicySourceList::isProtocolAllowedByStar): Modified to return true
if ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtocol() evaluates to true.
* platform/RuntimeApplicationChecks.h:
* platform/RuntimeApplicationChecks.mm:
(WebCore::IOSApplication::isEcobee): Added.
(WebCore::IOSApplication::isQuora): Added.
Source/WebKit/mac:
* Misc/WebKitVersionChecks.h:
* WebView/WebView.mm:
(shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol): Added.
(-[WebView _preferencesChanged:]): Enable setting allowContentSecurityPolicySourceStarToMatchAnyProtocol
if applicable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingsin">trunk/Source/WebCore/page/Settings.in</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicycpp">trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicyh">trunk/Source/WebCore/page/csp/ContentSecurityPolicy.h</a></li>
<li><a href="#trunkSourceWebCorepagecspContentSecurityPolicySourceListcpp">trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksh">trunk/Source/WebCore/platform/RuntimeApplicationChecks.h</a></li>
<li><a href="#trunkSourceWebCoreplatformRuntimeApplicationChecksmm">trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebKitVersionChecksh">trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/ChangeLog 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-04-27 Daniel Bates <dabates@apple.com>
+
+ CSP: Add app-specific workaround for Ecobee and Quora
+ https://bugs.webkit.org/show_bug.cgi?id=157005
+ <rdar://problem/25560776>
+
+ Reviewed by Brent Fulgham.
+
+ * page/Settings.in: Add setting allowContentSecurityPolicySourceStarToMatchAnyProtocol (disabled by default).
+ * page/csp/ContentSecurityPolicy.cpp:
+ (WebCore::ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtocol): Added.
+ * page/csp/ContentSecurityPolicy.h:
+ * page/csp/ContentSecurityPolicySourceList.cpp:
+ (WebCore::ContentSecurityPolicySourceList::isProtocolAllowedByStar): Modified to return true
+ if ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtocol() evaluates to true.
+ * platform/RuntimeApplicationChecks.h:
+ * platform/RuntimeApplicationChecks.mm:
+ (WebCore::IOSApplication::isEcobee): Added.
+ (WebCore::IOSApplication::isQuora): Added.
+
</ins><span class="cx"> 2016-04-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r200094): [FreeType] Vertical text is broken after r200094
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.in (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.in 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/page/Settings.in 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -254,3 +254,5 @@
</span><span class="cx">
</span><span class="cx"> userInterfaceDirectionPolicy type=UserInterfaceDirectionPolicy, initial=UserInterfaceDirectionPolicy::Content
</span><span class="cx"> systemLayoutDirection type=TextDirection, initial=LTR
</span><ins>+
+allowContentSecurityPolicySourceStarToMatchAnyProtocol initial=false
</ins></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> #include "SchemeRegistry.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "SecurityPolicyViolationEvent.h"
</span><ins>+#include "Settings.h"
</ins><span class="cx"> #include "TextEncoding.h"
</span><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <inspector/ScriptCallStack.h>
</span><span class="lines">@@ -204,6 +205,13 @@
</span><span class="cx"> return m_selfSource->matches(url);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ContentSecurityPolicy::allowContentSecurityPolicySourceStarToMatchAnyProtocol() const
+{
+ if (Settings* settings = is<Document>(m_scriptExecutionContext) ? downcast<Document>(*m_scriptExecutionContext).settings() : nullptr)
+ return settings->allowContentSecurityPolicySourceStarToMatchAnyProtocol();
+ return false;
+}
+
</ins><span class="cx"> bool ContentSecurityPolicy::protocolMatchesSelf(const URL& url) const
</span><span class="cx"> {
</span><span class="cx"> if (equalLettersIgnoringASCIICase(m_selfSourceProtocol, "http"))
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicy.h (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicy.h 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicy.h 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -125,6 +125,7 @@
</span><span class="cx"> void reportInvalidPathCharacter(const String& directiveName, const String& value, const char) const;
</span><span class="cx"> void reportInvalidSourceExpression(const String& directiveName, const String& source) const;
</span><span class="cx"> bool urlMatchesSelf(const URL&) const;
</span><ins>+ bool allowContentSecurityPolicySourceStarToMatchAnyProtocol() const;
</ins><span class="cx">
</span><span class="cx"> // Used by ContentSecurityPolicyDirectiveList
</span><span class="cx"> void reportDuplicateDirective(const String&) const;
</span></span></pre></div>
<a id="trunkSourceWebCorepagecspContentSecurityPolicySourceListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/page/csp/ContentSecurityPolicySourceList.cpp 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -118,6 +118,9 @@
</span><span class="cx">
</span><span class="cx"> bool ContentSecurityPolicySourceList::isProtocolAllowedByStar(const URL& url) const
</span><span class="cx"> {
</span><ins>+ if (m_policy.allowContentSecurityPolicySourceStarToMatchAnyProtocol())
+ return true;
+
</ins><span class="cx"> // Although not allowed by the Content Security Policy Level 3 spec., we allow a data URL to match
</span><span class="cx"> // "img-src *" and either a data URL or blob URL to match "media-src *" for web compatibility.
</span><span class="cx"> bool isAllowed = url.protocolIsInHTTPFamily();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.h (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.h 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx"> WEBCORE_EXPORT bool isTheEconomistOnIphone();
</span><span class="cx"> WEBCORE_EXPORT bool isWebProcess();
</span><span class="cx"> bool isIBooks();
</span><ins>+WEBCORE_EXPORT bool isEcobee();
+WEBCORE_EXPORT bool isQuora();
</ins><span class="cx">
</span><span class="cx"> } // IOSApplication
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformRuntimeApplicationChecksmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebCore/platform/RuntimeApplicationChecks.mm 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -241,6 +241,18 @@
</span><span class="cx"> return isIBooks;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool IOSApplication::isEcobee()
+{
+ static bool isEcobee = applicationBundleIsEqualTo("com.ecobee.athenamobile");
+ return isEcobee;
+}
+
+bool IOSApplication::isQuora()
+{
+ static bool isQuora = applicationBundleIsEqualTo("com.quora.app.mobile");
+ return isQuora;
+}
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-04-27 Daniel Bates <dabates@apple.com>
+
+ CSP: Add app-specific workaround for Ecobee and Quora
+ https://bugs.webkit.org/show_bug.cgi?id=157005
+ <rdar://problem/25560776>
+
+ Reviewed by Brent Fulgham.
+
+ * Misc/WebKitVersionChecks.h:
+ * WebView/WebView.mm:
+ (shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol): Added.
+ (-[WebView _preferencesChanged:]): Enable setting allowContentSecurityPolicySourceStarToMatchAnyProtocol
+ if applicable.
+
</ins><span class="cx"> 2016-04-26 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Uncaught Exception: SecurityError: DOM Exception 18: An attempt was made to break through the security policy of the user agent.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebKitVersionChecksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebKit/mac/Misc/WebKitVersionChecks.h 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITHOUT_LEGACY_BACKGROUNDSIZE_SHORTHAND_BEHAVIOR 2665 // iOS 7.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_LOADING_DURING_COMMON_RUNLOOP_MODES 2665 // iOS 7.0
</span><span class="cx"> #define WEBKIT_FIRST_VERSION_WITH_INSECURE_CONTENT_BLOCKING 3454
</span><ins>+#define WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION 3555
</ins><span class="cx"> #endif // PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (200129 => 200130)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-04-27 16:47:13 UTC (rev 200129)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-04-27 16:48:59 UTC (rev 200130)
</span><span class="lines">@@ -865,6 +865,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol()
+{
+#if PLATFORM(IOS)
+ static bool shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol = (IOSApplication::isEcobee() || IOSApplication::isQuora()) && !WebKitLinkedOnOrAfter(WEBKIT_FIRST_VERSION_WITH_CONTENT_SECURITY_POLICY_SOURCE_STAR_PROTOCOL_RESTRICTION);
+ return shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol;
+#else
+ return false;
+#endif
+}
+
</ins><span class="cx"> #if ENABLE(GAMEPAD)
</span><span class="cx"> static void WebKitInitializeGamepadProviderIfNecessary()
</span><span class="cx"> {
</span><span class="lines">@@ -2510,6 +2520,8 @@
</span><span class="cx"> #if ENABLE(ATTACHMENT_ELEMENT)
</span><span class="cx"> settings.setAttachmentElementEnabled([preferences attachmentElementEnabled]);
</span><span class="cx"> #endif
</span><ins>+
+ settings.setAllowContentSecurityPolicySourceStarToMatchAnyProtocol(shouldAllowContentSecurityPolicySourceStarToMatchAnyProtocol());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline IMP getMethod(id o, SEL s)
</span></span></pre>
</div>
</div>
</body>
</html>