New PrimaryPassword policy

diff --git a/README.md b/README.md
index 34bd487ee2c59b7bf64a9b30f49cc4f5ce1de6b4..16e528096e77a1bac289246febacb2fb4a9180e1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -62,6 +62,7 @@ Policies can be specified using the [Group Policy templates on Windows](https://
 | **[`InstallAddonsPermission`](#installaddonspermission)** | Configure the default extension install policy as well as origins for extension installs are allowed.
 | **[`LegacyProfiles`](#legacyprofiles)** | Disable the feature enforcing a separate profile for each installation.
 | **[`LocalFileLinks`](#localfilelinks)** | Enable linking to local files by origin.
 | **[`InstallAddonsPermission`](#installaddonspermission)** | Configure the default extension install policy as well as origins for extension installs are allowed.
 | **[`LegacyProfiles`](#legacyprofiles)** | Disable the feature enforcing a separate profile for each installation.
 | **[`LocalFileLinks`](#localfilelinks)** | Enable linking to local files by origin.

+| **[`PrimaryPassword`](#primarypassword)** | Require or prevent using a primary (formerly master) password.

 | **[`NetworkPrediction`](#networkprediction)** | Enable or disable network prediction (DNS prefetching).
 | **[`NewTabPage`](#newtabpage)** | Enable or disable the New Tab page.
 | **[`NoDefaultBookmarks`](#nodefaultbookmarks)** | Disable the creation of default bookmarks.
 | **[`NetworkPrediction`](#networkprediction)** | Enable or disable network prediction (DNS prefetching).
 | **[`NewTabPage`](#newtabpage)** | Enable or disable the New Tab page.
 | **[`NoDefaultBookmarks`](#nodefaultbookmarks)** | Disable the creation of default bookmarks.


@@ -2936,6 +2937,43 @@ Value (string):
   }
 }
 ```
   }
 }
 ```

+### PrimaryPassword
+Require or prevent using a primary (formerly master) password.
+
+If this value is true, a primary password is required. If this value is false, it works the same as `DisableMasterPasswordCreation` and removes the primary password functionality.
+
+**Compatibility:** Firefox 79, Firefox ESR 78.1\
+**CCK2 Equivalent:** `noMasterPassword`\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\PrimaryPassword = 0x1 | 0x0
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PrimaryPassword
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+#### macOS
+```
+<dict>
+  <key>PrimaryPassword</key>
+  <true/> | <false/>
+</dict>
+```
+#### policies.json
+```
+{
+  "policies": {
+    "PrimaryPassword": true | false
+  }
+}
+```

 ### NetworkPrediction
 Enable or disable network prediction (DNS prefetching).
 
 ### NetworkPrediction
 Enable or disable network prediction (DNS prefetching).
 

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index 5241e7b049f7fdbfbfdeb56c36ec3a3445301df3..5ab46d2dc55a76082471e94b744fb8c4f2c5ca38 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -374,6 +374,8 @@
                <string>http://example.org</string>
                <string>http://example.edu</string>
        </array>
                <string>http://example.org</string>
                <string>http://example.edu</string>
        </array>

+       <key>PrimaryPassword</key>
+       <true/>

        <key>NetworkPrediction</key>
        <false/>
        <key>NewTabPage</key>
        <key>NetworkPrediction</key>
        <false/>
        <key>NewTabPage</key>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 3e0737231fc0989330fed88d3c5d8c10a905fe16..da3c8706717e71e3556502b2fba28af878b547f1 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -771,8 +771,8 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werde
       <string id="PictureInPicture_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Bild-in-Bild Funktion deaktiviert.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, ist die Bild-in-Bild Funktion verfügbar.</string>
       <string id="PictureInPicture_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Bild-in-Bild Funktion deaktiviert.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, ist die Bild-in-Bild Funktion verfügbar.</string>

-      <string id="MasterPassword">Masterpasswort</string>
-      <string id="MasterPassword_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist das Setzen eines Masterpasswortes erforderlich.
+      <string id="PrimaryPassword">Masterpasswort</string>
+      <string id="PrimaryPassword_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist das Setzen eines Masterpasswortes erforderlich.

 
 Wenn diese Richtlinieneinstellung deaktiviert ist, ist das Setzen eines Masterpasswortes nicht möglich.
 
 
 Wenn diese Richtlinieneinstellung deaktiviert ist, ist das Setzen eines Masterpasswortes nicht möglich.
 

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index b669edbee71c78ad73c69c0512c09c6462d2b8d3..cbe754d584086a8789086a9579643d36cb6afd36 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -773,12 +773,12 @@ If this policy is not disabled or not configured, document permissions are ignor
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>

-      <string id="MasterPassword">Master Password</string>
-      <string id="MasterPassword_Explain">If this policy is enabled, a master password is required.
+      <string id="PrimaryPassword">Primary (Master) Password</string>
+      <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.

 
 

-If this policy is disabled, users cannot create a master password.
+If this policy is disabled, users cannot create a primary password.

 
 

-If this policy is not configured, users can choose to create a master password.</string>
+If this policy is not configured, users can choose to create a primary password.</string>

       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index d85435e99e254694f8e8c6702514dc94535996e3..81d29c2b557122d4995712c4aae930dbacecb2c2 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -773,12 +773,12 @@ Si esta política no está deshabilitada o no está configurada, se ignorarán l
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>

-      <string id="MasterPassword">Master Password</string>
-      <string id="MasterPassword_Explain">If this policy is enabled, a master password is required.
+      <string id="PrimaryPassword">Primary (Master) Password</string>
+      <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.

 
 

-If this policy is disabled, users cannot create a master password.
+If this policy is disabled, users cannot create a primary password.

 
 

-If this policy is not configured, users can choose to create a master password.</string>
+If this policy is not configured, users can choose to create a primary password.</string>

       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 64659b9dc03eee46a811fe2ee8e6bcca860371af..f9b6403af683cbf8b2f99aaed8750a746cbe27a7 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -3627,16 +3627,16 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
         <decimal value="0"/>
       </disabledValue>
     </policy>

-<!--    <policy name="MasterPassword" class="Both" displayName="$(string.MasterPassword)" explainText="$(string.MasterPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="MasterPassword">
+    <policy name="PrimaryPassword" class="Both" displayName="$(string.PrimaryPassword)" explainText="$(string.PrimaryPassword_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="PrimaryPassword">

       <parentCategory ref="firefox"/>
       <parentCategory ref="firefox"/>

-      <supportedOn ref="SUPPORTED_FF78"/>
+      <supportedOn ref="SUPPORTED_FF79"/>

       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       <disabledValue>
         <decimal value="0"/>
       </disabledValue>

-    </policy> -->
+    </policy>

     <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>
     <policy name="Handlers" class="Both" displayName="$(string.Handlers)"  key="Software\Policies\Mozilla\Firefox" explainText="$(string.Handlers_Explain)"  presentation="$(presentation.Handlers)">">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF78"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 0f11d83fe5b5d9f52b0daa8d44bb737db13112e4..da95bbece0a920a7f9fad9e15dae477a4d2aa683 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -772,12 +772,12 @@ If this policy is not disabled or not configured, document permissions are ignor
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.\r
 \r
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>\r
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.\r
 \r
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>\r

-      <string id="MasterPassword">Master Password</string>\r
-      <string id="MasterPassword_Explain">If this policy is enabled, a master password is required.\r
+      <string id="PrimaryPassword">Primary (Master) Password</string>\r
+      <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.\r

 \r
 \r

-If this policy is disabled, users cannot create a master password.\r
+If this policy is disabled, users cannot create a primary password.\r

 \r
 \r

-If this policy is not configured, users can choose to create a master password.</string>\r
+If this policy is not configured, users can choose to create a primary password.</string>\r

       <string id="Handlers">Handlers</string>\r
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.\r
 \r
       <string id="Handlers">Handlers</string>\r
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.\r
 \r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index c69a2b72dea2758260eee5244c12d7e731d39069..c5818ed29611c50751bf164220a76e1e2cbe8621 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -773,8 +773,8 @@ Se questo criterio è disabilitato o non configurato, i permessi del documento s
       <string id="PictureInPicture_Explain">Se questo criterio è disabilitato, l'interruttore Picture-in-Picture non appare nei video.
 
 Se questo criterio è abilitato o non configurato, l'interruttore Picture-in-Picture è disponibile per i video.</string>
       <string id="PictureInPicture_Explain">Se questo criterio è disabilitato, l'interruttore Picture-in-Picture non appare nei video.
 
 Se questo criterio è abilitato o non configurato, l'interruttore Picture-in-Picture è disponibile per i video.</string>

-      <string id="MasterPassword">Password principale</string>
-      <string id="MasterPassword_Explain">Se questo criterio è abilitato, è richiesto impostare una password principale.
+      <string id="PrimaryPassword">Password principale</string>
+      <string id="PrimaryPassword_Explain">Se questo criterio è abilitato, è richiesto impostare una password principale.

 
 Se questo criterio è disabilitato, gli utenti non possono creare una password principale.
 
 
 Se questo criterio è disabilitato, gli utenti non possono creare una password principale.
 

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 9c2114cad89a1057481732c61a60c0af83b6d6fc..3a3d5b49293174180fda569de5cfd72592655333 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -771,12 +771,12 @@ If this policy is not configured, the corresponding cipher is enabled or disable
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>
       <string id="PictureInPicture_Explain">If this policy is disabled, the Picture-in-Picture toggle does not appear on videos.
 
 If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos.</string>

-      <string id="MasterPassword">Master Password</string>
-      <string id="MasterPassword_Explain">If this policy is enabled, a master password is required.
+      <string id="PrimaryPassword">Primary (Master) Password</string>
+      <string id="PrimaryPassword_Explain">If this policy is enabled, a primary password is required.

 
 

-If this policy is disabled, users cannot create a master password.
+If this policy is disabled, users cannot create a primary password.

 
 

-If this policy is not configured, users can choose to create a master password.</string>
+If this policy is not configured, users can choose to create a primary password.</string>

       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.
 
       <string id="Handlers">Handlers</string>
       <string id="Handlers_Explain">If this policy is enabled, you can use JSON to configure default application handlers.