Verified Commit 7a00e81e authored by ma1's avatar ma1
Browse files

fixup! BB 41598: Prevent NoScript from being removed/disabled. 

TB 45157: Grant "access local file" permission to NoScript.
parent da45097b

toolkit/components/extensions/Extension.sys.mjs

+3 −1
Original line number Original line Diff line number Diff line
@@ -4366,12 +4366,14 @@ export class Extension extends ExtensionData { 
    }

    }





    // tor-browser#40253: Explicitly allow NoScript in Private Browsing mode.

    // tor-browser#40253: Explicitly allow NoScript in Private Browsing mode.

    // tor-browser#45157: Grant "access local files" permission to NoScript.

    if (this.isNoScript) {

    if (this.isNoScript) {

      lazy.ExtensionPermissions.add(this.id, {

      lazy.ExtensionPermissions.add(this.id, {

        permissions: [PRIVATE_ALLOWED_PERMISSION],

        permissions: [PRIVATE_ALLOWED_PERMISSION, "internal:fileSchemeAllowed"],

        origins: [],

        origins: [],

      });

      });

      this.permissions.add(PRIVATE_ALLOWED_PERMISSION);

      this.permissions.add(PRIVATE_ALLOWED_PERMISSION);

      this.permissions.add("internal:fileSchemeAllowed");

    }

    }





    // We only want to update the SVG_CONTEXT_PROPERTIES_PERMISSION during

    // We only want to update the SVG_CONTEXT_PROPERTIES_PERMISSION during

toolkit/mozapps/extensions/content/components/addon-permissions-list.mjs

+9 −1
Original line number Original line Diff line number Diff line
@@ -87,7 +87,15 @@ class AddonPermissionsList extends AboutAddonsHTMLElement { 
      },

      },

      {

      {

        buildOptionalOrigins: true,

        buildOptionalOrigins: true,

        includeFileSchemeAccess: lazy.fileSchemeAccessRequiresOptIn,

        // tor-browser#45157: prevent "access local files" from being accidentally

        // toggled off in NoScript, causing Safer and Safest security levels to

        // fail on file:// URLs.

        includeFileSchemeAccess:

          lazy.fileSchemeAccessRequiresOptIn &&

          !(

            fileSchemeAllowed &&

            this.addon.id == "{73a6fe31-595d-460b-a920-fcc0f8843232}"

          ),

      }

      }

    );

    );

    let optionalEntries = [

    let optionalEntries = [