Add documentation for Mixed Content Level 2 and GPC prefs

Addressing the changes from https://bugzilla.mozilla.org/show_bug.cgi?id=1882559

diff --git a/docs/index.md b/docs/index.md
index 4c1ddca9720eb33d5517dff2b003f3ad0a11965e..277ee14f36c00f89a91604c7bc7d8738f96e24ee 100644 (file)
--- a/docs/index.md
+++ b/docs/index.md
@@ -4719,6 +4719,7 @@ pdfjs. (Firefox 84, Firefox ESR 78.6)
 places.
 pref.
 print.
 places.
 pref.
 print.

+privacy.globalprivacycontrol.enabled (Firefox 127, Firefox ESR 128.0)

 privacy.userContext.enabled (Firefox 126, Firefox ESR 115.11)
 privacy.userContext.ui.enabled (Firefox 126, Firefox ESR 115.11)
 signon. (Firefox 83, Firefox ESR 78.5)
 privacy.userContext.enabled (Firefox 126, Firefox ESR 115.11)
 privacy.userContext.ui.enabled (Firefox 126, Firefox ESR 115.11)
 signon. (Firefox 83, Firefox ESR 78.5)


@@ -4744,7 +4745,11 @@ as well as the following security preferences:
 | security.insecure_connection_text.pbmode.enabled | bool | false
 |     If set to true, adds the words "Not Secure" for insecure sites in private browsing.
 | security.mixed_content.block_active_content | boolean | true
 | security.insecure_connection_text.pbmode.enabled | bool | false
 |     If set to true, adds the words "Not Secure" for insecure sites in private browsing.
 | security.mixed_content.block_active_content | boolean | true

-|     If false, mixed active content (HTTP and HTTPS) is not blocked.
+|     If set to true, mixed active content (HTTP subresources such as scripts, fetch requests, etc. on a HTTPS page) will be blocked.
+| security.mixed_content.block_display_content | boolean | false
+|     If set to true, mixed passive/display content (HTTP subresources such as images, videos, etc. on a HTTPS page) will be blocked. (Firefox 127, Firefox ESR 128.0)
+| security.mixed_content.upgrade_display_content | boolean | true
+|     If set to true, mixed passive/display content (HTTP subresources such as images, videos, etc. on a HTTPS page) will be upgraded to HTTPS. (Firefox 127, Firefox ESR 128.0)

 | security.osclientcerts.autoload | boolean | false
 |     If true, client certificates are loaded from the operating system certificate store.
 | security.OCSP.enabled | integer | 1
 | security.osclientcerts.autoload | boolean | false
 |     If true, client certificates are loaded from the operating system certificate store.
 | security.OCSP.enabled | integer | 1

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 5afd2c3a0d433c50930d366c46284bcb8df92023..d242e84b7cffb5abc496a480506ca923e5d9eaa1 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -3359,6 +3359,26 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

+    <policy name="security_mixed_content_block_display_content" class="Both" displayName="$(string.security_mixed_content_block_display_content)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.mixed_content.block_display_content">
+      <parentCategory ref="Preferences"/>
+      <supportedOn ref="SUPPORTED_FF127"/>
+      <enabledValue>
+        <decimal value="0"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="1"/>
+      </disabledValue>
+    </policy>
+    <policy name="security_mixed_content_upgrade_display_content" class="Both" displayName="$(string.security_mixed_content_upgrade_display_content)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.mixed_content.upgrade_display_content">
+      <parentCategory ref="Preferences"/>
+      <supportedOn ref="SUPPORTED_FF127"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

     <policy name="security_ssl_errorReporting_enabled" class="Both" displayName="$(string.security_ssl_errorReporting_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.ssl.errorReporting.enabled">
       <parentCategory ref="Preferences"/>
       <supportedOn ref="SUPPORTED_FF68"/>
     <policy name="security_ssl_errorReporting_enabled" class="Both" displayName="$(string.security_ssl_errorReporting_enabled)" explainText="$(string.Preferences_Boolean_Explain)" key="Software\Policies\Mozilla\Firefox\Preferences" valueName="security.ssl.errorReporting.enabled">
       <parentCategory ref="Preferences"/>
       <supportedOn ref="SUPPORTED_FF68"/>