Don't inject fp. detection into first party frames

EFForg · Apr 9, 2018 · 7f7ff1d · 7f7ff1d
1 parent 966647a
commit 7f7ff1d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/js/contentscripts/fingerprinting.js b/src/js/contentscripts/fingerprinting.js
@@ -321,7 +321,7 @@ function insertFpScript(text, data) {
 }
 
 // TODO race condition; fix waiting on https://crbug.com/478183
-chrome.runtime.sendMessage({checkEnabled: true},
+chrome.runtime.sendMessage({checkEnabledAndThirdParty: true},
   function (enabled) {
     if (!enabled) {
       return;
@@ -335,7 +335,7 @@ chrome.runtime.sendMessage({checkEnabled: true},
     document.addEventListener(event_id, function (e) {
       // pass these on to the background page
       chrome.runtime.sendMessage({
-        'fpReport': e.detail
+        fpReport: e.detail
       });
     });
 

diff --git a/src/js/webrequest.js b/src/js/webrequest.js
@@ -612,6 +612,15 @@ function dispatcher(request, sender, sendResponse) {
       window.extractHostFromURL(sender.tab.url)
     ));
 
+  } else if (request.checkEnabledAndThirdParty) {
+    let tab_host = window.extractHostFromURL(sender.tab.url),
+      frame_host = window.extractHostFromURL(sender.url);
+
+    sendResponse(
+      badger.isPrivacyBadgerEnabled(tab_host) &&
+      isThirdPartyDomain(frame_host, tab_host)
+    );
+
   } else if (request.checkLocation) {
     if (!badger.isPrivacyBadgerEnabled(window.extractHostFromURL(sender.tab.url))) {
       return sendResponse();
@@ -688,12 +697,6 @@ function dispatcher(request, sender, sendResponse) {
       recordSuperCookie(sender, request.superCookieReport);
     }
 
-  } else if (request.checkEnabledAndThirdParty) {
-    let tab_host = window.extractHostFromURL(sender.tab.url),
-      frame_host = window.extractHostFromURL(sender.url);
-
-    sendResponse(badger.isPrivacyBadgerEnabled(tab_host) && isThirdPartyDomain(frame_host, tab_host));
-
   } else if (request.checkSocialWidgetReplacementEnabled) {
     sendResponse(badger.isPrivacyBadgerEnabled(window.extractHostFromURL(sender.tab.url)) && badger.isSocialWidgetReplacementEnabled());