From dc84b2f4de906e09d7439d329ad1ab6fcdced1f6 Mon Sep 17 00:00:00 2001
From: "shaver%mozilla.org"
 <shaver%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 25 May 2000 13:29:15 +0000
Subject: [PATCH] add content-policy hooks to <script> handling (#37983,
 r/a=brendan)

git-svn-id: svn://10.0.0.236/trunk@70832 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../html/document/src/nsHTMLContentSink.cpp   | 20 +++++++++++++++++++
 .../html/document/src/nsHTMLContentSink.cpp   | 20 +++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index d7772a646ea..20469940355 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -105,6 +105,7 @@
 #include "nsITimerCallback.h"
 #include "nsDOMError.h"
 #include "nsIScrollable.h"
+#include "nsContentPolicyUtils.h"
 
 #ifdef ALLOW_ASYNCH_STYLE_SHEETS
 const PRBool kBlockByDefault=PR_FALSE;
@@ -4614,6 +4615,25 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
       if (NS_FAILED(rv)) 
           return rv;
 
+      // After the security manager, the content-policy stuff gets a veto
+      // For pinkerton: a symphony for string conversion, in 3 parts.
+      nsXPIDLCString urlCString;
+      mScriptURI->GetSpec(getter_Copies(urlCString));
+      nsAutoString url;
+      url.AssignWithConversion((const char *)urlCString);
+      nsCOMPtr<nsIDOMElement> DOMElement = do_QueryInterface(element, &rv);
+      
+      PRBool shouldLoad = PR_TRUE;
+      if (NS_SUCCEEDED(rv) &&
+          (rv = NS_CheckContentLoadPolicy(nsIContentPolicy::CONTENT_SCRIPT,
+                                          url, DOMElement, &shouldLoad),
+           NS_SUCCEEDED(rv)) &&
+          !shouldLoad) {
+
+        // content-policy veto causes silent failure
+        return NS_OK;
+      }
+
       nsCOMPtr<nsILoadGroup> loadGroup;
       nsIStreamLoader* loader;
 
diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
index d7772a646ea..20469940355 100644
--- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
@@ -105,6 +105,7 @@
 #include "nsITimerCallback.h"
 #include "nsDOMError.h"
 #include "nsIScrollable.h"
+#include "nsContentPolicyUtils.h"
 
 #ifdef ALLOW_ASYNCH_STYLE_SHEETS
 const PRBool kBlockByDefault=PR_FALSE;
@@ -4614,6 +4615,25 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
       if (NS_FAILED(rv)) 
           return rv;
 
+      // After the security manager, the content-policy stuff gets a veto
+      // For pinkerton: a symphony for string conversion, in 3 parts.
+      nsXPIDLCString urlCString;
+      mScriptURI->GetSpec(getter_Copies(urlCString));
+      nsAutoString url;
+      url.AssignWithConversion((const char *)urlCString);
+      nsCOMPtr<nsIDOMElement> DOMElement = do_QueryInterface(element, &rv);
+      
+      PRBool shouldLoad = PR_TRUE;
+      if (NS_SUCCEEDED(rv) &&
+          (rv = NS_CheckContentLoadPolicy(nsIContentPolicy::CONTENT_SCRIPT,
+                                          url, DOMElement, &shouldLoad),
+           NS_SUCCEEDED(rv)) &&
+          !shouldLoad) {
+
+        // content-policy veto causes silent failure
+        return NS_OK;
+      }
+
       nsCOMPtr<nsILoadGroup> loadGroup;
       nsIStreamLoader* loader;