MasterPassword

diff --git a/README.md b/README.md
index 0bbe39305151e08aa73b1150a0f6b5ccbb528b46..875fa60bfd9e3c4cc30542c6f540e6e38662fdaf 100644 (file)
--- a/README.md
+++ b/README.md
@@ -61,6 +61,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.

+| **[`MasterPassword`](#masterpassword)** | Require or prevent using a 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.


@@ -2688,6 +2689,43 @@ Value (string):
   }
 }
 ```
   }
 }
 ```

+### MasterPassword
+Require or prevent using a master password.
+
+If this value is true, a master password is required. If this values is false, it works the same as `DisableMasterPasswordCreation` and removes the master password functionality.
+
+**Compatibility:** Firefox 78, Firefox ESR 78\
+**CCK2 Equivalent:** `noMasterPassword`\
+**Preferences Affected:** N/A
+
+#### Windows (GPO)
+```
+Software\Policies\Mozilla\Firefox\MasterPassword = 0x1 | 0x0
+```
+#### Windows (Intune)
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/MasterPassword
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+#### macOS
+```
+<dict>
+  <key>MasterPassword</key>
+  <true/> | <false/>
+</dict>
+```
+#### policies.json
+```
+{
+  "policies": {
+    "MasterPassword": 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 cef72bd060a55cac7d6cb5667032d481d4e9bac9..501cf4dfd5527181dda7f615dec7c267cd64c95b 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -319,6 +319,8 @@
                <string>http://example.org</string>
                <string>http://example.edu</string>
        </array>
                <string>http://example.org</string>
                <string>http://example.edu</string>
        </array>

+       <key>MasterPassword</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 a0ac3e463f2b4b53cd428d965cbdc4f1d2ad2e6b..62fe32bda5ca7a7e7aaf3c4b2436712974004a82 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -788,6 +788,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.
+
+If this policy is disabled, users cannot create a master password.
+
+If this policy is not configured, users can choose to create a master password.</string>

       <string id="Preferences_Boolean_Explain">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:
       <string id="Preferences_Boolean_Explain">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:

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 5c189633f01232addae49eee742e937bd2088976..28d031bdc6c988f3d006e6e143b0ca37f62646b6 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -790,6 +790,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.
+
+If this policy is disabled, users cannot create a master password.
+
+If this policy is not configured, users can choose to create a master password.</string>

       <string id="Preferences_Boolean_Explain">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:
       <string id="Preferences_Boolean_Explain">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:

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index 94552c5e87a5aeeb8f853263c10093395a30eeb7..dc21212aaaab871388ce2688438a1497cff09fd7 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -790,6 +790,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.
+
+If this policy is disabled, users cannot create a master password.
+
+If this policy is not configured, users can choose to create a master password.</string>

       <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
 
 Para una descripción de la preferencia, visita:
       <string id="Preferences_Boolean_Explain">Si esta política está habilitada, la preferencia se bloquea en true. Si esta política está deshabilitada, la preferencia está bloqueada en false.
 
 Para una descripción de la preferencia, visita:

diff --git a/windows/firefox.admx b/windows/firefox.admx
index 5af5baad586292f11b2b8b4737a19239b21472c3..161df0ce32fc21b4621df829c71fd1763b472943 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -3597,5 +3597,15 @@
         <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">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_FF78"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>

   </policies>
 </policyDefinitions>
   </policies>
 </policyDefinitions>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index 18b555f17475ab5e5a2c00f4888dc27e58ba0d9e..0baaeecff5cc7183c9c922680e44c9f0c9a1130e 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -789,6 +789,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
+\r
+If this policy is disabled, users cannot create a master password.\r
+\r
+If this policy is not configured, users can choose to create a master password.</string>\r

       <string id="Preferences_Boolean_Explain">Si cette stratégie est activée, la préférence est verrouillée sur true. Si cette stratégie est désactivée, la préférence est verrouillée sur false.\r
 \r
 Pour une description de la préférence, voir:\r
       <string id="Preferences_Boolean_Explain">Si cette stratégie est activée, la préférence est verrouillée sur true. Si cette stratégie est désactivée, la préférence est verrouillée sur false.\r
 \r
 Pour une description de la préférence, voir:\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index c71c82c0d6f87bb6a96a0964b6244d9a4f227261..f78d505aa960b3c55521de82017b27ec24c46a03 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -790,6 +790,12 @@ Se questo criterio è disabilitato o non configurato, i permessi del documento s
       <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.
+
+If this policy is disabled, users cannot create a master password.
+
+If this policy is not configured, users can choose to create a master password.</string>

       <string id="Preferences_Boolean_Explain">Se questo criterio è abilitato, la preferenza è impostata a Vero e resa non modificabile. Se questo criterio è disabilitato, la preferenza è impostata a Falso e resa non modificabile.
 
 Per una descrizione della preferenza, si veda:
       <string id="Preferences_Boolean_Explain">Se questo criterio è abilitato, la preferenza è impostata a Vero e resa non modificabile. Se questo criterio è disabilitato, la preferenza è impostata a Falso e resa non modificabile.
 
 Per una descrizione della preferenza, si veda:

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 10d46693ec9900cc012aa3f785ab54127543605c..bf4a4f12a6416b687b85a59f83487658de551c1f 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -788,6 +788,12 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
       <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.
+
+If this policy is disabled, users cannot create a master password.
+
+If this policy is not configured, users can choose to create a master password.</string>

       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：
       <string id="Preferences_Boolean_Explain">若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。
 
 若需要偏好設定的詳細說明，請參考：