From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Mon, 9 Sep 2024 14:30:22 +0000 (-0400)
Subject: Merge pull request #1151 from mozilla/PrivateBrowsingModeAvailability
X-Git-Tag: v6.2~3
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/91807ba4e1b57b97e2f59321ae3d3939b93d296a?hp=370bc329d95589e714aece747d048754e545ff9b
Merge pull request #1151 from mozilla/PrivateBrowsingModeAvailability
Add PrivateBrowsingModeAvailability policy
---
diff --git a/docs/index.md b/docs/index.md
index d7ea44d..7f03887 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -107,6 +107,7 @@ Note: The `policies.json` must use the UTF-8 encoding.
| **[`Preferences`](#preferences)** | Set and lock preferences.
| **[`PrimaryPassword`](#primarypassword)** | Require or prevent using a primary (formerly master) password.
| **[`PrintingEnabled`](#printingenabled)** | Enable or disable printing.
+| **[`PrivateBrowsingModeAvailability`](#privatebrowsingmodeavailability)** | Set availability of private browsing mode.
| **[`PromptForDownloadLocation`](#promptfordownloadlocation)** | Ask where to save each file before downloading.
| **[`Proxy`](#proxy)** | Configure proxy settings.
| **[`RequestedLocales`](#requestedlocales)** | Set the the list of requested locales for the application in order of preference.
@@ -2154,6 +2155,8 @@ Value (string):
### DisablePrivateBrowsing
Remove access to private browsing.
+This policy is superseded by [`PrivateBrowsingModeAvailability`](#privatebrowsingmodeavailability)
+
**Compatibility:** Firefox 60, Firefox ESR 60\
**CCK2 Equivalent:** `disablePrivateBrowsing`\
**Preferences Affected:** N/A
@@ -5506,6 +5509,48 @@ Value (string):
}
}
```
+### PrivateBrowsingModeAvailability
+Set availability of private browsing mode.
+
+Possible values are `0` (Private Browsing mode is available), `1` (Private Browsing mode not available), and `2`(Private Browsing mode is forced).
+
+This policy supersedes [`DisablePrivateBrowsing`](#disableprivatebrowsing)
+
+Note: This policy missed Firefox ESR 128.2, but it will be in Firefox ESR 128.3.
+
+**Compatibility:** Firefox 130, Firefox ESR 128.3\
+**CCK2 Equivalent:** N/A\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\PrivateBrowsingModeAvailability = 0x0 | 0x1 | 0x2
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PrivateBrowsingModeAvailability
+```
+Value (string):
+```
+
+
+```
+#### macOS
+```
+
+ PrivateBrowsingModeAvailability
+ 0 | 1 | 2
+
+```
+#### policies.json
+```
+{
+ "policies": {
+ "PrivateBrowsingModeAvailability": 0 | 1 | 2
+ }
+}
+```
### PromptForDownloadLocation
Ask where to save each file before downloading.
diff --git a/linux/policies.json b/linux/policies.json
index 003731c..7a2957b 100644
--- a/linux/policies.json
+++ b/linux/policies.json
@@ -225,7 +225,7 @@
"NoDefaultBookmarks": true | false,
"OfferToSaveLogins": true | false,
"OfferToSaveLoginsDefault": true | false,
- "OverrideFirstRunPage": "http://example.org".
+ "OverrideFirstRunPage": "http://example.org",
"OverridePostUpdatePage": "http://example.org",
"PasswordManagerEnabled": true | false,
"PasswordManagerExceptions": ["https://example.org", "https://example.edu"],
@@ -292,6 +292,7 @@
},
"PrimaryPassword": true | false,
"PrintingEnabled": true | false,
+ "PrivateBrowsingModeAvailability": 0 | 1 | 2,
"PromptForDownloadLocation": true | false,
"Proxy": {
"Mode": "none" | "system" | "manual" | "autoDetect" | "autoConfig",
diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index f6348d3..d15519f 100644
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -595,6 +595,8 @@
PrintingEnabled
+ PrivateBrowsingModeAvailability
+ 1
Proxy
Mode
diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index e06a192..599de0b 100644
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -1123,6 +1123,13 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, ist d
Wenn diese Richtlinieneinstellung aktiviert ist, können Sie eine Liste von Verbindungen angeben, die nicht auf HTTPS hochgestuft werden sollen.
Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden alle Verbindungen auf HTTPS hochgestuft, wenn der Nur-HTTPS Modus aktiviert ist.
+ Private Browsing Mode Availability
+ If this policy is enabled, you can set the availability of Private Browsing Mode.
+
+If this policy is disabled or not configured, Private Browsing Mode is available.
+ Allow Private Browsing Mode
+ Disable Private Browsing Mode
+ Force Private Browsing Mode
Wenn diese Richtlinieneinstellung aktiviert ist, ist die Einstellung auf true gesperrt. Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Einstellung auf false gesperrt.
Für eine Beschreibung der Einstellung, siehe:
@@ -1489,6 +1496,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
+
+
+
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 18518ed..2661bea 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1118,6 +1118,13 @@ If this policy is disabled or not configured, HTTPS-Only Mode is not enabled.If this policy is enabled, you can specify a list origins that will not be upgraded to HTTPS.
If this policy is disabled or not configured, all origins are upgraded to HTTPS if HTTPS-Only Mode is enabled.
+ Private Browsing Mode Availability
+ If this policy is enabled, you can set the availability of Private Browsing Mode.
+
+If this policy is disabled or not configured, Private Browsing Mode is available.
+ Allow Private Browsing Mode
+ Disable Private Browsing Mode
+ Force Private Browsing Mode
If this policy is enabled, the preference is locked to true. If this policy is disabled, the preference is locked to false.
For a description of the preference, see:
@@ -1487,6 +1494,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.
+
+
+
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 21662d5..523f924 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -4270,5 +4270,28 @@
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+
+
+