Implementation of W3C compliant CSP script-src nonce.

Source/core/dom/ScriptElement.cpp

Index: Source/core/dom/ScriptElement.cpp
diff --git a/Source/core/dom/ScriptElement.cpp b/Source/core/dom/ScriptElement.cpp
index b39ba0f764eb9a17d075831ea5b754571f123056..3271784c7c6ae74b184f62b7a1d15094716780f3 100644
--- a/Source/core/dom/ScriptElement.cpp
+++ b/Source/core/dom/ScriptElement.cpp
@@ -254,8 +254,6 @@ bool ScriptElement::requestScript(const String& sourceUrl)
         return false;
     if (!m_element->inDocument() || m_element->document() != originalDocument)
         return false;
-    if (!m_element->document()->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr), m_element->document()->url(), m_startLineNumber, m_element->document()->completeURL(sourceUrl)))
-        return false;
 
     ASSERT(!m_cachedScript);
     if (!stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
@@ -293,10 +291,9 @@ void ScriptElement::executeScript(const ScriptSourceCode& sourceCode)
     Frame* frame = document->frame();
 
     bool shouldBypassMainWorldContentSecurityPolicy = (frame && frame->script()->shouldBypassMainWorldContentSecurityPolicy());
-    if (!shouldBypassMainWorldContentSecurityPolicy && !document->contentSecurityPolicy()->allowScriptNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr), document->url(), m_startLineNumber))
-        return;
 
-    if (!m_isExternalScript && (!shouldBypassMainWorldContentSecurityPolicy && !document->contentSecurityPolicy()->allowInlineScript(document->url(), m_startLineNumber)))
+    bool validNonce = document->contentSecurityPolicy()->allowNonce(m_element->fastGetAttribute(HTMLNames::nonceAttr));

[abarth-chromium, 2013/05/16 00:59:27]

Maybe isValidNonceForScript?  Different types of resources can have different
nonces.

[jww, 2013/05/16 20:59:00]

Done.

+    if (!m_isExternalScript && (!shouldBypassMainWorldContentSecurityPolicy && !document->contentSecurityPolicy()->allowInlineScript(validNonce, document->url(), m_startLineNumber)))

[abarth-chromium, 2013/05/16 00:59:27]

Is there a reason to call allowInlineScript if the nonce is valid?  It seems
like we could just bypass the call.  It seems related to
shouldBypassMainWorldContentSecurityPolicy in that way.

[jww, 2013/05/16 20:59:00]

Sure, I can do this. I guess my thought was to keep as much contained within the
ContentSecurityPolicy class itself, but good point that
shouldBypassMainWorldContentSecurityPolicy already does this sort of thing.
On 2013/05/16 00:59:27, abarth wrote:

         return;
 
     if (m_isExternalScript && m_cachedScript && !m_cachedScript->mimeTypeAllowedByNosniff()) {