From bbd050a1743dc0fb366ab9c7c1f60ed92cfc2905 Mon Sep 17 00:00:00 2001
From: hackademix
Date: Mon, 17 Dec 2018 16:32:53 +0100
Subject: Cascade top document's restrictions to subframes (Tor issue #28873).

---
 src/bg/RequestGuard.js | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/bg/RequestGuard.js b/src/bg/RequestGuard.js
index 92f32b0..a174eba 100644
--- a/src/bg/RequestGuard.js
+++ b/src/bg/RequestGuard.js
@@ -310,18 +310,33 @@ var RequestGuard = (() => {
         pending = pendingRequests.get(request.requestId);
       }
       pending.headersProcessed = true;
-      let {url, documentUrl, statusCode, tabId, responseHeaders, type} = request;
+      let {url, documentUrl, frameAncestors, statusCode, tabId,
+          responseHeaders, type} = request;
       let isMainFrame = type === "main_frame";
       try {
         let capabilities;
         if (ns.isEnforced(tabId)) {
           let policy = ns.policy;
           let perms = policy.get(url, documentUrl).perms;
-          if (policy.autoAllowTop && isMainFrame && perms === policy.DEFAULT) {
-            policy.set(Sites.optimalKey(url), perms = policy.TRUSTED.tempTwin);
-            await ChildPolicies.update(policy);
+          if (isMainFrame) {
+            if (policy.autoAllowTop && perms === policy.DEFAULT) {
+              policy.set(Sites.optimalKey(url), perms = policy.TRUSTED.tempTwin);
+              await ChildPolicies.update(policy);
+            }
+            capabilities = perms.capabilities;
+          } else {
+            capabilities = perms.capabilities;
+            if (frameAncestors.length > 0) {
+              // cascade top document's restrictions to subframes
+              let topUrl = frameAncestors.pop().url;
+              let topPerms = policy.get(topUrl, topUrl).perms;
+              if (topPerms !== perms) {
+                let topCaps = topPerms.capabilities;
+                // intersect capabilities
+                capabilities = new Set([...capabilities].filter(c => topCaps.has(c)));
+              }
+            }
           }
-          capabilities = perms.capabilities;
         } else {
           if (isMainFrame || type === "sub_frame") {
             let unrestricted = ns.unrestrictedTabs.has(tabId) && {unrestricted: true};
-- 
cgit v1.2.3