Avoid injecting all scripts into non-(X)HTML docs.

EFForg · Apr 9, 2018 · f6db2db · f6db2db
1 parent 90c8de4
commit f6db2db
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 1 deletion.
diff --git a/src/js/contentscripts/clobbercookie.js b/src/js/contentscripts/clobbercookie.js
@@ -20,7 +20,6 @@
  * Communicates to webrequest.js to get orders if to delete cookies.
  */
 
-
 function insertCcScript(text) {
   var parent = document.documentElement,
     script = document.createElement('script');
@@ -32,6 +31,19 @@ function insertCcScript(text) {
   parent.removeChild(script);
 }
 
+// END FUNCTION DEFINITIONS ///////////////////////////////////////////////////
+
+(function () {
+
+// don't inject into non-HTML documents (such as XML documents)
+// but do inject into XHTML documents
+if (document instanceof HTMLDocument === false && (
+  document instanceof XMLDocument === false ||
+  document.createElement('div') instanceof HTMLDivElement === false
+)) {
+  return;
+}
+
 // TODO race condition; fix waiting on https://crbug.com/478183
 chrome.runtime.sendMessage({checkLocation:document.location.href}, function(blocked) {
   if (blocked) {
@@ -44,3 +56,5 @@ chrome.runtime.sendMessage({checkLocation:document.location.href}, function(bloc
   }
   return true;
 });
+
+}());
diff --git a/src/js/contentscripts/clobberlocalstorage.js b/src/js/contentscripts/clobberlocalstorage.js
@@ -37,6 +37,19 @@ function insertClsScript(text) {
   parent.removeChild(script);
 }
 
+// END FUNCTION DEFINITIONS ///////////////////////////////////////////////////
+
+(function () {
+
+// don't inject into non-HTML documents (such as XML documents)
+// but do inject into XHTML documents
+if (document instanceof HTMLDocument === false && (
+  document instanceof XMLDocument === false ||
+  document.createElement('div') instanceof HTMLDivElement === false
+)) {
+  return;
+}
+
 // TODO race condition; fix waiting on https://crbug.com/478183
 chrome.runtime.sendMessage({checkLocation:document.location.href}, function(blocked) {
   if (blocked) {
@@ -58,3 +71,5 @@ chrome.runtime.sendMessage({checkLocation:document.location.href}, function(bloc
   }
   return true;
 });
+
+}());
diff --git a/src/js/contentscripts/fingerprinting.js b/src/js/contentscripts/fingerprinting.js
@@ -320,6 +320,20 @@ function insertFpScript(text, data) {
   parent.removeChild(script);
 }
 
+
+// END FUNCTION DEFINITIONS ///////////////////////////////////////////////////
+
+(function () {
+
+// don't inject into non-HTML documents (such as XML documents)
+// but do inject into XHTML documents
+if (document instanceof HTMLDocument === false && (
+  document instanceof XMLDocument === false ||
+  document.createElement('div') instanceof HTMLDivElement === false
+)) {
+  return;
+}
+
 // TODO race condition; fix waiting on https://crbug.com/478183
 chrome.runtime.sendMessage({checkEnabled: true},
   function (enabled) {
@@ -344,3 +358,5 @@ chrome.runtime.sendMessage({checkEnabled: true},
     });
   }
 );
+
+}());
diff --git a/src/js/contentscripts/socialwidgets.js b/src/js/contentscripts/socialwidgets.js
@@ -327,6 +327,19 @@ function unblockTracker(buttonUrls, callback) {
   chrome.runtime.sendMessage(request, callback);
 }
 
+// END FUNCTION DEFINITIONS ///////////////////////////////////////////////////
+
+(function () {
+
+// don't inject into non-HTML documents (such as XML documents)
+// but do inject into XHTML documents
+if (document instanceof HTMLDocument === false && (
+  document instanceof XMLDocument === false ||
+  document.createElement('div') instanceof HTMLDivElement === false
+)) {
+  return;
+}
+
 chrome.runtime.sendMessage({
   checkSocialWidgetReplacementEnabled: true
 }, function (checkSocialWidgetReplacementEnabled) {
@@ -335,3 +348,5 @@ chrome.runtime.sendMessage({
   }
   initialize();
 });
+
+}());
diff --git a/src/js/contentscripts/supercookie.js b/src/js/contentscripts/supercookie.js
@@ -110,6 +110,19 @@ function getScPageScript() {
 
 }
 
+// END FUNCTION DEFINITIONS ///////////////////////////////////////////////////
+
+(function () {
+
+// don't inject into non-HTML documents (such as XML documents)
+// but do inject into XHTML documents
+if (document instanceof HTMLDocument === false && (
+  document instanceof XMLDocument === false ||
+  document.createElement('div') instanceof HTMLDivElement === false
+)) {
+  return;
+}
+
 // TODO race condition; fix waiting on https://crbug.com/478183
 chrome.runtime.sendMessage({
   checkEnabledAndThirdParty: true
@@ -134,3 +147,5 @@ chrome.runtime.sendMessage({
   });
 
 });
+
+}());