Merge pull request #585 from mozilla/DisabledCiphers

Initial checkin of new policy DisabledCiphers

diff --git a/README.md b/README.md
index f57233966df8ce77a87bf04dd57ff63f3f7f921f..089b93ca5d660080c173926d1986aa217f4c63a8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2181,9 +2181,11 @@ Set permissions associated with camera, microphone, location, notifications, and
 
 `Locked` prevents the user from changing preferences for the feature.
 
-**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6\
+`Default` specifies the default value for Autoplay. block-audio-video is not supported on Firefox ESR 68.
+
+**Compatibility:** Firefox 62, Firefox ESR 60.2 (Autoplay added in Firefox 74, Firefox ESR 68.6, Autoplay Default/Locked added in Firefox 76, Firefox ESR 68.8)\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`
+**Preferences Affected:** `permissions.default.camera`,`permissions.default.microphone`,`permissions.default.geo`,`permissions.default.desktop-notification`,`media.autoplay.default`
 
 #### Windows (GPO)
 ```
@@ -2206,6 +2208,8 @@ Software\Policies\Mozilla\Firefox\Permissions\Notifications\BlockNewRequests = 0
 Software\Policies\Mozilla\Firefox\Permissions\Notifications\Locked = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Allow\1 = "https://example.org"
 Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://example.edu"
+Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Default = "allow-audio-video" | "block-audio" | "block-audio-video"
+Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Locked = 0x1 | 0x0
 ```
 #### macOS
 ```
@@ -2224,9 +2228,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl
         <string>https://example.edu</string>
       </array>
       <key>BlockNewRequests</key>
-      <true/>
+      <true/> | <false/>
       <key>Locked</key>
-      <true/>
+      <true/> | <false/>
     </dict>
     <key>Microphone</key>
     <dict>
@@ -2239,9 +2243,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl
         <string>https://example.edu</string>
       </array>
       <key>BlockNewRequests</key>
-      <true/>
+      <true/> | <false/>
       <key>Locked</key>
-      <true/>
+      <true/> | <false/>
     </dict>
     <key>Location</key>
     <dict>
@@ -2254,9 +2258,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl
         <string>https://example.edu</string>
       </array>
       <key>BlockNewRequests</key>
-      <true/>
+      <true/> | <false/>
       <key>Locked</key>
-      <true/>
+      <true/> | <false/>
     </dict>
     <key>Notifications</key>
     <dict>
@@ -2283,6 +2287,10 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl
       <array>
         <string>https://example.edu</string>
       </array>
+      <key>Default</key>
+      <string>allow-audio-video | block-audio | block-audio-video</string>
+      <key>Locked</key>
+      <true/> | <false/>
     </dict>
   </dict>
 </dict>
@@ -2318,7 +2326,9 @@ Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block\1 = "https://exampl
       },
       "Autoplay": {
         "Allow": ["https://example.org"],
-        "Block": ["https://example.edu"]
+        "Block": ["https://example.edu"],
+        "Default": "allow-audio-video" | "block-audio" | "block-audio-video",
+        "Locked": true | false
       }
     }
   }

diff --git a/mac/org.mozilla.firefox.plist b/mac/org.mozilla.firefox.plist
index ec4d852336ae90b74618404662dc91027b798f3a..17343d3fb39f34c38141a5fc4c665b0b03548301 100644 (file)
--- a/mac/org.mozilla.firefox.plist
+++ b/mac/org.mozilla.firefox.plist
@@ -398,6 +398,10 @@
                        <array>
                                <string>https://example.edu</string>
                        </array>
+                       <key>Default</key>
+                               <string>block-audio</string>
+                       <key>Locked</key>
+                       <true/>
                </dict>
        </dict>
        <key>PopupBlocking</key>

diff --git a/windows/de-DE/firefox.adml b/windows/de-DE/firefox.adml
index 6b2aa39a72ec5d1fc1313d85e650093beeb99c73..c9b7b18d48eeb0b6ed7143f6415ee11a0393099f 100644 (file)
--- a/windows/de-DE/firefox.adml
+++ b/windows/de-DE/firefox.adml
@@ -423,6 +423,19 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird
       <string id="Autoplay_Block_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist die Automatische Wiedergabe für die genannten Quellen immer deaktiviert.
 
 Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert, wird die Standardeinstellung zur Automatischen Wiedergabe von Medien befolgt.</string>
+      <string id="Autoplay_Default">Default autoplay level</string>
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
+
+If this policy is disabled or not configured, audio is blocked by default.
+
+Note: Blocking audio and video does not work on the ESR.</string>
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>
+      <string id="AllowAudioVideo">Allow Audio and Video</string>
+      <string id="BlockAudio">Block Audio</string>
+      <string id="BlockAudioVideo">Block Audio and Video</string>
       <string id="FirefoxHome">Firefox Home anpassen</string>
       <string id="FirefoxHome_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, können die Sektionen festgelegt werden, die der Anwender sieht und der Anwender kann diese nicht mehr anpassen.
 
