Bug 1888477 - Make PopupBlocking Locked policy lock all UI paths r=jmendez,desktop-theme-reviewers,emilio

Differential Revision: https://phabricator.services.mozilla.com/D298861

Author: mkaply

browser/base/content/browser-sitePermissionPanel.js

@@ -748,6 +748,13 @@ var gPermissionPanel = {
       menulist.setAttribute("sizetopopup", "none");
       menulist.setAttribute("id", "permission-popup-menulist");
 
+      if (
+        idNoSuffix == "popup" &&
+        Services.prefs.prefIsLocked("dom.disable_open_during_load")
+      ) {
+        menulist.setAttribute("disabled", "true");
+      }
+
       for (let state of SitePermissions.getAvailableStates(idNoSuffix)) {
         let menuitem = document.createXULElement("menuitem");
         // We need to correctly display the default/unknown state, which has its

browser/components/enterprisepolicies/tests/browser/browser.toml

@@ -61,6 +61,10 @@ https_first_disabled = true
 ["browser_policy_disable_password_reveal.js"]
 
 ["browser_policy_disable_popup_blocker.js"]
+support-files = [
+  "!/browser/base/content/test/popups/popup_blocker2.html",
+  "!/browser/base/content/test/popups/popup_blocker_a.html",
+]
 
 ["browser_policy_disable_privatebrowsing.js"]
 

browser/components/enterprisepolicies/tests/browser/browser_policy_disable_popup_blocker.js

@@ -162,3 +162,85 @@ add_task(async function test_disabled_locked() {
 
   restore_prefs();
 });
+
+add_task(async function test_locked_blocks_inpage_allow_paths() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["dom.disable_open_click_delay", 0]],
+  });
+  await setupPolicyEngineWithJson({
+    policies: {
+      PopupBlocking: {
+        Default: true,
+        Locked: true,
+      },
+    },
+  });
+
+  const POPUP_PAGE =
+    "https://example.com/browser/browser/base/content/test/popups/popup_blocker2.html";
+
+  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, POPUP_PAGE);
+
+  await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
+    content.document.getElementById("pop").click();
+  });
+
+  await TestUtils.waitForCondition(() =>
+    gBrowser.getNotificationBox().getNotificationWithValue("popup-blocked")
+  );
+
+  // Open the notification's "Options" menu and confirm the "Allow pop-ups
+  // for <host>" item stays hidden when the policy is locked.
+  let blockedPopupOptions = document.getElementById("blockedPopupOptions");
+  let popupShown = BrowserTestUtils.waitForEvent(
+    window,
+    "popupshown",
+    true,
+    event => event.target == blockedPopupOptions
+  );
+  let notification = gBrowser
+    .getNotificationBox()
+    .getNotificationWithValue("popup-blocked");
+  notification._buttons[0].click();
+  await popupShown;
+
+  let allowSite = document.getElementById("blockedPopupAllowSite");
+  ok(
+    allowSite.hidden,
+    "blockedPopupAllowSite stays hidden when PopupBlocking is locked"
+  );
+
+  let popupHidden = BrowserTestUtils.waitForEvent(
+    blockedPopupOptions,
+    "popuphidden"
+  );
+  blockedPopupOptions.hidePopup();
+  await popupHidden;
+
+  // Open the URL-bar permission panel and confirm the popup row is
+  // rendered as a locked policy permission (no editable menulist).
+  let permissionShown = BrowserTestUtils.waitForEvent(
+    window,
+    "popupshown",
+    true,
+    event => event.target == gPermissionPanel._permissionPopup
+  );
+  gPermissionPanel._identityPermissionBox.click();
+  await permissionShown;
+
+  let menulist = document.getElementById("permission-popup-menulist");
+  ok(
+    menulist && menulist.getAttribute("disabled") == "true",
+    "Popup permission menulist is disabled when policy is locked"
+  );
+
+  let permissionHidden = BrowserTestUtils.waitForEvent(
+    gPermissionPanel._permissionPopup,
+    "popuphidden"
+  );
+  gPermissionPanel._permissionPopup.hidePopup();
+  await permissionHidden;
+
+  BrowserTestUtils.removeTab(tab);
+  restore_prefs();
+});

browser/modules/PopupAndRedirectBlockerObserver.sys.mjs

@@ -166,12 +166,16 @@ export var PopupAndRedirectBlockerObserver = {
     const blockedPopupAllowSite = document.getElementById(
       "blockedPopupAllowSite"
     );
-    blockedPopupAllowSite.removeAttribute("hidden");
-    document.l10n.setAttributes(
-      blockedPopupAllowSite,
-      "popups-infobar-allow2",
-      { uriHost }
-    );
+    if (Services.prefs.prefIsLocked("dom.disable_open_during_load")) {
+      blockedPopupAllowSite.setAttribute("hidden", "true");
+    } else {
+      blockedPopupAllowSite.removeAttribute("hidden");
+      document.l10n.setAttributes(
+        blockedPopupAllowSite,
+        "popups-infobar-allow2",
+        { uriHost }
+      );
+    }
 
     // "Dont show this message when..."
     const blockedPopupDontShowMessage = document.getElementById(
@@ -368,6 +372,10 @@ export var PopupAndRedirectBlockerObserver = {
     const window = aEvent.originalTarget.documentGlobal;
     const { gBrowser } = window;
 
+    if (Services.prefs.prefIsLocked("dom.disable_open_during_load")) {
+      return;
+    }
+
     // The toggle should only be visible (and therefore clickable) if
     // popups are currently blocked.
     Services.perms.addFromPrincipal(

browser/themes/shared/controlcenter/panel.css

@@ -708,6 +708,11 @@
   > menupopup {
     min-width: 6.5em;
   }
+
+  &[disabled] {
+    opacity: 0.5;
+    pointer-events: none;
+  }
 }
 
 .protections-popup-section-header,