Merge pull request #2270 from EFForg/implement-yellowlist-removal

Implement yellowlist removal

Author: bcyphers

src/js/storage.js

@@ -182,17 +182,25 @@ BadgerPen.prototype = {
     log('removing from cookie blocklist:', removedDomains);
     removedDomains.forEach(function (domain) {
       yellowlistStorage.deleteItem(domain);
-      // TODO restore domain removal logic:
-      // https://github.com/EFForg/privacybadger/issues/1474
+
+      const base = window.getBaseDomain(domain);
+      // "subdomains" include the domain itself
+      for (const subdomain of Object.keys(actionMap.getItemClones())) {
+        if (window.getBaseDomain(subdomain) == base) {
+          if (self.getAction(subdomain) != constants.NO_TRACKING) {
+            badger.heuristicBlocking.blacklistOrigin(base, subdomain);
+          }
+        }
+      }
     });
 
     log('adding to cookie blocklist:', addedDomains);
     addedDomains.forEach(function (domain) {
       yellowlistStorage.setItem(domain, true);
 
-      let base_domain = window.getBaseDomain(domain);
-      if (actionMap.hasItem(base_domain)) {
-        let action = actionMap.getItem(base_domain).heuristicAction;
+      const base = window.getBaseDomain(domain);
+      if (actionMap.hasItem(base)) {
+        const action = actionMap.getItem(base).heuristicAction;
         // if the domain's base domain is marked for blocking
         if (action == constants.BLOCK || action == constants.COOKIEBLOCK) {
           // cookieblock the domain

src/tests/.eslintrc.yml

@@ -2,9 +2,3 @@ globals:
   # false to disallow overwriting
   QUnit: false
   sinon: false
-rules:
-  indent:
-    - error
-    - 2
-    - VariableDeclarator:
-        var: 2

src/tests/lib/qunit_config.js

@@ -2,84 +2,84 @@
 
 (function () {
 
-  let BACKUP = {};
-
-  QUnit.config.autostart = false;
-  QUnit.config.testTimeout = 6400;
-
-  // disable storage persistence
-  // unit tests shouldn't be able to affect your Badger's storage
-  chrome.storage.local.set = () => {};
-
-  // make it seem like there is nothing in storage
-  // unit tests shouldn't read from your Badger's storage either
-  chrome.storage.local.get = (keys, callback) => {
-    // callback has to be async
-    setTimeout(function () {
-      callback({
-        // don't open the new user intro page or load seed data
-        settings_map: {
-          isFirstRun: false,
-        }
-      });
-    }, 0);
-  };
-
-  // reset state between tests
-  // to prevent tests affecting each other via side effects
-  QUnit.testStart(() => {
-    // back up settings and heuristic learning
-    // TODO any other state we should reset? tabData?
-    badger.storage.KEYS.forEach(item => {
-      let obj = badger.storage.getBadgerStorageObject(item);
-      BACKUP[item] = obj.getItemClones();
+let BACKUP = {};
+
+QUnit.config.autostart = false;
+QUnit.config.testTimeout = 6400;
+
+// disable storage persistence
+// unit tests shouldn't be able to affect your Badger's storage
+chrome.storage.local.set = () => {};
+
+// make it seem like there is nothing in storage
+// unit tests shouldn't read from your Badger's storage either
+chrome.storage.local.get = (keys, callback) => {
+  // callback has to be async
+  setTimeout(function () {
+    callback({
+      // don't open the new user intro page or load seed data
+      settings_map: {
+        isFirstRun: false,
+      }
     });
+  }, 0);
+};
+
+// reset state between tests
+// to prevent tests affecting each other via side effects
+QUnit.testStart(() => {
+  // back up settings and heuristic learning
+  // TODO any other state we should reset? tabData?
+  badger.storage.KEYS.forEach(item => {
+    let obj = badger.storage.getBadgerStorageObject(item);
+    BACKUP[item] = obj.getItemClones();
   });
+});
 
-  QUnit.testDone(() => {
-    // restore original settings and heuristic learning
-    badger.storage.KEYS.forEach(item => {
-      let obj = badger.storage.getBadgerStorageObject(item);
-      obj.updateObject(BACKUP[item]);
-    });
+QUnit.testDone(() => {
+  // restore original settings and heuristic learning
+  badger.storage.KEYS.forEach(item => {
+    let obj = badger.storage.getBadgerStorageObject(item);
+    obj.updateObject(BACKUP[item]);
   });
+});
 
-  // kick off tests when we have what we need from Badger
-  (function () {
+// kick off tests when we have what we need from Badger
+(function () {
 
-    function get_storage_length(store) {
-      return Object.keys(
-        badger.storage.getBadgerStorageObject(store).getItemClones()
-      ).length;
-    }
+  function get_storage_length(store) {
+    return Object.keys(
+      badger.storage.getBadgerStorageObject(store).getItemClones()
+    ).length;
+  }
 
-    const WAIT_INTERVAL = 10,
-      MAX_WAIT = 1000;
+  const WAIT_INTERVAL = 10,
+    MAX_WAIT = 1000;
 
-    let elapsed = 0;
+  let elapsed = 0;
 
-    function wait_for_badger() {
-      elapsed += WAIT_INTERVAL;
+  function wait_for_badger() {
+    elapsed += WAIT_INTERVAL;
 
-      if (elapsed >= MAX_WAIT) {
-        // give up
-        QUnit.start();
-      }
+    if (elapsed >= MAX_WAIT) {
+      // give up
+      QUnit.start();
+    }
 
-      if (typeof badger == "object" && badger.INITIALIZED &&
-        // TODO have badger.INITIALIZED account
-        // for things getting initialized async
-        !!get_storage_length('dnt_hashes') &&
-        !!get_storage_length('cookieblock_list')
-      ) {
-        QUnit.start();
-      } else {
-        setTimeout(wait_for_badger, WAIT_INTERVAL);
-      }
+    if (typeof badger == "object" && badger.INITIALIZED &&
+      // TODO have badger.INITIALIZED account
+      // for things getting initialized async
+      !!get_storage_length('dnt_hashes') &&
+      !!get_storage_length('cookieblock_list')
+    ) {
+      QUnit.start();
+    } else {
+      setTimeout(wait_for_badger, WAIT_INTERVAL);
     }
+  }
 
-    setTimeout(wait_for_badger, WAIT_INTERVAL);
+  setTimeout(wait_for_badger, WAIT_INTERVAL);
 
-  }());
+}());
 
 }());