@@ -1043,6 +1056,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>
+      <presentation id="Autoplay_Default">
+        <dropdownList refId="Autoplay_Default"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index c44ba4fb0c822cb2f5fbaeb3bdbad024eae7197e..7c5dae130b16c7f0c2b8824e2be59250be0dc13c 100644 (file)
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -423,6 +423,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol
       <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.
 
 If this policy is disabled or not configured, the default autoplay policy is followed.</string>
+      <string id="Autoplay_Default">Default autoplay level</string>
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
+
+If this policy is disabled or not configured, audio is blocked by default.
+
+Note: Blocking audio and video does not work on the ESR.</string>
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>
+      <string id="AllowAudioVideo">Allow Audio and Video</string>
+      <string id="BlockAudio">Block Audio</string>
+      <string id="BlockAudioVideo">Block Audio and Video</string>
       <string id="FirefoxHome">Customize Firefox Home</string>
       <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.
 
@@ -1044,6 +1057,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>
+      <presentation id="Autoplay_Default">
+        <dropdownList refId="Autoplay_Default"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/es-ES/firefox.adml b/windows/es-ES/firefox.adml
index b52ea671048f1cb4cded1a8e356d02c9a86c01f2..9bed40af0687686c1c84b4b97a5da25dc172b600 100644 (file)
--- a/windows/es-ES/firefox.adml
+++ b/windows/es-ES/firefox.adml
@@ -423,6 +423,19 @@ Si esta política está deshabilitada o no está configurada, se seguirá la pol
       <string id="Autoplay_Block_Explain">Si esta política está habilitada, la reproducción automática siempre se bloqueará para los orígenes indicados.
 
 Si esta política está deshabilitada o no está configurada, se seguirá la política predeterminada de reproducción automática.</string>
+      <string id="Autoplay_Default">Default autoplay level</string>
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
+
+If this policy is disabled or not configured, audio is blocked by default.
+
+Note: Blocking audio and video does not work on the ESR.</string>
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>
+      <string id="AllowAudioVideo">Allow Audio and Video</string>
+      <string id="BlockAudio">Block Audio</string>
+      <string id="BlockAudioVideo">Block Audio and Video</string>
       <string id="FirefoxHome">Personalizar inicio de Firefox</string>
       <string id="FirefoxHome_Explain">Si esta política está habilitada, podrá elegir las secciones que se muestran en la página de inicio de Firefox e impedir que el usuario las cambie.
 
@@ -1044,6 +1057,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>
+      <presentation id="Autoplay_Default">
+        <dropdownList refId="Autoplay_Default"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/firefox.admx b/windows/firefox.admx
index f18d859b45802c31d662284898f7de980067c742..77ed391a55fd44a59f5835a2bc897023db3a578d 100644 (file)
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -481,6 +481,39 @@
         <list id="Permissions" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay\Block" valuePrefix=""/>
       </elements>
     </policy>
+    <policy name="Autoplay_Locked" class="Both" displayName="$(string.Autoplay_Locked)" explainText="$(string.Autoplay_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay" valueName="Locked">
+      <parentCategory ref="Autoplay"/>
+      <supportedOn ref="SUPPORTED_FF76"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="Autoplay_Default" class="Both" displayName="$(string.Autoplay_Default)" explainText="$(string.Autoplay_Default_Explain)" key="Software\Policies\Mozilla\Firefox\Permissions\Autoplay"  presentation="$(presentation.Autoplay_Default)">
+      <parentCategory ref="Autoplay"/>
+      <supportedOn ref="SUPPORTED_FF76"/>
+      <elements>
+        <enum id="Autoplay_Default" valueName="Default">
+          <item displayName="$(string.AllowAudioVideo)">
+            <value>
+              <string>allow-audio-video</string>
+            </value>
+          </item>
+          <item displayName="$(string.BlockAudio)">
+            <value>
+              <string>block-audio</string>
+            </value>
+          </item>
+          <item displayName="$(string.BlockAudioVideo)">
+            <value>
+              <string>block-audio-video</string>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>
     <policy name="DefaultDownloadDirectory" class="Both" displayName="$(string.DefaultDownloadDirectory)" explainText="$(string.DefaultDownloadDirectory_Explain)" key="Software\Policies\Mozilla\Firefox" presentation="$(presentation.Preferences_String)">
       <parentCategory ref="firefox"/>
       <supportedOn ref="SUPPORTED_FF68"/>

diff --git a/windows/fr-FR/firefox.adml b/windows/fr-FR/firefox.adml
index c951f8055d93ad27712be48b27370ae9b4b0f1f0..fcb350432a13f33ca012bbf66ea29745c038b718 100644 (file)
--- a/windows/fr-FR/firefox.adml
+++ b/windows/fr-FR/firefox.adml
@@ -423,6 +423,19 @@ If this policy is disabled or not configured, the default autoplay policy is fol
       <string id="Autoplay_Block_Explain">If this policy is enabled, autoplay is always blocked for the origins indicated.\r
 \r
 If this policy is disabled or not configured, the default autoplay policy is followed.</string>\r
