Verified Commit 775f63a0 authored by Matthew Finkel's avatar Matthew Finkel Committed by Pier Angelo Vendrame
Browse files

Bug 41598: Prevent NoScript from being removed/disabled.

Bug 40253: Explicitly allow NoScript in Private Browsing mode.
parent 35b61f3e
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -3484,6 +3484,15 @@ export class Extension extends ExtensionData {
      this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
    }

    // Bug 40253: Explicitly allow NoScript in Private Browsing mode.
    if (this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}") {
      lazy.ExtensionPermissions.add(this.id, {
        permissions: [PRIVATE_ALLOWED_PERMISSION],
        origins: [],
      });
      this.permissions.add(PRIVATE_ALLOWED_PERMISSION);
    }

    // We only want to update the SVG_CONTEXT_PROPERTIES_PERMISSION during
    // install and upgrade/downgrade startups.
    if (INSTALL_AND_UPDATE_STARTUP_REASONS.has(this.startupReason)) {
+9 −0
Original line number Diff line number Diff line
@@ -935,6 +935,15 @@ class AddonInternal {
      }
    }

    // Bug 41598: prevent NoScript from being uninstalled/disabled
    if (this.id === "{73a6fe31-595d-460b-a920-fcc0f8843232}") {
      permissions &= ~(
        lazy.AddonManager.PERM_CAN_UNINSTALL |
        lazy.AddonManager.PERM_CAN_DISABLE |
        lazy.AddonManager.PERM_CAN_CHANGE_PRIVATEBROWSING_ACCESS
      );
    }

    return permissions;
  }