Issue 5464 - Ignore and whitelist WebRTC if not supported

lib/abp2blocklist.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 124 matching lines @@
   return "^https?://([^/:]*\\.)?" + escapeRegExp(domain).toLowerCase() + "[/:]";
 }
 
 function getURLSchemes(contentType)
 {
   // If the given content type includes all supported URL schemes, simply
   // return a single generic URL scheme pattern. This minimizes the size of the
   // generated rule set. The downside to this is that it will also match
   // schemes that we do not want to match (e.g. "ftp://"), but this can be
   // mitigated by adding exceptions for those schemes.
-  if (contentType & typeMap.WEBSOCKET && contentType & typeMap.WEBRTC &&
+  if (contentType & typeMap.WEBSOCKET &&
+      (!typeMap.WEBRTC || contentType & typeMap.WEBRTC) &&
       contentType & httpRequestTypes)
     return ["[^:]+:(//)?"];
 
   let urlSchemes = [];
 
   if (contentType & typeMap.WEBSOCKET)
     urlSchemes.push("wss?://");
 
   if (contentType & typeMap.WEBRTC)
     urlSchemes.push("stuns?:", "turns?:");
@@ skipping 256 matching lines @@
     contentType = filter.contentType;
 
   // If WebSocket or WebRTC are given along with other options but not
   // including all three of WebSocket, WebRTC, and at least one HTTP raw type,
   // we must generate multiple rules. For example, for the filter
   // "foo$websocket,image", we must generate one rule with "^wss?://" and "raw"
   // and another rule with "^https?://" and "image". If we merge the two, we
   // end up blocking requests of all HTTP raw types (e.g. XMLHttpRequest)
   // inadvertently.
   if ((contentType & typeMap.WEBSOCKET && contentType != typeMap.WEBSOCKET &&
-       !(contentType & typeMap.WEBRTC &&
+       !((!typeMap.WEBRTC || contentType & typeMap.WEBRTC) &&
          contentType & rawRequestTypes & httpRequestTypes)) ||
       (contentType & typeMap.WEBRTC && contentType != typeMap.WEBRTC &&
        !(contentType & typeMap.WEBSOCKET &&
          contentType & rawRequestTypes & httpRequestTypes)))
   {
     if (contentType & typeMap.WEBSOCKET)
     {
       convertFilterAddRules(rules, filter, action, withResourceTypes,
                             exceptionDomains, typeMap.WEBSOCKET);
     }
@@ skipping 790 matching lines @@
 
 /**
  * Generate content blocker list for all filters that were added
  */
 ContentBlockerList.prototype.generateRules = function()
 {
   let cssRules = [];
   let cssExceptionRules = [];
   let blockingRules = [];
   let blockingExceptionRules = [];
+  let urlSchemeExceptionRules = [];
 
   let ruleGroups = [cssRules, cssExceptionRules,
-                    blockingRules, blockingExceptionRules];
+                    blockingRules, blockingExceptionRules,
+                    urlSchemeExceptionRules];
 
   let genericSelectors = [];
   let groupedElemhideFilters = new Map();
 
   for (let filter of this.elemhideFilters)
   {
     let result = convertElemHideFilter(filter, this.elemhideSelectorExceptions);
     if (!result)
       continue;
 
@@ skipping 58 matching lines @@
     convertFilterAddRules(blockingRules, filter, "block", true,
                           requestFilterExceptionDomains);
   }
 
   for (let filter of this.requestExceptions)
   {
     convertFilterAddRules(blockingExceptionRules, filter,
                           "ignore-previous-rules", true);
   }
 
+  if (!typeMap.WEBRTC)
+  {
+    urlSchemeExceptionRules.push([
+      {
+        trigger: {"url-filter": "^stuns?:"},
+        action: {type: "ignore-previous-rules"}
+      },
+      {
+        trigger: {"url-filter": "^turns?:"},
+        action: {type: "ignore-previous-rules"}
+      }
+    ]);
+  }
+
   return async(ruleGroups, (group, index) => () =>
   {
     let next = () =>
     {
       if (index == ruleGroups.length - 1)
         return ruleGroups.reduce((all, rules) => all.concat(rules), []);
     };
 
     if (this.options.merge == "all" ||
         (this.options.merge == "auto" &&
          ruleGroups.reduce((n, group) => n + group.length, 0) > 50000))
     {
       return mergeRules(ruleGroups[index], this.options.merge == "all")
       .then(rules =>
       {
         ruleGroups[index] = rules;
         return next();
       });
     }
 
     return next();
   });
 };