Delay ns.getPolicy() in RequestGuard.intersectCapabilities()

aaronkollasch · aaronkollasch · commit 2e97e19f166a · 2021-12-06T13:16:05.000-05:00
diff --git a/src/bg/RequestGuard.js b/src/bg/RequestGuard.js
@@ -339,7 +339,6 @@ var RequestGuard = (() => {
 
   function intersectCapabilities(perms, request) {
     let {frameId, frameAncestors, tabId, cookieStoreId} = request;
-    let policy = ns.getPolicy(cookieStoreId);
     if (frameId !== 0 && ns.sync.cascadeRestrictions) {
       let topUrl = frameAncestors && frameAncestors.length
         && frameAncestors[frameAncestors.length - 1].url;
@@ -348,6 +347,7 @@ var RequestGuard = (() => {
         if (tab) topUrl = tab.url;
       }
       if (topUrl) {
+        let policy = ns.getPolicy(cookieStoreId);
         return policy.cascadeRestrictions(perms, topUrl).capabilities;
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,6 @@ var RequestGuard = (() => {`
`339`	`339`
`340`	`340`	`function intersectCapabilities(perms, request) {`
`341`	`341`	`let {frameId, frameAncestors, tabId, cookieStoreId} = request;`
`342`		`- let policy = ns.getPolicy(cookieStoreId);`
`343`	`342`	`if (frameId !== 0 && ns.sync.cascadeRestrictions) {`
`344`	`343`	`let topUrl = frameAncestors && frameAncestors.length`
`345`	`344`	`&& frameAncestors[frameAncestors.length - 1].url;`
`@@ -348,6 +347,7 @@ var RequestGuard = (() => {`
`348`	`347`	`if (tab) topUrl = tab.url;`
`349`	`348`	`}`
`350`	`349`	`if (topUrl) {`
	`350`	`+ let policy = ns.getPolicy(cookieStoreId);`
`351`	`351`	`return policy.cascadeRestrictions(perms, topUrl).capabilities;`
`352`	`352`	`}`
`353`	`353`	`}`