CSP: Source expressions can no longer lock sites into insecurity.

third_party/WebKit/Source/core/frame/csp/CSPSource.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 "config.h"
 #include "core/frame/csp/CSPSource.h"
 
 #include "core/frame/UseCounter.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "platform/weborigin/KURL.h"
@@ skipping 21 matching lines @@
     if (isSchemeOnly())
         return true;
     bool pathsMatch = (redirectStatus == ContentSecurityPolicy::DidRedirect) || pathMatches(url);
     return hostMatches(url) && portMatches(url) && pathsMatch;
 }
 
 bool CSPSource::schemeMatches(const KURL& url) const
 {
     if (m_scheme.isEmpty())
         return m_policy->protocolMatchesSelf(url);
+    if (equalIgnoringCase(m_scheme, "http"))
+        return equalIgnoringCase(url.protocol(), "http") || equalIgnoringCase(url.protocol(), "https");
+    if (equalIgnoringCase(m_scheme, "ws"))
+        return equalIgnoringCase(url.protocol(), "ws") || equalIgnoringCase(url.protocol(), "wss");
     return equalIgnoringCase(url.protocol(), m_scheme);
 }
 
 bool CSPSource::hostMatches(const KURL& url) const
 {
     const String& host = url.host();
     Document* document = m_policy->document();
     bool match;
 
     bool equalHosts = equalIgnoringCase(host, m_host);
@@ skipping 44 matching lines @@
 
     return false;
 }
 
 bool CSPSource::isSchemeOnly() const
 {
     return m_host.isEmpty();
 }
 
 } // namespace