Initial support for container tabs

Author: aaronkollasch

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "nscl"]
 	path = src/nscl
 	url = ../nscl.git
+	branch = container-tabs

src/bg/LifeCycle.js

@@ -269,6 +269,17 @@ var LifeCycle = (() => {
         if (changed) {
           await ns.savePolicy();
         }
+        if (ns.contextStore) {
+          changed = false;
+          for (let k of Object.keys(ns.contextStore.policies)){
+            for (let p of ns.contextStore.policies[k].getPresets(presetNames)) {
+              if (callback(p)) changed = true;
+            }
+          }
+          if (changed) {
+            await ns.saveContextStore();
+          }
+        }
       };
 
       let configureNewCap = async (cap, presetNames, capsFilter) => {

src/bg/RequestGuard.js

@@ -399,7 +399,6 @@ var RequestGuard = (() => {
       normalizeRequest(request);
       try {
         let redirected = initPendingRequest(request);
-        let {policy} = ns
         let {type} = request;
         if (type in policyTypesMap) {
           let previous = recent.find(request);
@@ -411,8 +410,9 @@ var RequestGuard = (() => {
           recent.add(previous);
 
           let policyType = policyTypesMap[type];
-          let {url, originUrl, documentUrl, tabId} = request;
+          let {url, originUrl, documentUrl, tabId, cookieStoreId} = request;
           let isFetch = "fetch" === policyType;
+          let policy = ns.getPolicy(cookieStoreId);
 
           if ((isFetch || "frame" === policyType) &&
               (((isFetch && (!originUrl ||
@@ -515,12 +515,12 @@ var RequestGuard = (() => {
       let headersModified = false;
 
       pending.headersProcessed = true;
-      let {url, documentUrl, tabId, responseHeaders, type} = request;
+      let {url, documentUrl, tabId, cookieStoreId, responseHeaders, type} = request;
       let isMainFrame = type === "main_frame";
       try {
         let capabilities;
         if (ns.isEnforced(tabId)) {
-          let policy = ns.policy;
+          let policy = ns.getPolicy(cookieStoreId);
           let perms = policy.get(url, documentUrl).perms;
           if (isMainFrame) {
             if (policy.autoAllowTop && perms === policy.DEFAULT) {
@@ -640,9 +640,11 @@ var RequestGuard = (() => {
     return ABORT;
   }
 
-  function injectPolicyScript(details) {
+  async function injectPolicyScript(details) {
+    console.debug("INJECT", details);
     let {url, tabId, frameId} = details;
-    let policy = ns.computeChildPolicy({url}, {tab: {id: tabId}, frameId});
+    let tab = await browser.tabs.get(tabId);
+    let policy = ns.computeChildPolicy({url}, {tab, frameId});
     policy.navigationURL = url;
     let debugStatement = ns.local.debug ? `
       let mark = Date.now() + ":" + Math.random();

src/bg/Settings.js

@@ -98,6 +98,7 @@ var Settings = {
   async update(settings) {
     let {
       policy,
+      contextStore,
       xssUserChoices,
       tabId,
       unrestrictedTab,
@@ -144,8 +145,10 @@ var Settings = {
     }
 
     if (settings.sync === null) {
+      debug("resetting options", settings);
       // user is resetting options
       policy = this.createDefaultDryPolicy();
+      contextStore = new ContextStore().dry();
 
       // overriden defaults when user manually resets options
 
@@ -170,6 +173,13 @@ var Settings = {
       await ns.savePolicy();
     }
 
+    if (contextStore) {
+      let newContextStore = new ContextStore(contextStore);
+      debug("set contextstore", newContextStore);
+      ns.contextStore = newContextStore
+      await ns.saveContextStore();
+    }
+
     if (typeof unrestrictedTab === "boolean") {
       ns.unrestrictedTabs[unrestrictedTab ? "add" : "delete"](tabId);
     }
@@ -213,6 +223,7 @@ var Settings = {
   export() {
     return JSON.stringify({
       policy: ns.policy.dry(),
+      contextStore: ns.contextStore.dry(),
       local: ns.local,
       sync: ns.sync,
       xssUserChoices: XSS.getUserChoices(),

src/bg/main.js

@@ -63,6 +63,24 @@
       }
     }
 
+    if (!ns.contextStore) { // it could have been already retrieved by LifeCycle
+      let contextStoreData = (await Storage.get("sync", "contextStore")).contextStore;
+      if (contextStoreData) {
+        ns.contextStore = new ContextStore(contextStoreData);
+        await ns.contextStore.updateContainers();
+      } else {
+        log("No container data found. Initializing new empty policies.")
+        identities = await browser.contextualIdentities.query({});
+        policies = new Object();
+        identities.forEach(({cookieStoreId}) => {
+          policies[cookieStoreId] = new Policy();
+        })
+        ns.contextStore = new ContextStore(({policies}));
+        await ns.contextStore.updateContainers();
+        await ns.saveContextStore();
+      }
+    }
+
     let {isTorBrowser} = ns.local;
     Sites.onionSecure = isTorBrowser;
 
@@ -160,10 +178,12 @@
       tabId = -1
     }) {
       let policy = ns.policy.dry(true);
+      let contextStore = ns.contextStore.dry(true);
       let seen = tabId !== -1 ? await ns.collectSeen(tabId) : null;
       let xssUserChoices = await XSS.getUserChoices();
       await Messages.send("settings", {
         policy,
+        contextStore,
         seen,
         xssUserChoices,
         local: ns.local,
@@ -221,6 +241,7 @@
   var ns = {
     running: false,
     policy: null,
+    contextStore: null,
     local: null,
     sync: null,
     initializing: null,
@@ -233,9 +254,31 @@
       return !this.isEnforced(request.tabId) || this.policy.can(request.url, capability, request.documentURL);
     },
 
+    getPolicy(cookieStoreId){
+//       debug("get policy", cookieStoreId, ns.policy, ns.contextStore);
+      if (ns.contextStore.policies.hasOwnProperty(cookieStoreId)) {
+        let currentPolicy = ns.contextStore.policies[cookieStoreId];
+        debug("has cookiestore", cookieStoreId, currentPolicy);
+        if (currentPolicy) return currentPolicy;
+      }
+      debug("default cookiestore", cookieStoreId);
+      return ns.policy;
+    },
+
     computeChildPolicy({url, contextUrl}, sender) {
       let {tab, frameId} = sender;
-      let policy = ns.policy;
+      let cookieStoreId = (tab)? tab.cookieStoreId : "default";
+      var policy = ns.policy;
+      debug("computing policy", cookieStoreId, ns.contextStore);
+      if (
+          cookieStoreId && 
+          !cookieStoreId.toLowerCase().includes("default") &&  //exclude firefox-default
+          ns.contextStore && 
+          ns.contextStore.policies.hasOwnProperty(cookieStoreId)
+      ) {
+        policy = ns.contextStore.policies[cookieStoreId];
+      }
+      debug("chose policy", policy);
       let {isTorBrowser} = ns.local;
       if (!policy) {
         console.log("Policy is null, initializing: %o, sending fallback.", ns.initializing);
@@ -314,11 +357,21 @@
         await Storage.set("sync", {
           policy: this.policy.dry()
         });
-        await browser.webRequest.handlerBehaviorChanged()
+        await browser.webRequest.handlerBehaviorChanged();
       }
       return this.policy;
     },
 
+    async saveContextStore() {
+      if (this.contextStore) {
+        await Storage.set("sync", {
+          contextStore: this.contextStore.dry()
+        });
+        await browser.webRequest.handlerBehaviorChanged();
+      }
+      return this.contextStore;
+    },
+
 
 
     async save(obj) {

src/manifest.json

@@ -28,7 +28,8 @@
       "webNavigation",
       "webRequest",
       "webRequestBlocking",
-      "<all_urls>"
+      "<all_urls>",
+      "contextualIdentities"
   ],
 
   "background": {
@@ -50,6 +51,7 @@
       "/nscl/common/Sites.js",
       "/nscl/common/Permissions.js",
       "/nscl/common/Policy.js",
+      "/nscl/common/ContextStore.js",
       "/nscl/common/locale.js",
       "/nscl/common/SyntaxChecker.js",
       "/nscl/common/Storage.js",

src/nscl

@@ -94,6 +94,12 @@ fieldset:disabled {
 .hide, div.debug {
   display: none;
 }
+#context-store {
+  display: block;
+  margin-top: .5em;
+  min-height: 20em;
+  width: 90%;
+}
 
 body.debug div.debug {
   display: initial;
@@ -112,6 +118,14 @@ body.debug div.debug {
   font-weight: bold;
 }
 
+#context-store-error {
+  background: red;
+  color: #ff8;
+  padding: 0;
+  margin: 0;
+  font-weight: bold;
+}
+
 input, button {
   font-size: 1em;
 }

src/ui/options.css

@@ -68,6 +68,10 @@ <h3 class="flextabs__tab"><button class="flextabs__toggle">__MSG_SectionGeneral_
 
 <h3 class="flextabs__tab"><button class="flextabs__toggle enforcement_required">__MSG_SectionSitePermissions__</button></h3>
 <div class="flextabs__content">
+  <label for="select-container">Choose a container:</label>
+  <select name="select-container" id="select-container">
+  <option value="default">Default</option>
+  </select>
   <section class="sect-sites">
   <form id="form-newsite" class="browser-style" >
   <label id="newsite-label" for="newsite" accesskey="__MSG_WebAddress_accesskey__">__MSG_WebAddress__</label><input name="newsite" id="newsite" type="text" placeholder="[https://]noscript.net"
@@ -147,6 +151,11 @@ <h3 class="flextabs__tab"><button class="flextabs__toggle">__MSG_SectionAdvanced
   <div id="policy-error"></div>
   <textarea id="policy" class="browser-style">
   </textarea>
+  <label for="contextStore">ContextStore:</label>
+  <div id="context-store-error"></div>
+  <textarea id="context-store" class="browser-style">
+  </textarea>
+  </div>
   </div>
   </section>
 </div>