Fix hostPattern and don't apply migration if user has global block in…

… place Fixes #14204 Auditors: @diracdeltas
brave · May 22, 2018 · 321b208 · 321b208
1 parent 1bfb422
commit 321b208
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/migrations/20180518_uphold.js b/app/migrations/20180518_uphold.js
@@ -7,7 +7,10 @@ const compareVersions = require('compare-versions')
 // per https://github.com/brave/browser-laptop/issues/14152
 // add fingerprint exception for existing users for uphold.com
 module.exports = (data) => {
-  if (!data.lastAppVersion) {
+  // don't apply if:
+  // - user chooses to block all fingerprinting (global setting)
+  // - user is not upgrading from 0.22.714 or earlier
+  if (data.fingerprintingProtectionAll || !data.lastAppVersion) {
     return
   }
 
@@ -18,7 +21,7 @@ module.exports = (data) => {
   } catch (e) {}
 
   if (migrationNeeded) {
-    const pattern = 'https://uphold.com'
+    const pattern = 'https?://uphold.com'
     if (!data.siteSettings[pattern]) {
       data.siteSettings[pattern] = {}
     }

diff --git a/js/data/siteSettingsList.js b/js/data/siteSettingsList.js
@@ -14,7 +14,7 @@ module.exports.defaultSiteSettingsList = [
     },
     {
       "name" : "fingerprintingProtection",
-      "pattern" : "https://uphold.com",
+      "pattern" : "https?://uphold.com",
       "value" : "allowAllFingerprinting"
     }
 ]
diff --git a/test/unit/app/sessionStoreTest.js b/test/unit/app/sessionStoreTest.js
@@ -979,7 +979,7 @@ describe('sessionStore unit tests', function () {
           'https://www.youtube.com': {
             autoplay: true
           },
-          'https://uphold.com': {
+          'https?://uphold.com': {
             fingerprintingProtection: 'allowAllFingerprinting'
           }
         }