Enumerate permitted content script messages.

.eslintrc.yml

@@ -27,7 +27,6 @@ rules:
     - error
     - 2
     - outerIIFEBody: 0
-      SwitchCase: 1
   keyword-spacing: error
   linebreak-style:
     - error

src/js/contentscripts/clobbercookie.js

@@ -32,7 +32,10 @@ if (window.top == window) {
 }
 
 // TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({ checkLocation: window.FRAME_URL }, function (blocked) {
+chrome.runtime.sendMessage({
+  type: "checkLocation",
+  frameUrl: window.FRAME_URL
+}, function (blocked) {
   if (blocked) {
     var code = '('+ function() {
       document.__defineSetter__("cookie", function(/*value*/) { });

src/js/contentscripts/clobberlocalstorage.js

@@ -32,7 +32,10 @@ if (window.top == window) {
 }
 
 // TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({ checkLocation: window.FRAME_URL }, function (blocked) {
+chrome.runtime.sendMessage({
+  type: "checkLocation",
+  frameUrl: window.FRAME_URL
+}, function (blocked) {
   if (blocked) {
     // https://stackoverflow.com/questions/49092423/how-to-break-on-localstorage-changes
     var code =

src/js/contentscripts/dnt.js

@@ -50,7 +50,7 @@ if (document instanceof HTMLDocument === false && (
 
 // TODO race condition; fix waiting on https://crbug.com/478183
 chrome.runtime.sendMessage({
-  checkDNT: true
+  type: "checkDNT"
 }, function (enabled) {
   if (enabled) {
     window.injectScript(getPageScript());

src/js/contentscripts/fingerprinting.js

@@ -313,28 +313,29 @@ if (document instanceof HTMLDocument === false && (
 }
 
 // TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
-  function (enabled) {
-    if (!enabled) {
-      return;
-    }
-    /**
-     * Communicating to webrequest.js
-     */
-    var event_id = Math.random();
-
-    // listen for messages from the script we are about to insert
-    document.addEventListener(event_id, function (e) {
-      // pass these on to the background page
-      chrome.runtime.sendMessage({
-        fpReport: e.detail
-      });
+chrome.runtime.sendMessage({
+  type: "checkEnabled"
+}, function (enabled) {
+  if (!enabled) {
+    return;
+  }
+  /**
+   * Communicating to webrequest.js
+   */
+  var event_id = Math.random();
+
+  // listen for messages from the script we are about to insert
+  document.addEventListener(event_id, function (e) {
+    // pass these on to the background page
+    chrome.runtime.sendMessage({
+      type: "fpReport",
+      data: e.detail
     });
+  });
 
-    window.injectScript(getFpPageScript(), {
-      event_id: event_id
-    });
-  }
-);
+  window.injectScript(getFpPageScript(), {
+    event_id: event_id
+  });
+});
 
 }());

src/js/contentscripts/socialwidgets.js

@@ -102,7 +102,8 @@ function createReplacementButtonImage(tracker, trackerElem, callback) {
   // don't have image data cached yet, get it from the background page
   buttonData.loading = true;
   chrome.runtime.sendMessage({
-    getReplacementButton: buttonData.imagePath
+    type: "getReplacementButton",
+    imagePath: buttonData.imagePath
   }, function (response) {
     buttonData.buttonUrl = response; // cache image data
     _createReplacementButtonImageCallback(tracker, trackerElem, callback);
@@ -416,7 +417,9 @@ function replaceIndividualButton(tracker) {
  *                            replaced
  */
 function getTrackerData(callback) {
-  chrome.runtime.sendMessage({checkReplaceButton: true}, function(response) {
+  chrome.runtime.sendMessage({
+    type: "checkReplaceButton"
+  }, function (response) {
     if (response) {
       for (const key in response.translations) {
         TRANSLATIONS[key] = response.translations[key];
@@ -435,7 +438,7 @@ function getTrackerData(callback) {
  */
 function unblockTracker(buttonUrls, callback) {
   let request = {
-    unblockWidget: true,
+    type: "unblockWidget",
     buttonUrls: buttonUrls
   };
   chrome.runtime.sendMessage(request, callback);
@@ -455,9 +458,9 @@ if (document instanceof HTMLDocument === false && (
 }
 
 chrome.runtime.sendMessage({
-  checkWidgetReplacementEnabled: true
-}, function (checkWidgetReplacementEnabled) {
-  if (!checkWidgetReplacementEnabled) {
+  type: "checkWidgetReplacementEnabled"
+}, function (enabled) {
+  if (!enabled) {
     return;
   }
   initialize();

src/js/contentscripts/supercookie.js

@@ -120,7 +120,8 @@ if (window.top == window) {
 // could then remove test workarounds like
 // https://github.com/EFForg/privacybadger/commit/39d5d0899e22d1c451d429e44553c5f9cad7fc46
 chrome.runtime.sendMessage({
-  checkEnabledAndThirdParty: window.FRAME_URL
+  type: "checkEnabledAndThirdParty",
+  frameUrl: window.FRAME_URL
 }, function (enabledAndThirdParty) {
   if (!enabledAndThirdParty) {
     return;
@@ -132,7 +133,8 @@ chrome.runtime.sendMessage({
   document.addEventListener(event_id_super_cookie, function (e) {
     // pass these on to the background page (handled by webrequest.js)
     chrome.runtime.sendMessage({
-      superCookieReport: e.detail,
+      type: "supercookieReport",
+      data: e.detail,
       frameUrl: window.FRAME_URL
     });
   });

src/js/firstparties/facebook.js

@@ -38,19 +38,19 @@ function cleanLink(a) {
   a.addEventListener("mouseover", function (e) { e.stopImmediatePropagation(); }, true);
 }
 
-//TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
-  function (enabled) {
-    if (!enabled) {
-      return;
-    }
+// TODO race condition; fix waiting on https://crbug.com/478183
+chrome.runtime.sendMessage({
+  type: "checkEnabled"
+}, function (enabled) {
+  if (!enabled) {
+    return;
+  }
 
-    // unwrap wrapped links in the original page
-    findInAllFrames(fb_wrapped_link).forEach((link) => {
-      cleanLink(link);
-    });
+  // unwrap wrapped links in the original page
+  findInAllFrames(fb_wrapped_link).forEach((link) => {
+    cleanLink(link);
+  });
 
-    // Execute redirect unwrapping each time new content is added to the page
-    observeMutations(fb_wrapped_link, cleanLink);
-  }
-);
+  // Execute redirect unwrapping each time new content is added to the page
+  observeMutations(fb_wrapped_link, cleanLink);
+});

src/js/firstparties/google-search.js

@@ -22,18 +22,17 @@ function cleanLink(a) {
   a.addEventListener("mousedown", function (e) { e.stopImmediatePropagation(); }, true);
 }
 
-//TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
-  function (enabled) {
-    if (!enabled) {
-      return;
-    }
-
-    // since the page is rendered all at once, no need to set up a
-    // mutationObserver or setInterval
-    findInAllFrames(trap_link).forEach((link) => {
-      cleanLink(link);
-    });
-
+// TODO race condition; fix waiting on https://crbug.com/478183
+chrome.runtime.sendMessage({
+  type: "checkEnabled"
+}, function (enabled) {
+  if (!enabled) {
+    return;
   }
-);
+
+  // since the page is rendered all at once, no need to set up a
+  // mutationObserver or setInterval
+  findInAllFrames(trap_link).forEach((link) => {
+    cleanLink(link);
+  });
+});

src/js/firstparties/google-static.js

@@ -29,13 +29,13 @@ function unwrapAll() {
   });
 }
 
-//TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
-  function (enabled) {
-    if (!enabled) {
-      return;
-    }
-    unwrapAll();
-    setInterval(unwrapAll, 2000);
+// TODO race condition; fix waiting on https://crbug.com/478183
+chrome.runtime.sendMessage({
+  type: "checkEnabled"
+}, function (enabled) {
+  if (!enabled) {
+    return;
   }
-);
+  unwrapAll();
+  setInterval(unwrapAll, 2000);
+});

src/js/firstparties/twitter.js

@@ -80,14 +80,14 @@ function unwrapSpecialTwitterURLs() {
   });
 }
 
-//TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
-  function (enabled) {
-    if (!enabled) {
-      return;
-    }
-    unwrapSpecialTwitterURLs();
-    unwrapTwitterURLsInTimeline();
-    setInterval(unwrapTwitterURLsInTimeline, 2000);
+// TODO race condition; fix waiting on https://crbug.com/478183
+chrome.runtime.sendMessage({
+  type: "checkEnabled",
+}, function (enabled) {
+  if (!enabled) {
+    return;
   }
-);
+  unwrapSpecialTwitterURLs();
+  unwrapTwitterURLsInTimeline();
+  setInterval(unwrapTwitterURLsInTimeline, 2000);
+});

src/js/storage.js

@@ -233,20 +233,20 @@ BadgerPen.prototype = {
 
     function getScore(action) {
       switch (action) {
-        case constants.NO_TRACKING:
-          return 0;
-        case constants.ALLOW:
-          return 1;
-        case constants.BLOCK:
-          return 2;
-        case constants.COOKIEBLOCK:
-          return 3;
-        case constants.DNT:
-          return 4;
-        case constants.USER_ALLOW:
-        case constants.USER_BLOCK:
-        case constants.USER_COOKIE_BLOCK:
-          return 5;
+      case constants.NO_TRACKING:
+        return 0;
+      case constants.ALLOW:
+        return 1;
+      case constants.BLOCK:
+        return 2;
+      case constants.COOKIEBLOCK:
+        return 3;
+      case constants.DNT:
+        return 4;
+      case constants.USER_ALLOW:
+      case constants.USER_BLOCK:
+      case constants.USER_COOKIE_BLOCK:
+        return 5;
       }
     }