+      <string id="Autoplay_Default">Default autoplay level</string>\r
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.\r
+\r
+If this policy is disabled or not configured, audio is blocked by default.\r
+\r
+Note: Blocking audio and video does not work on the ESR.</string>\r
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>\r
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.\r
+\r
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>\r
+      <string id="AllowAudioVideo">Allow Audio and Video</string>\r
+      <string id="BlockAudio">Block Audio</string>\r
+      <string id="BlockAudioVideo">Block Audio and Video</string>\r
       <string id="FirefoxHome">Customize Firefox Home</string>\r
       <string id="FirefoxHome_Explain">If this policy is enabled, you can choose the sections displayed on Firefox Home and prevent the user from changing them.\r
 \r
@@ -1044,6 +1057,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="List">\r
         <listBox refId="List"/>\r
       </presentation>\r
+      <presentation id="Autoplay_Default">\r
+        <dropdownList refId="Autoplay_Default"/>\r
+      </presentation>\r
     </presentationTable>\r
   </resources>\r
 </policyDefinitionResources>\r

diff --git a/windows/it-IT/firefox.adml b/windows/it-IT/firefox.adml
index b46d4be43a648eda0f4f0a71a0a181b271eab58f..4e5d70ba62a3369b0f2a462485178ca428ddd6fd 100644 (file)
--- a/windows/it-IT/firefox.adml
+++ b/windows/it-IT/firefox.adml
@@ -423,6 +423,19 @@ Se questo criterio è disabilitato o non configurato, viene seguito il criterio
       <string id="Autoplay_Block_Explain">Se questo criterio è abilitato, la riproduzione automatica sarà sempre bloccata per le origini indicate.
 
 Se questo criterio è disabilitato o non configurato, viene seguito il criterio predefinito per la riproduzione automatica.</string>
+      <string id="Autoplay_Default">Default autoplay level</string>
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
+
+If this policy is disabled or not configured, audio is blocked by default.
+
+Note: Blocking audio and video does not work on the ESR.</string>
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>
+      <string id="AllowAudioVideo">Allow Audio and Video</string>
+      <string id="BlockAudio">Block Audio</string>
+      <string id="BlockAudioVideo">Block Audio and Video</string>
       <string id="FirefoxHome">Personalizza pagina iniziale di Firefox</string>
       <string id="FirefoxHome_Explain">Se questo criterio è abilitato, è possibile scegliere le sezioni visualizzate nella pagina iniziale di Firefox e impedire all'utente di modificarle.
 
@@ -1044,6 +1057,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences</s
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>
+      <presentation id="Autoplay_Default">
+        <dropdownList refId="Autoplay_Default"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

diff --git a/windows/zh-TW/firefox.adml b/windows/zh-TW/firefox.adml
index 7c07f39d378b028f34ad2deec786ae0d6373c573..b1da63f3a2c7fe49016cf8d9ddd620c62f601b45 100644 (file)
--- a/windows/zh-TW/firefox.adml
+++ b/windows/zh-TW/firefox.adml
@@ -421,6 +421,19 @@ Mozilla 建議您不要停用 Telemetry。透過 Telemetry 收集到的資訊可
       <string id="Autoplay_Block_Explain">若啟用此原則，將永遠針對指定的來源封鎖自動播放。
 
 若停用或不設定此原則，將遵循預設自動播放原則。</string>
+      <string id="Autoplay_Default">Default autoplay level</string>
+      <string id="Autoplay_Default_Explain">If this policy is enabled, you can choose the default autoplay level.
+
+If this policy is disabled or not configured, audio is blocked by default.
+
+Note: Blocking audio and video does not work on the ESR.</string>
+      <string id="Autoplay_Locked">Do not allow preferences to be changed</string>
+      <string id="Autoplay_Locked_Explain">If this policy is enabled, autoplay preferences cannot be changed by the user.
+
+If this policy is disabled or not configured, the user can change autoplay preferences.</string>
+      <string id="AllowAudioVideo">Allow Audio and Video</string>
+      <string id="BlockAudio">Block Audio</string>
+      <string id="BlockAudioVideo">Block Audio and Video</string>
       <string id="FirefoxHome">自訂 Firefox 首頁</string>
       <string id="FirefoxHome_Explain">若啟用此原則，將可以設定要在 Firefox 首頁顯示哪些段落，並防止使用者更改設定。
 
@@ -1042,6 +1055,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences。
       <presentation id="List">
         <listBox refId="List"/>
       </presentation>
+      <presentation id="Autoplay_Default">
+        <dropdownList refId="Autoplay_Default"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
\ No newline at end of file