Merge pull request #66 from brave/fix_3p_noscript

Only keep user-allowed origins in the noScriptInfo when a navigation …
brave · Sep 26, 2018 · dfac903 · dfac903
2 parents 64d8d2f + b57edae
commit dfac903
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/app/state/shieldsPanelState.ts b/app/state/shieldsPanelState.ts
@@ -108,7 +108,13 @@ export const resetNoScriptInfo: shieldState.ResetNoScriptInfo = (state, tabId, n
   if (newOrigin !== tabs[tabId].origin) { // navigate away
     tabs[tabId].noScriptInfo = {}
   }
-  Object.keys(tabs[tabId].noScriptInfo).map(key => tabs[tabId].noScriptInfo[key].actuallyBlocked = false)
+  Object.keys(tabs[tabId].noScriptInfo).map(key => {
+    tabs[tabId].noScriptInfo[key].actuallyBlocked = false
+    // only keep entries which users want to allow
+    if (tabs[tabId].noScriptInfo[key].willBlock) {
+      delete tabs[tabId].noScriptInfo[key]
+    }
+  })
   return { ...state, tabs }
 }
 

diff --git a/test/app/state/shieldsPanelStateTest.ts b/test/app/state/shieldsPanelStateTest.ts
@@ -729,7 +729,7 @@ describe('shieldsPanelState test', () => {
           url: 'https://brave.com',
           noScriptInfo: {
             'https://a.com': { actuallyBlocked: true, willBlock: true },
-            'https://b.com': { actuallyBlocked: false, willBlock: false }
+            'https://b.com': { actuallyBlocked: true, willBlock: false }
           },
           adsBlockedResources: [],
           trackersBlockedResources: [],
@@ -796,7 +796,6 @@ describe('shieldsPanelState test', () => {
               fingerprintingBlocked: 0,
               url: 'https://brave.com',
               noScriptInfo: {
-                'https://a.com': { actuallyBlocked: false, willBlock: true },
                 'https://b.com': { actuallyBlocked: false, willBlock: false }
               },
               adsBlockedResources: [],