Change wildcard source expression matching to conform latest spec

third_party/WebKit/Source/core/frame/csp/CSPSourceList.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/csp/CSPSourceList.h"
 
 #include "core/frame/csp/CSPSource.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "platform/weborigin/KURL.h"
 #include "platform/weborigin/SecurityOrigin.h"
@@ skipping 29 matching lines @@
     , m_allowInline(false)
     , m_allowEval(false)
     , m_allowDynamic(false)
     , m_allowHashedAttributes(false)
     , m_hashAlgorithmsUsed(0)
 {
 }
 
 bool CSPSourceList::matches(const KURL& url, ResourceRequest::RedirectStatus redirectStatus) const
 {
-    // The CSP spec specifically states that data:, blob:, and filesystem URLs
-    // should not be captured by a '*" source
-    // (http://www.w3.org/TR/CSP2/#source-list-guid-matching). Thus, in the
-    // case of a full wildcard, data:, blob:, and filesystem: URLs are
+    // The CSP spec specifically states that only http:, https:, ws: and wss: should
+    // be captured by a '*" source.
+    // (https://w3c.github.io/webappsec-csp/#match-url-to-source-expression). Thus,
+    // in the case of a full wildcard, URLs with any other schemes are
     // explicitly checked for in the source list before allowing them through.
     if (m_allowStar) {
-        if (url.protocolIs("blob") || url.protocolIs("data") || url.protocolIs("filesystem"))
-            return hasSourceMatchInList(url, redirectStatus);
-        return true;
+        if (url.protocolIsInHTTPFamily() || url.protocolIs("ws") || url.protocolIs("wss"))
+            return true;
+
+        return hasSourceMatchInList(url, redirectStatus);
     }
 
     KURL effectiveURL = m_policy->selfMatchesInnerURL() && SecurityOrigin::shouldUseInnerURL(url) ? SecurityOrigin::extractInnerURL(url) : url;
 
     if (m_allowSelf && m_policy->urlMatchesSelf(effectiveURL))
         return true;
 
     return hasSourceMatchInList(effectiveURL, redirectStatus);
 }
 
@@ skipping 466 matching lines @@
     return false;
 }
 
 DEFINE_TRACE(CSPSourceList)
 {
     visitor->trace(m_policy);
     visitor->trace(m_list);
 }
 
 } // namespace blink