From 117171fcc58bf5a9b4bbf487d3749c498e19b905 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 24 Jun 2020 16:18:32 -0500 Subject: [PATCH 01/16] Update DisabledCiphers policy --- README.md | 18 ++++++++++++++++- mac/org.mozilla.firefox.plist | 4 ++++ windows/de-DE/firefox.adml | 32 ++++++----------------------- windows/en-US/firefox.adml | 32 ++++++----------------------- windows/es-ES/firefox.adml | 32 ++++++----------------------- windows/firefox.admx | 38 ++++++++++++++++++++++++++--------- windows/fr-FR/firefox.adml | 32 ++++++----------------------- windows/it-IT/firefox.adml | 32 ++++++----------------------- windows/zh-TW/firefox.adml | 32 ++++++----------------------- 9 files changed, 86 insertions(+), 166 deletions(-) diff --git a/README.md b/README.md index 875fa60..0eed6c5 100644 --- a/README.md +++ b/README.md @@ -948,7 +948,13 @@ Value (string): ### DisabledCiphers Disable specific cryptographic ciphers. -**Compatibility:** Firefox 76, Firefox ESR 68.8\ +--- +**Note:** + +This policy was updated in Firefox 78 to allow enabling ciphers as well. Setting the value to true disables the cipher, setting the value to false enables the cipher. Previously setting the value to true or false disabled the cipher. + +--- +**Compatibility:** Firefox 76, Firefox ESR 68.8 (TLS_RSA_WITH_AES_128_GCM_SHA256 and TLS_RSA_WITH_AES_256_GCM_SHA384 were added in Firefox 78)\ **CCK2 Equivalent:** N/A\ **Preferences Affected:** N/A @@ -963,6 +969,8 @@ Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_ECDHE_ECDSA_WITH_AES_128_G Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_AES_128_CBC_SHA = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_AES_256_CBC_SHA = 0x1 | 0x0 Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_3DES_EDE_CBC_SHA = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_AES_128_GCM_SHA256 = 0x1 | 0x0 +Software\Policies\Mozilla\Firefox\DisabledCiphers\TLS_RSA_WITH_AES_256_GCM_SHA384 = 0x1 | 0x0 ``` #### Windows (Intune) OMA-URI: @@ -976,6 +984,8 @@ OMA-URI: ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~DisabledCiphers/DisabledCiphers_TLS_RSA_WITH_AES_128_CBC_SHA ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~DisabledCiphers/DisabledCiphers_TLS_RSA_WITH_AES_256_CBC_SHA ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~DisabledCiphers/DisabledCiphers_TLS_RSA_WITH_3DES_EDE_CBC_SHA +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~DisabledCiphers/DisabledCiphers_TLS_RSA_WITH_AES_128_GCM_SHA256 +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~DisabledCiphers/DisabledCiphers_TLS_RSA_WITH_AES_256_GCM_SHA384 ``` Value (string): ``` @@ -1004,6 +1014,10 @@ Value (string): | TLS_RSA_WITH_3DES_EDE_CBC_SHA | + TLS_RSA_WITH_AES_128_GCM_SHA256 + | + TLS_RSA_WITH_AES_256_GCM_SHA384 + | ``` @@ -1021,6 +1035,8 @@ Value (string): "TLS_RSA_WITH_AES_128_CBC_SHA": true | false, "TLS_RSA_WITH_AES_256_CBC_SHA": true | false, "TLS_RSA_WITH_3DES_EDE_CBC_SHA": true | false + "TLS_RSA_WITH_AES_128_GCM_SHA256": true | false + "TLS_RSA_WITH_AES_256_GCM_SHA384": true | false } } } diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 501cf4d..267a7c9 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -153,6 +153,10 @@ TLS_RSA_WITH_3DES_EDE_CBC_SHA + TLS_RSA_WITH_AES_128_GCM_SHA256 + + TLS_RSA_WITH_AES_256_GCM_SHA384 + DisableDeveloperTools diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 62fe32b..ed90291 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -733,41 +733,21 @@ Wenn diese Richtlinie aktiviert oder nicht konfiguriert ist, werden Firefox-Funk Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, werden Aktionen empfohlen, die darauf basieren, was der Benutzer in die Adressleiste eingibt. TLS_DHE_RSA_WITH_AES_128_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_DHE_RSA_WITH_AES_128_CBC_SHA Cipher deaktiviert. - -Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, ist der TLS_DHE_RSA_WITH_AES_128_CBC_SHA Cipher aktiviert. TLS_DHE_RSA_WITH_AES_256_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_DHE_RSA_WITH_AES_256_CBC_SHA Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA Cipher aktiviert. TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA Cipher aktiviert. TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA Cipher aktiviert. TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 Cipher aktiviert. TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 Cipher aktiviert. TLS_RSA_WITH_AES_128_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_RSA_WITH_AES_128_CBC_SHA Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA Cipher aktiviert. TLS_RSA_WITH_AES_256_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_RSA_WITH_AES_256_CBC_SHA Cipher deaktiviert. - -If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA Cipher aktiviert. TLS_RSA_WITH_3DES_EDE_CBC_SHA - Wenn diese Richtlinieneinstellung deaktiviert ist, ist der TLS_RSA_WITH_3DES_EDE_CBC_SHA Cipher deaktiviert. + TLS_RSA_WITH_AES_128_GCM_SHA256 + TLS_RSA_WITH_AES_256_GCM_SHA384 + If this policy is enabled, the corresponding cipher is disabled. + +If this policy is disabled, the corresponding cipher is enabled. -If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA Cipher aktiviert. +If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. DRM-Medien Erweiterungen Wenn diese Richtlinieneinstellung deaktiviert ist, werden DRM-Medien Erweiterungen (wie z.B. Widevine) nicht durch Mozilla Firefox heruntergeladen außer der Nutzer stimmt dem Download explizit zu. diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 28d031b..0e7c78c 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -735,41 +735,21 @@ If this policy is enabled or not configured, Firefox features wil be recommended If this policy is enabled or not configured, actions will be recommended based on what the user types in the URL bar. TLS_DHE_RSA_WITH_AES_128_CBC_SHA - If this policy is disabled, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled. - -If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled. TLS_DHE_RSA_WITH_AES_256_CBC_SHA - If this policy is disabled, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled. - -If this policy is enabled or not configured, the TLS_DHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled. TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is disabled. - -If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA cipher is enabled. TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is disabled. - -If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA cipher is enabled. TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - If this policy is disabled, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is disabled. - -If this policy is enabled or not configured, the TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 cipher is enabled. TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - If this policy is disabled, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is disabled. - -If this policy is enabled or not configured, the TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 cipher is enabled. TLS_RSA_WITH_AES_128_CBC_SHA - If this policy is disabled, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is disabled. - -If this policy is enabled or not configured, the TLS_RSA_WITH_AES_128_CBC_SHA cipher is enabled. TLS_RSA_WITH_AES_256_CBC_SHA - If this policy is disabled, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is disabled. - -If this policy is enabled or not configured, the TLS_RSA_WITH_AES_256_CBC_SHA cipher is enabled. TLS_RSA_WITH_3DES_EDE_CBC_SHA - If this policy is disabled, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is disabled. + TLS_RSA_WITH_AES_128_GCM_SHA256 + TLS_RSA_WITH_AES_256_GCM_SHA384 + If this policy is enabled, the corresponding cipher is disabled. + +If this policy is disabled, the corresponding cipher is enabled. -If this policy is enabled or not configured, the TLS_RSA_WITH_3DES_EDE_CBC_SHA cipher is enabled. +If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. Enable Encrypted Media Extensions If this policy is disabled, encrypted media extensions (like Widevine) are not downloaded by Firefox unless the user consents to installing them. diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index dc21212..3b7899e 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -735,41 +735,21 @@ Si esta política está habilitada o no está configurada, se recomendarán las Si esta política está habilitada o no está configurada, se recomendarán acciones en función de lo que el usuario escriba en la barra de URL. TLS_DHE_RSA_WITH_AES_128_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_DHE_RSA_WITH_AES_128_CBC_SHA está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_DHE_RSA_WITH_AES_128_CBC_SHA está habilitado. TLS_DHE_RSA_WITH_AES_256_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_DHE_RSA_WITH_AES_256_CBC_SHA está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_DHE_RSA_WITH_AES_256_CBC_SHA está habilitado. TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA está habilitado. TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA está habilitado. TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - Si esta política está deshabilitada, el cifrado TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 está habilitado. TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - Si esta política está deshabilitada, el cifrado TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 está habilitado. TLS_RSA_WITH_AES_128_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_RSA_WITH_AES_128_CBC_SHA está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_RSA_WITH_AES_128_CBC_SHA está habilitado. TLS_RSA_WITH_AES_256_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_RSA_WITH_AES_256_CBC_SHA está deshabilitado. - -Si esta política está habilitada o no está configurada, el cifrado TLS_RSA_WITH_AES_256_CBC_SHA está habilitado. TLS_RSA_WITH_3DES_EDE_CBC_SHA - Si esta política está deshabilitada, el cifrado TLS_RSA_WITH_3DES_EDE_CBC_SHA está deshabilitado. + TLS_RSA_WITH_AES_128_GCM_SHA256 + TLS_RSA_WITH_AES_256_GCM_SHA384 + If this policy is enabled, the corresponding cipher is disabled. + +If this policy is disabled, the corresponding cipher is enabled. -Si esta política está habilitada o no está configurada, el cifrado TLS_RSA_WITH_3DES_EDE_CBC_SHA está habilitado. +If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. Habilitar extensiones de medios cifrados Si esta política está deshabilitada, Firefox no descargará las extensiones de medios cifrados (como Widevine) a menos que el usuario consienta en instalarlas. diff --git a/windows/firefox.admx b/windows/firefox.admx index 161df0c..d4aea08 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -3457,7 +3457,7 @@ - + @@ -3467,7 +3467,7 @@ - + @@ -3477,7 +3477,7 @@ - + @@ -3487,7 +3487,7 @@ - + @@ -3497,7 +3497,7 @@ - + @@ -3507,7 +3507,7 @@ - + @@ -3517,7 +3517,7 @@ - + @@ -3527,7 +3527,7 @@ - + @@ -3537,7 +3537,7 @@ - + @@ -3547,6 +3547,26 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 0baaeec..2b220e8 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -734,41 +734,21 @@ Si cette politique est activée ou non configurée, les fonctionnalités de Fire Si cette stratégie est activée ou non configurée, des actions seront recommandées en fonction de ce que l'utilisateur tape dans la barre d'URL. TLS_DHE_RSA_WITH_AES_128_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_DHE_RSA_WITH_AES_128_CBC_SHA est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_DHE_RSA_WITH_AES_128_CBC_SHA est activé. TLS_DHE_RSA_WITH_AES_256_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_DHE_RSA_WITH_AES_256_CBC_SHA est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_DHE_RSA_WITH_AES_256_CBC_SHA est activé. TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA est activé. TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA est activé. TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - Si cette stratégie est désactivée, le chiffrement TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 est activé. TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - Si cette stratégie est désactivée, le chiffrement TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 est activé. TLS_RSA_WITH_AES_128_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_RSA_WITH_AES_128_CBC_SHA est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_RSA_WITH_AES_128_CBC_SHA est activé. TLS_RSA_WITH_AES_256_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_RSA_WITH_AES_256_CBC_SHA est désactivé. - -Si cette stratégie est activée ou non configurée, le chiffrement TLS_RSA_WITH_AES_256_CBC_SHA est activé. TLS_RSA_WITH_3DES_EDE_CBC_SHA - Si cette stratégie est désactivée, le chiffrement TLS_RSA_WITH_3DES_EDE_CBC_SHA est désactivé. + TLS_RSA_WITH_AES_128_GCM_SHA256 + TLS_RSA_WITH_AES_256_GCM_SHA384 + If this policy is enabled, the corresponding cipher is disabled. + +If this policy is disabled, the corresponding cipher is enabled. -Si cette stratégie est activée ou non configurée, le chiffrement TLS_RSA_WITH_3DES_EDE_CBC_SHA est activé. +If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. Enable Encrypted Media Extensions If this policy is disabled, encrypted media extensions (like Widevine) are not downloaded by Firefox unless the user consents to installing them. diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index f78d505..2793421 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -735,41 +735,21 @@ Se questo criterio è abilitato o non configurato, saranno consigliate funzional Se questo criterio è abilitato o non configurato, saranno consigliate azioni basate su quanto l'utente ha digitato nella barra degli indirizzi. TLS_DHE_RSA_WITH_AES_128_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_DHE_RSA_WITH_AES_128_CBC_SHA è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_DHE_RSA_WITH_AES_128_CBC_SHA è abilitato. TLS_DHE_RSA_WITH_AES_256_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_DHE_RSA_WITH_AES_256_CBC_SHA è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_DHE_RSA_WITH_AES_256_CBC_SHA è abilitato. TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA è abilitato. TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA è abilitato. TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - Se questo criterio è disabilitato, il cifrario TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 è abilitato. TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - Se questo criterio è disabilitato, il cifrario TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 è abilitato. TLS_RSA_WITH_AES_128_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_RSA_WITH_AES_128_CBC_SHA è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_RSA_WITH_AES_128_CBC_SHA è abilitato. TLS_RSA_WITH_AES_256_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_RSA_WITH_AES_256_CBC_SHA è disabilitato. - -Se questo criterio è abilitato o non configurato, il cifrario TLS_RSA_WITH_AES_256_CBC_SHA è abilitato. TLS_RSA_WITH_3DES_EDE_CBC_SHA - Se questo criterio è disabilitato, il cifrario TLS_RSA_WITH_3DES_EDE_CBC_SHA è disabilitato. + TLS_RSA_WITH_AES_128_GCM_SHA256 + TLS_RSA_WITH_AES_256_GCM_SHA384 + If this policy is enabled, the corresponding cipher is disabled. + +If this policy is disabled, the corresponding cipher is enabled. -Se questo criterio è abilitato o non configurato, il cifrario TLS_RSA_WITH_3DES_EDE_CBC_SHA è abilitato. +If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. Abilita Encrypted Media Extension Se questo criterio è disabilitato, le Encrypted Media Extension (come Widevine) non sono scaricate da Firefox a meno che l'utente non acconsenta ad installarle. diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index bf4a4f1..a0c8976 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -733,41 +733,21 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可 若啟用或不設定此原則，則會根據使用者在網址列輸入的內容推薦操作行為。 TLS_DHE_RSA_WITH_AES_128_CBC_SHA - 若停用此原則，將停用 TLS_DHE_RSA_WITH_AES_128_CBC_SHA 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_DHE_RSA_WITH_AES_128_CBC_SHA 加密演算法。 TLS_DHE_RSA_WITH_AES_256_CBC_SHA - 若停用此原則，將停用 TLS_DHE_RSA_WITH_AES_256_CBC_SHA 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_DHE_RSA_WITH_AES_256_CBC_SHA 加密演算法。 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA - 若停用此原則，將停用 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA 加密演算法。 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA - 若停用此原則，將停用 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA 加密演算法。 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 - 若停用此原則，將停用 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 加密演算法。 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 - 若停用此原則，將停用 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 加密演算法。 TLS_RSA_WITH_AES_128_CBC_SHA - 若停用此原則，將停用 TLS_RSA_WITH_AES_128_CBC_SHA 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_RSA_WITH_AES_128_CBC_SHA 加密演算法。 TLS_RSA_WITH_AES_256_CBC_SHA - 若停用此原則，將停用 TLS_RSA_WITH_AES_256_CBC_SHA 加密演算法。 - -若啟用或不設定此原則，則啟用 TLS_RSA_WITH_AES_256_CBC_SHA 加密演算法。 TLS_RSA_WITH_3DES_EDE_CBC_SHA - 若停用此原則，將停用 TLS_RSA_WITH_3DES_EDE_CBC_SHA 加密演算法。 + TLS_RSA_WITH_AES_128_GCM_SHA256 + TLS_RSA_WITH_AES_256_GCM_SHA384 + If this policy is enabled, the corresponding cipher is disabled. + +If this policy is disabled, the corresponding cipher is enabled. -若啟用或不設定此原則，則啟用 TLS_RSA_WITH_3DES_EDE_CBC_SHA 加密演算法。 +If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. 開啟加密媒體擴充功能 若停用此原則，需經使用者明確同意才會下載加密媒體擴充功能（例如 Widevine），Firefox 不會主動下載。 -- 2.43.0 From 2b03b48381ecca4864c3620f65a673c9f660de5e Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 25 Jun 2020 09:20:08 -0500 Subject: [PATCH 02/16] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0eed6c5..76bc17a 100644 --- a/README.md +++ b/README.md @@ -3917,6 +3917,7 @@ Value (string): ``` +``` #### macOS ``` -- 2.43.0 From 1108a3a6c828634f44d51fbc870f74fd64be205b Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 25 Jun 2020 13:52:29 -0500 Subject: [PATCH 03/16] Handlers policy --- README.md | 182 ++++++++++++++++++++++++++++++++++ mac/org.mozilla.firefox.plist | 51 ++++++++++ windows/de-DE/firefox.adml | 6 ++ windows/en-US/firefox.adml | 9 ++ windows/es-ES/firefox.adml | 6 ++ windows/firefox.admx | 7 ++ windows/fr-FR/firefox.adml | 6 ++ windows/it-IT/firefox.adml | 6 ++ windows/zh-TW/firefox.adml | 6 ++ 9 files changed, 279 insertions(+) diff --git a/README.md b/README.md index 0eed6c5..935f7d7 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ Policies can be specified using the [Group Policy templates on Windows](https:// | **[`FlashPlugin`](#flashplugin)** | Configure the default Flash plugin policy as well as origins for which Flash is allowed. | **[`FirefoxHome`](#firefoxhome)** | Customize the Firefox Home page. | **[`HardwareAcceleration`](#hardwareacceleration)** | Control hardware acceleration. +| **[`Handlers`](#handlers)** | Configure default application handlers. | **[`Homepage`](#homepage)** | Configure the default homepage and how Firefox starts. | **[`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. @@ -2385,6 +2386,187 @@ Value (string): } } ``` + + + +### Handlers +Configure default application handlers. This policy is based on the internal format of `handlers.json`. + +You can configure handlers based on a mime type (`mimeTypes`), a file's extension (`extensions`), or a protocol (`schemes`). + +Within each handler type, you specify the given mimeType/extension/scheme as a key and use the following subkeys to describe how it is handled. + +| Name | Description | +| --- | --- | +| `action`| Can be either `saveToDisk`, `useHelperApp`, `useSystemDefault`. +| `ask` | If `true`, the user is asked if what they want to do with the file. If `false`, the action is taken without user intervention. +| `handlers` | An array of handlers with the first one being the default. If you don't want to have a default handler, use an empty object for the first handler. Choose between path or uriTemplate. +|         `name` | The display name of the handler (might not be used). +|         `path`| The native path to the executable to be used. +|         `uriTemplate`| A url to a web based application handler. The URL must be https and contain a %s to be used for substitution. + +**Compatibility:** Firefox 78, Firefox ESR 78\ +**CCK2 Equivalent:** N/A\ +**Preferences Affected:** N/A + +#### Windows (GPO) +``` +Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) = +{ + "mimeTypes": { + "application/msword": { + "action": "useSystemDefault", + "ask": true | false + } + }, + "schemes": { + "mailto": { + "action": "useHelperApp", + "ask": true | false, + "handlers": [{ + "name": "Gmail", + "uriTemplate": "https://mail.google.com/mail/?extsrc=mailto&url=%s" + }] + } + }, + "extensions": { + "pdf": { + "action": "useHelperApp", + "ask": true | false, + "handlers": [{ + "name": "Adobe Acrobat", + "path": "C:\\Program Files (x86)\\Adobe\\Acrobat Reader DC\\Reader\\AcroRd32.exe" + }] + } + } +} +``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/Handlers +``` +Value (string): +``` + + +``` +#### macOS +``` + + Handlers + + mimeTypes + + application/msword + + action + useSystemDefault + ask + | + + + schemes + + mailto + + action + useHelperApp + ask + | + handlers + + + name + Gmail + uriTemplate + https://mail.google.com/mail/?extsrc=mailto&url=%s + + + + + extensions + + pdf + + action + useHelperApp + ask + | + handlers + + + name + Adobe Acrobat + path + /System/Applications/Preview.app + + + + + + +``` +#### policies.json +``` +{ + "mimeTypes": { + "application/msword": { + "action": "useSystemDefault", + "ask": false + } + }, + "schemes": { + "mailto": { + "action": "useHelperApp", + "ask": true | false, + "handlers": [{ + "name": "Gmail", + "uriTemplate": "https://mail.google.com/mail/?extsrc=mailto&url=%s" + }] + } + }, + "extensions": { + "pdf": { + "action": "useHelperApp", + "ask": true | false, + "handlers": [{ + "name": "Adobe Acrobat", + "path": "/usr/bin/acroread" + }] + } + } +} +``` ### FirefoxHome Customize the Firefox Home page. diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 267a7c9..e0043ed 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -291,6 +291,57 @@ Locked + Handlers + + mimeTypes + + application/msword + + action + useSystemDefault + ask + | + + + schemes + + mailto + + action + useHelperApp + ask + | + handlers + + + name + Gmail + uriTemplate + https://mail.google.com/mail/?extsrc=mailto&url=%s + + + + + extensions + + pdf + + action + useHelperApp + ask + | + handlers + + + name + Adobe Acrobat + path + /System/Applications/Preview.app + + + + + HardwareAcceleration Homepage diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index ed90291..c18ff0f 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -774,6 +774,12 @@ If this policy is enabled or not configured, the Picture-in-Picture toggle is av 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. + Handlers + If this policy is enabled, you can use JSON to configure default application handlers. + +If this policy is disabled or not configured, Firefox defaults are used. + +For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 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 0e7c78c..9551f53 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -776,6 +776,12 @@ If this policy is enabled or not configured, the Picture-in-Picture toggle is av 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. + Handlers + If this policy is enabled, you can use JSON to configure default application handlers. + +If this policy is disabled or not configured, Firefox defaults are used. + +For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 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: @@ -1062,6 +1068,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences. + + + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 3b7899e..818b56e 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -776,6 +776,12 @@ If this policy is enabled or not configured, the Picture-in-Picture toggle is av 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. + Handlers + If this policy is enabled, you can use JSON to configure default application handlers. + +If this policy is disabled or not configured, Firefox defaults are used. + +For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 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 d4aea08..0c0c1aa 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -3627,5 +3627,12 @@ + "> + + + + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 2b220e8..582c3d9 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -775,6 +775,12 @@ If this policy is enabled or not configured, the Picture-in-Picture toggle is av 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. + Handlers + If this policy is enabled, you can use JSON to configure default application handlers. + +If this policy is disabled or not configured, Firefox defaults are used. + +For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 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. Pour une description de la préférence, voir: diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 2793421..391e7e7 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -776,6 +776,12 @@ If this policy is enabled or not configured, the Picture-in-Picture toggle is av 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. + Handlers + If this policy is enabled, you can use JSON to configure default application handlers. + +If this policy is disabled or not configured, Firefox defaults are used. + +For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 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 a0c8976..abce331 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -774,6 +774,12 @@ If this policy is enabled or not configured, the Picture-in-Picture toggle is av 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. + Handlers + If this policy is enabled, you can use JSON to configure default application handlers. + +If this policy is disabled or not configured, Firefox defaults are used. + +For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 若啟用此原則，偏好設定將鎖定為 true。若停用此原則，偏好設定則鎖定為 false。 若需要偏好設定的詳細說明，請參考： -- 2.43.0 From 726433b175ff8813d8476e61df46aa091a0a877b Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 25 Jun 2020 14:00:30 -0500 Subject: [PATCH 04/16] Add restricted domains and cleanup install sources --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 76bc17a..243049b 100644 --- a/README.md +++ b/README.md @@ -2176,9 +2176,10 @@ The configuration for each extension is another dictionary that can contain the |         `force_installed`| The extension is automatically installed and can't be removed by the user. This option is not valid for the default configuration and requires an install_url. |         `normal_installed`| The extension is automatically installed but can be disabled by the user. This option is not valid for the default configuration and requires an install_url. | `install_url`| Maps to a URL indicating where Firefox can download a force_installed or normal_installed extension. If installing from the addons.mozilla.org, use the following URL (substituting SHORT_NAME from the URL on AMO), https://addons.mozilla.org/firefox/downloads/latest/SHORT_NAME/latest.xpi. If installing from the local file system, use a file:/// URL. Languages packs are available from https://releases.mozilla.org/pub/firefox/releases/VERSION/PLATFORM/xpi/LANGUAGE.xpi. -| `install_sources` | Each item in this list is an extension-style match pattern. Users will be able to easily install items from any URL that matches an item in this list. Both the location of the *.xpi file and the page where the download is started from (i.e. the referrer) must be allowed by these patterns. This setting can be used only for the default configuration. +| `install_sources` | A list of sources from which installing extensions is allowed. **This is unnecessary if you are only allowing the installation of certain extensions by ID.** Each item in this list is an extension-style match pattern. Users will be able to easily install items from any URL that matches an item in this list. Both the location of the *.xpi file and the page where the download is started from (i.e. the referrer) must be allowed by these patterns. This setting can be used only for the default configuration. If you want to allow the install of extensions from the recommended add-ons page, you must add `about:addons` to this list. | `allowed_types` | This setting whitelists the allowed types of extension/apps that can be installed in Firefox. The value is a list of strings, each of which should be one of the following: "extension", "theme", "dictionary", "langpack" This setting can be used only for the default configuration. -| `blocked_install_message` | This maps to a string specifying the error message to display to users if they're blocked from installing an extension. This setting allows you to append text to the generic error message displayed when the extension is blocked. This could be be used to direct users to your help desk, explain why a particular extension is blocked, or something else. +| `blocked_install_message` | This maps to a string specifying the error message to display to users if they're blocked from installing an extension. This setting allows you to append text to the generic error message displayed when the extension is blocked. This could be be used to direct users to your help desk, explain why a particular extension is blocked, or something else. This setting can be used only for the default configuration. +| `restricted_domains` | An array of domains on which content scripts can't be run. This setting can be used only for the default configuration. **Compatibility:** Firefox 69, Firefox ESR 68.1\ **CCK2 Equivalent:** N/A\ @@ -2190,7 +2191,7 @@ Software\Policies\Mozilla\Firefox\ExtensionSettings (REG_MULTI_SZ) = { "*": { "blocked_install_message": "Custom error message.", - "install_sources": ["https://addons.mozilla.org/"], + "install_sources": ["about:addons","https://addons.mozilla.org/"], "installation_mode": "blocked", "allowed_types": ["extension"] }, @@ -2211,7 +2212,7 @@ Value (string): + "blocked_install_message": "Custom error message.", + "install_sources": ["about:addons","https://addons.mozilla.org/"], + "installation_mode": "blocked", + "allowed_types": ["extension"] + }, + "uBlock0@raymondhill.net": { + "installation_mode": "force_installed", + "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi" + }, + "https-everywhere@eff.org": { + "installation_mode": "allowed", + }'/> ``` #### macOS ``` @@ -2250,6 +2256,11 @@ Value (string): install_url https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi + https-everywhere@eff.org + + installation_mode + allowed + ``` @@ -2267,6 +2278,9 @@ Value (string): "uBlock0@raymondhill.net": { "installation_mode": "force_installed", "install_url": "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi" + }, + "https-everywhere@eff.org": { + "installation_mode": "allowed" } } } -- 2.43.0 From e5fff0d499e4985f5871834bfca8ae4716017cd0 Mon Sep 17 00:00:00 2001 From: Alessandro Menti Date: Sat, 27 Jun 2020 11:51:05 +0200 Subject: [PATCH 06/16] Update the Italian translation --- windows/it-IT/firefox.adml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 391e7e7..f68769c 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -601,7 +601,7 @@ Se questo criterio è disabilitato o non configurato, per impostazione predefini Nessuna Pagina iniziale Sessione precedente - Homepage (Locked) + Pagina iniziale (bloccata) Gestore password Se questo criterio è disabilitato, il gestore password non è disponibile nelle Preferenze. @@ -745,11 +745,11 @@ Se questo criterio è abilitato o non configurato, saranno consigliate azioni ba TLS_RSA_WITH_3DES_EDE_CBC_SHA TLS_RSA_WITH_AES_128_GCM_SHA256 TLS_RSA_WITH_AES_256_GCM_SHA384 - If this policy is enabled, the corresponding cipher is disabled. + Se questo criterio è abilitato, il cifrario corrispondente è disabilitato. -If this policy is disabled, the corresponding cipher is enabled. +Se questo criterio è disabilitato, il cifrario corrispondente è abilitato. -If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. +Se questo criterio è non configurato, il cifrario corrispondente è abilitato o disabilitato in base all'impostazione predefinita di Firefox. Abilita Encrypted Media Extension Se questo criterio è disabilitato, le Encrypted Media Extension (come Widevine) non sono scaricate da Firefox a meno che l'utente non acconsenta ad installarle. @@ -767,21 +767,21 @@ Se questo criterio è abilitato o non configurato, viene utilizzato il visualizz Se questo criterio è disabilitato o non configurato, i permessi del documento sono ignorati. Picture-in-Picture - If this policy is disabled, the Picture-in-Picture toggle does not appear on videos. + Se questo criterio è disabilitato, l'interruttore Picture-in-Picture non appare nei video. -If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos. - Master Password - If this policy is enabled, a master password is required. +Se questo criterio è abilitato o non configurato, l'interruttore Picture-in-Picture è disponibile per i video. + Password principale + Se questo criterio è abilitato, è richiesto impostare una password principale. -If this policy is disabled, users cannot create a master password. +Se questo criterio è disabilitato, gli utenti non possono creare una password principale. -If this policy is not configured, users can choose to create a master password. - Handlers - If this policy is enabled, you can use JSON to configure default application handlers. +Se questo criterio è non configurato, gli utenti possono scegliere di creare una password principale. + Gestori + Se questo criterio è abilitato, è possibile utilizzare JSON per configurare i gestori applicazione predefiniti. -If this policy is disabled or not configured, Firefox defaults are used. +Se questo criterio è disabilitato o non configurato, vengono utilizzati i criteri predefiniti di Firefox. -For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. +Per informazioni dettagliate sulla creazione del criterio, si veda https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. 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: -- 2.43.0 From f132cc24ffa8b37410a4cf24c07088cd85daac0d Mon Sep 17 00:00:00 2001 From: drlellinger <39723641+drlellinger@users.noreply.github.com> Date: Tue, 30 Jun 2020 10:01:50 +0200 Subject: [PATCH 07/16] Updated German translation --- windows/de-DE/firefox.adml | 39 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index c18ff0f..64a9e3f 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -743,11 +743,11 @@ Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, werden TLS_RSA_WITH_3DES_EDE_CBC_SHA TLS_RSA_WITH_AES_128_GCM_SHA256 TLS_RSA_WITH_AES_256_GCM_SHA384 - If this policy is enabled, the corresponding cipher is disabled. + Wenn diese Richtlinieneinstellung aktiviert ist, ist der ausgewählte Cipher deaktiviert. -If this policy is disabled, the corresponding cipher is enabled. +Wenn diese Richtlinieneinstellung deaktiviert ist, ist der ausgewählte Cipher aktiviert. -If this policy is not configured, the corresponding cipher is enabled or disabled based on the default in Firefox. +Wenn diese Richtlinieneinstellung nicht konfiguriert ist, werden die Standardeinstellungen in Firefox verwendet. DRM-Medien Erweiterungen Wenn diese Richtlinieneinstellung deaktiviert ist, werden DRM-Medien Erweiterungen (wie z.B. Widevine) nicht durch Mozilla Firefox heruntergeladen außer der Nutzer stimmt dem Download explizit zu. @@ -756,30 +756,31 @@ Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, werden Wenn diese Richtlinieneinstellung deaktiviert ist, können Nutzer Änderungen an der Einstellung zu DRM-Medien Erweiterungen vornehmen. Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, können Nutzer die Einstellung zu DRM-Medien Erweiterungen nicht ändern. - Enable PDFjs - If this policy is disabled, the built-in PDF viewer is not used. + PDFjs (integrierter PDF-Betrachter) aktivieren + Wenn diese Richtlinieneinstellung deaktiviert ist, wird der integrierte PDF Betrachter nicht verwendet. -If this policy is enabled or not configured, the built-in PDF viewer is used. - Enable Permissions - If this policy is enabled, the built-in PDF viewer will honor document permissions like preventing the copying of text. +Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird der integrierte PDF Betrachter verwendet. + PDF-Berechtigungen aktivieren + Wenn diese Richtlinieneinstellung aktiviert ist, werden Berechtigungen des PDF-Dokuments (wie z.B. Markieren und Kopieren von Text verhindern) angewendet. -If this policy is not disabled or not configured, document permissions are ignored. - Picture-in-Picture - If this policy is disabled, the Picture-in-Picture toggle does not appear on videos. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden Berechtigungen im PDF-Dokument ignoriert. + Bild in Bild + Wenn diese Richtlinieneinstellung deaktiviert ist, ist die Bild-in-Bild Funktion deaktiviert. -If this policy is enabled or not configured, the Picture-in-Picture toggle is available on videos. - Master Password - If this policy is enabled, a master password is required. +Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, ist die Bild-in-Bild Funktion verfügbar. + Masterpasswort + Wenn diese Richtlinieneinstellung aktiviert ist, ist das Setzen eines Masterpasswortes erforderlich. -If this policy is disabled, users cannot create a master password. +Wenn diese Richtlinieneinstellung deaktiviert ist, ist das Setzen eines Masterpasswortes nicht möglich. -If this policy is not configured, users can choose to create a master password. +Wenn diese Richtlinieneinstellung nicht konfiguriert ist, können Nutzer ein Masterpasswort setzen, dies ist aber nicht erforderlich. Handlers - If this policy is enabled, you can use JSON to configure default application handlers. + Wenn diese Richtlinieneinstellung aktiviert ist, können Sie das Anwendungsverhalten (beim Anklicken eines Links oder beim Download) mittels JSON beschtreiben. -If this policy is disabled or not configured, Firefox defaults are used. +Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, werden die Standardeinstellungen verwendet und können vom Nutzer modifiziert werden. -For detailed information on creating the policy, see https://github.com/mozilla/policy-templates/blob/master/README.md#handlers. +Für eine Beschreibung der Einstellung, siehe: +https://github.com/mozilla/policy-templates/blob/master/README.md#handlers (Englisch) 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: -- 2.43.0 From 6df167f71181620fcdd180789fd29df2e97ccd4d Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Tue, 30 Jun 2020 12:34:53 -0500 Subject: [PATCH 08/16] Missing Handlers presentation --- windows/de-DE/firefox.adml | 3 +++ windows/es-ES/firefox.adml | 3 +++ windows/fr-FR/firefox.adml | 3 +++ windows/it-IT/firefox.adml | 3 +++ windows/zh-TW/firefox.adml | 3 +++ 5 files changed, 15 insertions(+) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 64a9e3f..74b59b0 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -1068,6 +1068,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E + + + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 818b56e..22b255b 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -1068,6 +1068,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 582c3d9..e862a95 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -1067,6 +1067,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index f68769c..d748b50 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -1068,6 +1068,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences + + + diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index abce331..a990afd 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -1066,6 +1066,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。 + + + -- 2.43.0 From 457fb9bd8d601854bd76cca1e6ca4e9a2add7dba Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Tue, 30 Jun 2020 12:37:08 -0500 Subject: [PATCH 09/16] Bump version for release --- windows/de-DE/firefox.adml | 2 +- windows/en-US/firefox.adml | 2 +- windows/es-ES/firefox.adml | 2 +- windows/firefox.admx | 4 ++-- windows/fr-FR/firefox.adml | 2 +- windows/it-IT/firefox.adml | 2 +- windows/zh-TW/firefox.adml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 74b59b0..637cbf4 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 9551f53..599e8ef 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 22b255b..765368c 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/firefox.admx b/windows/firefox.admx index 0c0c1aa..86964ab 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -1,10 +1,10 @@  - + - + diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index e862a95..26c8c26 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index d748b50..25dedc1 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index a990afd..107e86e 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -1,5 +1,5 @@ - + -- 2.43.0 From 94be5cf52cd08c4b60ddc76c589dea2f55698af0 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Tue, 30 Jun 2020 14:40:49 -0500 Subject: [PATCH 10/16] Add Linux disclaimer for ImportEnterpriseRoots --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d31a81a..e290f34 100644 --- a/README.md +++ b/README.md @@ -569,6 +569,8 @@ Value (string): Trust certificates that have been added to the operating system certificate store by a user or administrator. +Note: This policy only works on Windows and macOS. For Linux discussion, see [bug 1600509](https://bugzilla.mozilla.org/show_bug.cgi?id=1600509). + See https://support.mozilla.org/kb/setting-certificate-authorities-firefox for more detail. **Compatibility:** Firefox 60, Firefox ESR 60 (macOS support in Firefox 63, Firefox ESR 68)\ -- 2.43.0 From e5f52b7f90cb6ce2733cd57263b09302fa1a334c Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Tue, 30 Jun 2020 19:05:56 -0500 Subject: [PATCH 11/16] Remove MasterPassword since it is in 79 --- README.md | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/README.md b/README.md index e290f34..f14e0ae 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,6 @@ 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. -| **[`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. @@ -2905,43 +2904,6 @@ 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): -``` - or -``` -#### macOS -``` - - MasterPassword - | - -``` -#### policies.json -``` -{ - "policies": { - "MasterPassword": true | false - } -} -``` ### NetworkPrediction Enable or disable network prediction (DNS prefetching). -- 2.43.0 From ce0ec472f1652ece255f333a450b2674fce80a68 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 1 Jul 2020 10:17:13 -0500 Subject: [PATCH 12/16] MasterPassword should be in 79. --- mac/org.mozilla.firefox.plist | 2 -- windows/de-DE/firefox.adml | 2 +- windows/en-US/firefox.adml | 2 +- windows/es-ES/firefox.adml | 2 +- windows/firefox.admx | 8 ++++---- windows/fr-FR/firefox.adml | 2 +- windows/it-IT/firefox.adml | 2 +- windows/zh-TW/firefox.adml | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index e0043ed..7bc00f5 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -374,8 +374,6 @@ http://example.org http://example.edu - MasterPassword - NetworkPrediction NewTabPage diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml index 637cbf4..888b52b 100644 --- a/windows/de-DE/firefox.adml +++ b/windows/de-DE/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml index 599e8ef..d14e130 100644 --- a/windows/en-US/firefox.adml +++ b/windows/en-US/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml index 765368c..08d2f54 100644 --- a/windows/es-ES/firefox.adml +++ b/windows/es-ES/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/firefox.admx b/windows/firefox.admx index 86964ab..5a3785b 100644 --- a/windows/firefox.admx +++ b/windows/firefox.admx @@ -1,10 +1,10 @@  - + - + @@ -3617,7 +3617,7 @@ - + "> diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml index 26c8c26..3e08766 100644 --- a/windows/fr-FR/firefox.adml +++ b/windows/fr-FR/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml index 25dedc1..0249ee0 100644 --- a/windows/it-IT/firefox.adml +++ b/windows/it-IT/firefox.adml @@ -1,5 +1,5 @@ - + diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml index 107e86e..d1250ea 100644 --- a/windows/zh-TW/firefox.adml +++ b/windows/zh-TW/firefox.adml @@ -1,5 +1,5 @@ - + -- 2.43.0 From e276c1ac92d9a4e42a77bc043b108a67692e31e7 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 1 Jul 2020 15:32:43 -0500 Subject: [PATCH 13/16] Add example for string preference name --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index f14e0ae..18531c2 100644 --- a/README.md +++ b/README.md @@ -3704,10 +3704,16 @@ Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_v OMA-URI: (periods are replaced by underscores) ``` ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Preferences/boolean_preference_name +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Preferences/string_preference_name ``` Value (string): ``` or + + + + + ``` #### macOS ``` -- 2.43.0 From 26f53ec51cf6b27a029fb8925e8c77dd183f2823 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Wed, 1 Jul 2020 15:48:45 -0500 Subject: [PATCH 14/16] Intune Examples for Extension Install/Uninstall/Locked and cleanup string pref example --- README.md | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 18531c2..9421825 100644 --- a/README.md +++ b/README.md @@ -2128,6 +2128,34 @@ Software\Policies\Mozilla\Firefox\Extensions\Install\2 = "//path/to/xpi" Software\Policies\Mozilla\Firefox\Extensions\Uninstall\1 = "bad_addon_id@mozilla.org" Software\Policies\Mozilla\Firefox\Extensions\Locked\1 = "addon_id@mozilla.org" ``` +#### Windows (Intune) +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/Extensions_Install +``` +Value (string): +``` + + +``` +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/Extensions_Uninstall +``` +Value (string): +``` + + +``` +OMA-URI: +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/Extensions_Locked +``` +Value (string): +``` + + +``` #### macOS ``` @@ -3704,16 +3732,19 @@ Software\Policies\Mozilla\Firefox\Preferences\string_preference_name = "string_v OMA-URI: (periods are replaced by underscores) ``` ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Preferences/boolean_preference_name -./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Preferences/string_preference_name ``` Value (string): ``` or - - +``` +OMA-URI: (periods are replaced by underscores) +``` +./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Preferences/string_preference_name +``` +Value (string): +``` - ``` #### macOS ``` -- 2.43.0 From ee2fe10cdba8627ece235d2bf5754c7dd02ca6b5 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 2 Jul 2020 11:20:55 -0500 Subject: [PATCH 15/16] Remove pipes in samples --- mac/org.mozilla.firefox.plist | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 7bc00f5..59be48b 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -300,7 +300,7 @@ action useSystemDefault ask - | + schemes @@ -310,7 +310,7 @@ action useHelperApp ask - | + handlers @@ -329,7 +329,7 @@ action useHelperApp ask - | + handlers @@ -476,7 +476,7 @@ PictureInPicture - | + PopupBlocking Allow -- 2.43.0 From be2fe5f606949f1244b7e9def410d5ee18216761 Mon Sep 17 00:00:00 2001 From: Michael Kaply <345868+mkaply@users.noreply.github.com> Date: Thu, 2 Jul 2020 11:34:20 -0500 Subject: [PATCH 16/16] correct ampersands --- README.md | 2 +- mac/org.mozilla.firefox.plist | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9421825..4acb0f4 100644 --- a/README.md +++ b/README.md @@ -2508,7 +2508,7 @@ Value (string): "ask": true | false, "handlers": [{ "name": "Gmail", - "uriTemplate": "https://mail.google.com/mail/?extsrc=mailto&url=%s" + "uriTemplate": "https://mail.google.com/mail/?extsrc=mailto&url=%s" }] } }, diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist index 59be48b..5241e7b 100644 --- a/mac/org.mozilla.firefox.plist +++ b/mac/org.mozilla.firefox.plist @@ -317,7 +317,7 @@ name Gmail uriTemplate - https://mail.google.com/mail/?extsrc=mailto&url=%s + https://mail.google.com/mail/?extsrc=mailto&url=%s -- 2.43.0