CSP: Fix protocolless 'frame-ancestor' source expressions.

Source/core/frame/csp/ContentSecurityPolicy.cpp

 /*
  * Copyright (C) 2011 Google, Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 137 matching lines @@
 void ContentSecurityPolicy::bindToExecutionContext(ExecutionContext* executionContext)
 {
     m_executionContext = executionContext;
     applyPolicySideEffectsToExecutionContext();
 }
 
 void ContentSecurityPolicy::applyPolicySideEffectsToExecutionContext()
 {
     ASSERT(m_executionContext);
     // Ensure that 'self' processes correctly.
-    m_selfSource = adoptPtr(new CSPSource(this, securityOrigin()->protocol(), securityOrigin()->host(), securityOrigin()->port(), String(), CSPSource::NoWildcard, CSPSource::NoWildcard));
+    m_selfProtocol = securityOrigin()->protocol();
+    m_selfSource = adoptPtr(new CSPSource(this, m_selfProtocol, securityOrigin()->host(), securityOrigin()->port(), String(), CSPSource::NoWildcard, CSPSource::NoWildcard));
 
     // If we're in a Document, set the referrer policy and sandbox flags, then dump all the
     // parsing error messages, then poke at histograms.
     if (Document* document = this->document()) {
         document->enforceSandboxFlags(m_sandboxMask);
         if (didSetReferrerPolicy())
             document->setReferrerPolicy(m_referrerPolicy);
 
         for (ConsoleMessageVector::const_iterator iter = m_consoleMessages.begin(); iter != m_consoleMessages.end(); ++iter)
             m_executionContext->addConsoleMessage(*iter);
@@ skipping 90 matching lines @@
 {
     m_overrideInlineStyleAllowed = value;
 }
 
 void ContentSecurityPolicy::setOverrideURLForSelf(const KURL& url)
 {
     // Create a temporary CSPSource so that 'self' expressions can be resolved before we bind to
     // an execution context (for 'frame-ancestor' resolution, for example). This CSPSource will
     // be overwritten when we bind this object to an execution context.
     RefPtr<SecurityOrigin> origin = SecurityOrigin::create(url);
-    m_selfSource = adoptPtr(new CSPSource(this, origin->protocol(), origin->host(), origin->port(), String(), CSPSource::NoWildcard, CSPSource::NoWildcard));
+    m_selfProtocol = origin->protocol();
+    m_selfSource = adoptPtr(new CSPSource(this, m_selfProtocol, origin->host(), origin->port(), String(), CSPSource::NoWildcard, CSPSource::NoWildcard));
 }
 
 const String& ContentSecurityPolicy::deprecatedHeader() const
 {
     return m_policies.isEmpty() ? emptyString() : m_policies[0]->header();
 }
 
 ContentSecurityPolicyHeaderType ContentSecurityPolicy::deprecatedHeaderType() const
 {
     return m_policies.isEmpty() ? ContentSecurityPolicyHeaderTypeEnforce : m_policies[0]->headerType();
@@ skipping 565 matching lines @@
     return RuntimeEnabledFeatures::experimentalContentSecurityPolicyFeaturesEnabled();
 }
 
 bool ContentSecurityPolicy::urlMatchesSelf(const KURL& url) const
 {
     return m_selfSource->matches(url);
 }
 
 bool ContentSecurityPolicy::protocolMatchesSelf(const KURL& url) const
 {
-    String protectedResourceScheme(securityOrigin()->protocol());
-    if (equalIgnoringCase("http", protectedResourceScheme))
+    if (equalIgnoringCase("http", m_selfProtocol))
         return url.protocolIsInHTTPFamily();
-    return equalIgnoringCase(url.protocol(), protectedResourceScheme);
+    return equalIgnoringCase(url.protocol(), m_selfProtocol);
 }
 
 bool ContentSecurityPolicy::shouldBypassMainWorld(ExecutionContext* context)
 {
     if (context && context->isDocument()) {
         Document* document = toDocument(context);
         if (document->frame())
             return document->frame()->script().shouldBypassMainWorldCSP();
     }
     return false;
 }
 
 bool ContentSecurityPolicy::shouldSendViolationReport(const String& report) const
 {
     // Collisions have no security impact, so we can save space by storing only the string's hash rather than the whole report.
     return !m_violationReportsSent.contains(report.impl()->hash());
 }
 
 void ContentSecurityPolicy::didSendViolationReport(const String& report)
 {
     m_violationReportsSent.add(report.impl()->hash());
 }
 
 } // namespace blink