EFForg
diff --git a/Collapse file: scripts/verify_json.py
‎scripts/verify_json.py‎
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/Collapse file: scripts/verify_json.py
‎scripts/verify_json.py‎
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/Collapse file: src/_locales/en_US/messages.json
‎src/_locales/en_US/messages.json‎
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions b/Collapse file: src/_locales/en_US/messages.json
‎src/_locales/en_US/messages.json‎
Copy file name to clipboard
+10Lines changed: 10 additions & 0 deletions
diff --git a/Collapse file: src/data/surrogates.js
‎src/data/surrogates.js‎
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions b/Collapse file: src/data/surrogates.js
‎src/data/surrogates.js‎
Copy file name to clipboard
+12Lines changed: 12 additions & 0 deletions
diff --git a/Collapse file: src/data/web_accessible_resources/.eslintrc.yml
‎src/data/web_accessible_resources/.eslintrc.yml‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions b/Collapse file: src/data/web_accessible_resources/.eslintrc.yml
‎src/data/web_accessible_resources/.eslintrc.yml‎
Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
diff --git a/Collapse file: src/data/web_accessible_resources/fingerprintjs3.js
‎src/data/web_accessible_resources/fingerprintjs3.js‎
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions b/Collapse file: src/data/web_accessible_resources/fingerprintjs3.js
‎src/data/web_accessible_resources/fingerprintjs3.js‎
Copy file name to clipboard
+25Lines changed: 25 additions & 0 deletions
diff --git a/Collapse file: src/js/background.js
‎src/js/background.js‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/Collapse file: src/js/background.js
‎src/js/background.js‎
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/Collapse file: src/js/htmlutils.js
‎src/js/htmlutils.js‎
Copy file name to clipboard
+53-35Lines changed: 53 additions & 35 deletions b/Collapse file: src/js/htmlutils.js
‎src/js/htmlutils.js‎
Copy file name to clipboard
+53-35Lines changed: 53 additions & 35 deletions
diff --git a/Collapse file: src/js/options.js
‎src/js/options.js‎
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion b/Collapse file: src/js/options.js
‎src/js/options.js‎
Copy file name to clipboard
+7-1Lines changed: 7 additions & 1 deletion
diff --git a/Collapse file: src/js/popup.js
‎src/js/popup.js‎
Copy file name to clipboard
+10-8Lines changed: 10 additions & 8 deletions b/Collapse file: src/js/popup.js
‎src/js/popup.js‎
Copy file name to clipboard
+10-8Lines changed: 10 additions & 8 deletions
@@ -3,7 +3,13 @@
 import json
 import sys
 
-KEYS = set(['snitch_map', 'action_map', 'tracking_map', 'version'])
+KEYS = set([
+    'action_map',
+    'fp_scripts',
+    'snitch_map',
+    'tracking_map',
+    'version',
+])
 
 with open(sys.argv[1], encoding="utf-8") as f:
     try:
 
@@ -123,6 +123,16 @@
             }
         }
     },
+    "badger_status_blocked_scripts": {
+        "message": "Blocked cookies and fingerprinting scripts from $DOMAIN$",
+        "description": "Tooltip for cookie-blocked domains that tried to load one or more fingerprinting scripts.",
+        "placeholders": {
+            "domain": {
+                "content": "$1",
+                "example": "example.com"
+            }
+        }
+    },
     "badger_status_allow": {
         "message": "Allowed $DOMAIN$",
         "description": "Tooltip shown over a tracking but still allowed (green slider) domain name in the domain slider list.",
 
@@ -139,6 +139,14 @@ const hostnames = {
     ],
     widgetName: "YouTube"
   },
