force "slow" path for scriplet injection for the time being (see gorh…

…ill#3526, uBlockOrigin/uAssets#1492)
user35007 · Feb 20, 2018 · 2999dbe · 2999dbe
1 parent c5cbf5d
commit 2999dbe
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "uBlock Origin",
-    "version": "1.15.8",
+    "version": "1.15.10",
 
     "commands": {
         "launch-element-zapper": {

diff --git a/src/js/messaging.js b/src/js/messaging.js
@@ -513,15 +513,25 @@ var onMessage = function(request, sender, callback) {
         request.entity = µb.URI.entityFromDomain(request.domain);
         response.specificCosmeticFilters =
             µb.cosmeticFilteringEngine.retrieveDomainSelectors(request, response);
+
+        // https://github.com/gorhill/uBlock/issues/3526
+        // https://github.com/uBlockOrigin/uAssets/issues/1492
+        //   Two distinct issues, but both are arising as a result of
+        //   injecting scriptlets through stream filtering. So falling back
+        //   to "slow" scriplet injection for the time being. Stream filtering
+        //   (`##^`) should be used for when scriptlets are defeated by early
+        //   script tags on a page.
+        //
         // If response body filtering is supported, than the scriptlets have
         // already been injected.
-        if (
-            µb.canFilterResponseBody === false ||
-            µb.textEncode === undefined ||
-            µb.textEncode.normalizeCharset(request.charset) === undefined
-        ) {
+        //if (
+        //    µb.canFilterResponseBody === false ||
+        //    µb.textEncode === undefined ||
+        //    µb.textEncode.normalizeCharset(request.charset) === undefined
+        //) {
             response.scriptlets = µb.scriptletFilteringEngine.retrieve(request);
-        }
+        //}
+
         if ( request.isRootFrame && µb.logger.isEnabled() ) {
             µb.logCosmeticFilters(tabId);
         }

diff --git a/src/js/traffic.js b/src/js/traffic.js
@@ -839,7 +839,16 @@ var filterDocument = (function() {
             charset: undefined
         };
         request.selectors = µb.htmlFilteringEngine.retrieve(request);
-        request.scriptlets = µb.scriptletFilteringEngine.retrieve(request);
+
+        // https://github.com/gorhill/uBlock/issues/3526
+        // https://github.com/uBlockOrigin/uAssets/issues/1492
+        //   Two distinct issues, but both are arising as a result of
+        //   injecting scriptlets through stream filtering. So falling back
+        //   to "slow" scriplet injection for the time being. Stream filtering
+        //   (`##^`) should be used for when scriptlets are defeated by early
+        //   script tags on a page.
+        //
+        //request.scriptlets = µb.scriptletFilteringEngine.retrieve(request);
 
         if (
             request.selectors === undefined &&