From d97b2f6d182f02cc1b0c593e17eb06d7062fbe34 Mon Sep 17 00:00:00 2001
From: hackademix <giorgio@maone.net>
Date: Sun, 4 Apr 2021 19:06:10 +0200
Subject: [PATCH] Rename the "csspp0" capability to "unchecked_css".

---
 src/_locales/en/messages.json |  3 +++
 src/bg/LifeCycle.js           | 49 +++++++++++++++++++++++------------
 src/content/content.js        |  2 +-
 src/nscl                      |  2 +-
 src/ui/ui.js                  |  2 +-
 5 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index 181a42f..36fa7a1 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -551,6 +551,9 @@
   "cap_noscript": {
     "message": "noscript"
   },
+  "cap_unchecked_css": {
+    "message": "unchecked CSS"
+  },
   "cap_other": {
     "message": "other"
   },
diff --git a/src/bg/LifeCycle.js b/src/bg/LifeCycle.js
index 64df97d..bafd8c3 100644
--- a/src/bg/LifeCycle.js
+++ b/src/bg/LifeCycle.js
@@ -240,23 +240,37 @@ var LifeCycle = (() => {
 
       // put here any version specific upgrade adjustment in stored data
 
-      let configureNewCap = async(cap, presets, presetFilter) => {
-        log(`Upgrading from ${previousVersion}: configure the "${cap}" capability.`);
+      let forEachPreset = async (callback, presetNames = "*") => {
         await ns.initializing;
-        let policy = ns.policy;
-        let customIdx = presets.indexOf("CUSTOM");
-        presets = presets.map(p => policy[p])
-        if (customIdx !== -1) {
-          let { TRUSTED, UNTRUSTED } = policy;
-          // insert custom presets, if any
-          presets.splice(customIdx, 1, ...[...policy.sites.values()].filter(p => p !== TRUSTED && p !== UNTRUSTED));
+        let changed = false;
+        for (let p of ns.policy.getPresets(presetNames)) {
+          if (callback(p)) changed = true;
         }
-        if (presetFilter) presets = presets.filter(presetFilter);
-        for (let p of presets) {
-          p.capabilities.add(cap);
+        if (changed) {
+          await ns.savePolicy();
         }
-        await ns.savePolicy();
-      }
+      };
+
+      let configureNewCap = async (cap, presetNames, capsFilter) => {
+        log(`Upgrading from ${previousVersion}: configure the "${cap}" capability.`);
+        await forEachPreset(({capabilities}) => {
+          if (capsFilter(capabilities) && !capabilities.has(cap)) {
+            capabilities.add(cap);
+            return true;
+          }
+        }, presetNames);
+      };
+
+      let renameCap = async (oldName, newName) => {
+        log(`Upgrading from ${previousVersion}: rename capability "${oldName}" to "${newName}`);
+        await forEachPreset(({capabilities}) => {
+          if (capabilities.has(oldName)) {
+            capabilities.delete(oldName);
+            capabilities.add(newName);
+            return true;
+          }
+        });
+      };
 
       if (Ver.is(previousVersion, "<=", "11.0.10")) {
         await configureNewCap("ping", ["TRUSTED"]);
@@ -265,8 +279,11 @@ var LifeCycle = (() => {
         await configureNewCap("noscript", ["DEFAULT", "TRUSTED", "CUSTOM"])
       }
       if (Ver.is(previousVersion, "<=", "11.2.4")) {
-        // add the csspp0 capability to any preset which already has the script capability
-        await configureNewCap("csspp0", ["TRUSTED", "CUSTOM", "DEFAULT"], p => p.capabilities.has("script"));
+        // add the unchecked_css capability to any preset which already has the script capability
+        await configureNewCap("unchecked_css", ["DEFAULT", "TRUSTED", "CUSTOM"], caps => caps.has("script"));
+      }
+      if (Ver.is(previousVersion, "<=", "11.2.5rc1")) {
+        await renameCap("csspp0", "unchecked_css");
       }
     },
 
diff --git a/src/content/content.js b/src/content/content.js
index e5a1158..6b59672 100644
--- a/src/content/content.js
+++ b/src/content/content.js
@@ -163,7 +163,7 @@ ns.on("capabilities", () => {
       allowed: ns.canScript
     });
 
-  if (!(ns.policy.isTorBrowser || ns.allows("csspp0"))) {
+  if (!(ns.policy.isTorBrowser || ns.allows("unchecked_css"))) {
     // protection against CSS PP0, not needed on the Tor Browser because of its
     // noisy DNS resolution: https://orenlab.sise.bgu.ac.il/p/PP0
     let prefetchCallback =
diff --git a/src/nscl b/src/nscl
index 97c2a54..efa5fbe 160000
--- a/src/nscl
+++ b/src/nscl
@@ -1 +1 @@
-Subproject commit 97c2a54550a2d8c2eb06ddad6c11651eb0f06439
+Subproject commit efa5fbede1c54f0a9cd0b0ad54b10772a60dfb09
diff --git a/src/ui/ui.js b/src/ui/ui.js
index 6dbfd0d..cbbb06f 100644
--- a/src/ui/ui.js
+++ b/src/ui/ui.js
@@ -362,7 +362,7 @@ var UI = (() => {
           capInput.id = `capability-${capability}-${idSuffix}`
           capLabel.setAttribute("for", capInput.id);
           capInput.value = capability;
-          capInput.title = capLabel.textContent = _(`cap_${capability}`) || capability;
+          capInput.title = capLabel.textContent = _(`cap_${capability}`) || capability.replace(/_/g, ' ');
           let clone = capParent.appendChild(cap.cloneNode(true));
           clone.classList.add(capability);
         }