+  'cdn.jsdelivr.net': {
+    match: MATCH_SUFFIX,
+    tokens: [
+      '/npm/@fingerprintjs/fingerprintjs@3/dist/fp.js',
+      '/npm/@fingerprintjs/fingerprintjs@3/dist/fp.min.js',
+      '/npm/@fingerprintjs/fingerprintjs@3.3.2/dist/fp.js',
+    ]
+  },
 };
 
 /**
@@ -184,6 +192,10 @@ const surrogates = {
   '/iframe_api': 'youtube.js',
   '/player_api': 'youtube.js',
 
+  '/npm/@fingerprintjs/fingerprintjs@3/dist/fp.js': 'fingerprintjs3.js',
+  '/npm/@fingerprintjs/fingerprintjs@3/dist/fp.min.js': 'fingerprintjs3.js',
+  '/npm/@fingerprintjs/fingerprintjs@3.3.2/dist/fp.js': 'fingerprintjs3.js',
+
   '/omweb-v1.js': 'noop.js',
 
   'noopjs': 'noop.js'
 
@@ -4,6 +4,7 @@ rules:
     - 4
     - outerIIFEBody: 1
   keyword-spacing: off
+  no-bitwise: off
   no-empty: off
   no-extra-semi: off
   space-in-parens: off
@@ -0,0 +1,25 @@
+// https://github.com/gorhill/uBlock/blob/e9fb4c3a426eb3231976f40c419ccd1a693fa559/src/web_accessible_resources/fingerprint3.js
+(function() {
+    'use strict';
+    const visitorId = (( ) => {
+        let id = '';
+        for ( let i = 0; i < 8; i++ ) {
+            id += (Math.random() * 0x10000 + 0x1000 | 0).toString(16).slice(-4);
+        }
+        return id;
+    })();
+    const FingerprintJS = class {
+        static hashComponents() {
+            return visitorId;
+        }
+        static load() {
+            return Promise.resolve(new FingerprintJS());
+        }
+        get() {
+            return Promise.resolve({
+                visitorId,
+            });
+        }
+    };
+    window.FingerprintJS = FingerprintJS;
+})();
@@ -1175,11 +1175,11 @@ Badger.prototype = {
 
     // The order of these keys is also the order in which they should be imported.
     // It's important that snitch_map be imported before action_map (#1972)
-    ["snitch_map", "action_map", "settings_map", "tracking_map"].forEach(function (key) {
+    for (let key of ["snitch_map", "action_map", "settings_map", "tracking_map", "fp_scripts"]) {
       if (utils.hasOwn(data, key)) {
         self.storage.getStore(key).merge(data[key]);
       }
-    });
+    }
   }
 
 };
 
@@ -56,21 +56,26 @@ let htmlUtils = {
   },
 
   /**
-   * Gets localized description for given action and origin.
+   * Gets localized description for given domain and action.
    *
-   * @param {String} action The action to get description for.
-   * @param {String} origin The origin to get description for.
-   * @returns {String} Localized action description with origin.
+   * @param {String} action the action to get description for
+   * @param {String} fqdn the domain to get description for
+   * @param {?Array} [blockedFpScripts]
+   *
+   * @returns {String} the description
    */
   getActionDescription: (function () {
+
     const messages = {
       block: i18n.getMessage('badger_status_block', "XXX"),
       cookieblock: i18n.getMessage('badger_status_cookieblock', "XXX"),
+      blockedScripts: i18n.getMessage('badger_status_blocked_scripts', "XXX"),
       noaction: i18n.getMessage('badger_status_noaction', "XXX"),
       allow: i18n.getMessage('badger_status_allow', "XXX"),
       dntTooltip: i18n.getMessage('dnt_tooltip')
     };
-    return function (action, origin) {
+
+    return function (action, fqdn, blockedFpScripts) {
       if (action.startsWith('user')) {
         action = action.slice(5);
       }
@@ -79,30 +84,36 @@ let htmlUtils = {
         return messages.dntTooltip;
       }
 
+      if (blockedFpScripts) {
+        return messages.blockedScripts.replace("XXX", fqdn);
+      }
+
       const rv_action = messages[action];
 
       if (!rv_action) {
-        return origin;
+        return fqdn;
       }
 
-      return rv_action.replace("XXX", origin);
+      return rv_action.replace("XXX", fqdn);
     };
+
   }()),
 
   /**
-   * Gets HTML for origin action toggle switch (block, block cookies, allow).
+   * Gets HTML for domain action toggle switch.
    *
-   * @param {String} origin Origin to get toggle for.
-   * @param {String} action Current action of given origin.
-   * @returns {String} HTML for toggle switch.
+   * @param {String} fqdn the domain to get toggle for
+   * @param {String} action the current action of given domain
+   *
+   * @returns {String} the HTML for toggle switch
    */
   getToggleHtml: (function () {
 
-    function is_checked(input_action, origin_action) {
-      if ((origin_action == constants.NO_TRACKING) || (origin_action == constants.DNT)) {
-        origin_action = constants.ALLOW;
+    function is_checked(input_action, action) {
+      if (action == constants.NO_TRACKING || action == constants.DNT) {
+        action = constants.ALLOW;
       }
-      return (input_action === origin_action ? 'checked' : '');
+      return (input_action === action ? 'checked' : '');
     }
 
     let tooltips = {
@@ -111,18 +122,17 @@ let htmlUtils = {
       allow: i18n.getMessage('domain_slider_allow_tooltip')
     };
 
-    return function (origin, action) {
-      let origin_id = origin.replace(/\./g, '-');
-
+    return function (fqdn, action) {
+      let id = fqdn.replace(/\./g, '-');
       return `
 <div class="switch-container ${action}">
   <div class="switch-toggle switch-3 switch-candy">
-    <input id="block-${origin_id}" name="${origin}" value="${constants.BLOCK}" type="radio" aria-label="${tooltips.block}" ${is_checked(constants.BLOCK, action)}>
-    <label title="${tooltips.block}" class="tooltip" for="block-${origin_id}"></label>
-    <input id="cookieblock-${origin_id}" name="${origin}" value="${constants.COOKIEBLOCK}" type="radio" aria-label="${tooltips.cookieblock}" ${is_checked(constants.COOKIEBLOCK, action)}>
-    <label title="${tooltips.cookieblock}" class="tooltip" for="cookieblock-${origin_id}"></label>
-    <input id="allow-${origin_id}" name="${origin}" value="${constants.ALLOW}" type="radio" aria-label="${tooltips.allow}" ${is_checked(constants.ALLOW, action)}>
-    <label title="${tooltips.allow}" class="tooltip" for="allow-${origin_id}"></label>
+    <input id="block-${id}" name="${fqdn}" value="${constants.BLOCK}" type="radio" aria-label="${tooltips.block}" ${is_checked(constants.BLOCK, action)}>
+    <label title="${tooltips.block}" class="tooltip" for="block-${id}"></label>
+    <input id="cookieblock-${id}" name="${fqdn}" value="${constants.COOKIEBLOCK}" type="radio" aria-label="${tooltips.cookieblock}" ${is_checked(constants.COOKIEBLOCK, action)}>
+    <label title="${tooltips.cookieblock}" class="tooltip" for="cookieblock-${id}"></label>
+    <input id="allow-${id}" name="${fqdn}" value="${constants.ALLOW}" type="radio" aria-label="${tooltips.allow}" ${is_checked(constants.ALLOW, action)}>
+    <label title="${tooltips.allow}" class="tooltip" for="allow-${id}"></label>
     <a></a>
   </div>
 </div>
@@ -132,24 +142,26 @@ let htmlUtils = {
   }()),
 
   /**
-   * Generates HTML for given origin.
-   * TODO origin --> domain
+   * Generates HTML for given FQDN.
    *
-   * @param {String} origin Origin to get HTML for.
-   * @param {String} action Action for given origin.
+   * @param {String} fqdn the FQDN to get HTML for
+   * @param {String} action the action for given FQDN
    * @param {Boolean} [show_breakage_warning]
    * @param {Boolean} [show_breakage_note]
-   * @returns {String} Origin HTML.
+   * @param {?Array} [blockedFpScripts]
+   *
+   * @returns {String} the slider HTML for the FQDN
    */
+  // TODO origin --> domain/FQDN
   getOriginHtml: (function () {
 
     const breakage_warning_tooltip = i18n.getMessage('breakage_warning_tooltip'),
       undo_arrow_tooltip = i18n.getMessage('feed_the_badger_title'),
       dnt_icon_url = chrome.runtime.getURL('/icons/dnt-16.png');
 
-    return function (origin, action, show_breakage_warning, show_breakage_note) {
+    return function (fqdn, action, show_breakage_warning, show_breakage_note, blockedFpScripts) {
       action = escape_html(action);
-      origin = escape_html(origin);
+      fqdn = escape_html(fqdn);
 
       // Get classes for main div.
       let classes = ['clicker'];
@@ -177,16 +189,22 @@ let htmlUtils = {
         `.trim();
       }
 
+      let shield_icon = '';
+      if (blockedFpScripts) {
+        shield_icon = '<span class="ui-icon ui-icon-shield"></span>';
+      }
+
       // construct HTML for domain
-      let origin_tooltip = htmlUtils.getActionDescription(action, origin);
+      let domain_tooltip = htmlUtils.getActionDescription(action, fqdn, blockedFpScripts);
+
       return `
-<div class="${classes.join(' ')}" data-origin="${origin}">
+<div class="${classes.join(' ')}" data-origin="${fqdn}">
   <div class="origin" role="heading" aria-level="4">
     <span class="ui-icon ui-icon-alert tooltip breakage-warning" title="${breakage_warning_tooltip}"></span>
-    <span class="origin-inner tooltip" title="${origin_tooltip}">${dnt_html}${origin}</span>
+    <span class="origin-inner tooltip" title="${domain_tooltip}">${dnt_html}${shield_icon}${fqdn}</span>
   </div>
   <a href="" class="removeOrigin">&#10006</a>
-  ${htmlUtils.getToggleHtml(origin, action)}
+  ${htmlUtils.getToggleHtml(fqdn, action, blockedFpScripts)}
   <a href="" class="honeybadgerPowered tooltip" title="${undo_arrow_tooltip}"></a>
 </div>
       `.trim();
 
@@ -33,7 +33,13 @@ window.SLIDERS_DONE = false;
 const TOOLTIP_CONF = {
   maxWidth: 400
 };
-const USER_DATA_EXPORT_KEYS = ["action_map", "snitch_map", "settings_map", "tracking_map"];
+const USER_DATA_EXPORT_KEYS = [
+  "action_map",
+  "snitch_map",
+  "settings_map",
+  "tracking_map",
+  "fp_scripts",
+];
 
 let i18n = chrome.i18n;
 
 
@@ -37,6 +37,7 @@ let BREAKAGE_NOTE_DOMAINS = {
 };
 
 const DOMAIN_TOOLTIP_CONF = {
+  maxWidth: 300,
   side: 'bottom',
 };
 
@@ -677,25 +678,26 @@ function refreshPopup() {
   let nonTracking = [];
   originsArr = htmlUtils.sortDomains(originsArr);
 
-  for (let origin of originsArr) {
-    let action = origins[origin];
+  for (let fqdn of originsArr) {
+    let action = origins[fqdn];
 
     if (action == constants.NO_TRACKING) {
-      nonTracking.push(origin);
+      nonTracking.push(fqdn);
     } else if (action == constants.ALLOW) {
-      unblockedTrackers.push(origin);
+      unblockedTrackers.push(fqdn);
     } else {
       let show_breakage_warning = (
         action == constants.USER_BLOCK &&
-        utils.hasOwn(POPUP_DATA.cookieblocked, origin)
+        utils.hasOwn(POPUP_DATA.cookieblocked, fqdn)
       );
       let show_breakage_note = false;
       if (!show_breakage_warning) {
-        show_breakage_note = (utils.hasOwn(BREAKAGE_NOTE_DOMAINS, origin) &&
-          !POPUP_DATA.shownBreakageNotes.includes(origin) &&
+        show_breakage_note = (utils.hasOwn(BREAKAGE_NOTE_DOMAINS, fqdn) &&
+          !POPUP_DATA.shownBreakageNotes.includes(fqdn) &&
           (action == constants.BLOCK || action == constants.COOKIEBLOCK));
       }
-      let slider_html = htmlUtils.getOriginHtml(origin, action, show_breakage_warning, show_breakage_note);
+      let slider_html = htmlUtils.getOriginHtml(fqdn, action,
+        show_breakage_warning, show_breakage_note, POPUP_DATA.blockedFpScripts[fqdn]);
       if (show_breakage_warning) {
         printableWarningSliders.push(slider_html);
       } else if (show_breakage_note) {
Original file line number	Diff line number	Diff line change
`@@ -1175,11 +1175,11 @@ Badger.prototype = {`
`1175`	`1175`
`1176`	`1176`	`// The order of these keys is also the order in which they should be imported.`
`1177`	`1177`	`// It's important that snitch_map be imported before action_map (#1972)`
`1178`		`- ["snitch_map", "action_map", "settings_map", "tracking_map"].forEach(function (key) {`
	`1178`	`+ for (let key of ["snitch_map", "action_map", "settings_map", "tracking_map", "fp_scripts"]) {`
`1179`	`1179`	`if (utils.hasOwn(data, key)) {`
`1180`	`1180`	`self.storage.getStore(key).merge(data[key]);`
`1181`	`1181`	`}`
`1182`		`- });`
	`1182`	`+ }`
`1183`	`1183`	`}`
`1184`	`1184`
`1185`	`1185`	`};`