]> git.p6c8.net - policy-templates.git/commitdiff
Merge branch 'master' into master
authorMichael Kaply <345868+mkaply@users.noreply.github.com>
Fri, 25 Apr 2025 19:08:11 +0000 (15:08 -0400)
committerGitHub <noreply@github.com>
Fri, 25 Apr 2025 19:08:11 +0000 (15:08 -0400)
docs/index.md
windows/de-DE/firefox.adml
windows/en-US/firefox.adml
windows/firefox.admx
windows/fr-FR/firefox.adml
windows/ru-RU/firefox.adml

index 9923f2e5882e45be0ceae56fc77d4020ad2cb900..f1aa8b90720b48b491f0191a6f37acab5543ccca 100644 (file)
@@ -676,7 +676,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/AutoLaunchProtocolsFromOriginsOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/AutoLaunchProtocolsFromOriginsOneLine
 ```
 Value (string):
 ```
@@ -954,7 +954,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/BookmarksOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/BookmarksOneLine
 ```
 Value (string):
 ```
@@ -1199,7 +1199,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/ContainersOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/ContainersOneLine
 ```
 Value (string):
 ```
@@ -1246,7 +1246,7 @@ Configure Firefox to use an agent for Data Loss Prevention (DLP) that is compati
 
 `AgentName` is the name of the DLP agent. This is used in dialogs and notifications about DLP operations. The default is "A DLP Agent".
 
-`AgentTimeout` is the timeout in number of seconds after a DLP request is sent to the agent. After this timeout, the request will be denied unless `DefaultResult` is set to 1 or 2. The default is 30.
+`AgentTimeout` is the timeout in number of seconds after a DLP request is sent to the agent. After this timeout, the request will be denied unless `TimeoutResult` is set to 1 or 2. The default is 300.
 
 `AllowUrlRegexList` is a space-separated list of regular expressions that indicates URLs for which DLP operations will always be allowed without consulting the agent. The default is "^about:(?!blank&#124;srcdoc).*", meaning that any pages that start with "about:" will be exempt from DLP except for "about:blank" and "about:srcdoc", as these can be controlled by web content.
 
@@ -1270,8 +1270,14 @@ Configure Firefox to use an agent for Data Loss Prevention (DLP) that is compati
 
 * The `Clipboard` entry controls clipboard operations for files and text.
   * `Enabled` indicates whether clipboard operations should use DLP. The default is true.
+  * `PlainTextOnly` indicates whether to only analyze the text/plain format on the clipboard. If this
+    value is false, all formats will be analyzed, which some DLP agents may not expect. Regardless of
+    this value, files will be analyzed as usual. The default is true.
 * The `DragAndDrop` entry controls drag and drop operations for files and text.
   * `Enabled` indicates whether drag and drop operations should use DLP. The default is true.
+  * `PlainTextOnly` indicates whether to only analyze the text/plain format in what is being dropped.
+    If this value is false, all formats will be analyzed, which some DLP agents may not expect.
+    Regardless of this value, files will be analyzed as usual. The default is true.
 * The `FileUpload` entry controls file upload operations for files chosen from the file picker.
   * `Enabled` indicates whether file upload operations should use DLP. The default is true.
 * The `Print` entry controls print operation.
@@ -1283,9 +1289,18 @@ Configure Firefox to use an agent for Data Loss Prevention (DLP) that is compati
 
 `ShowBlockedResult` indicates whether Firefox should show a notification when a DLP request is denied. The default is true.
 
-**Compatibility:** Firefox 136\
+`TimeoutResult` indicates the desired behavior for DLP requests if the DLP agent does not respond to a request in less than `AgentTimeout` seconds. The default is 0.
+
+| Value | Description
+| --- | --- |
+| 0 | Deny the request (default)
+| 1 | Warn the user and allow them to choose whether to allow or deny
+| 2 | Allow the request
+
+
+**Compatibility:** Firefox 137\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `browser.contentanalysis.agent_name`, `browser.contentanalysis.agent_timeout`, `browser.contentanalysis.allow_url_regex_list`, `browser.contentanalysis.bypass_for_same_tab_operations`, `browser.contentanalysis.client_signature`, `browser.contentanalysis.default_result`, `browser.contentanalysis.deny_url_regex_list`, `browser.contentanalysis.enabled`, `browser.contentanalysis.interception_point.clipboard.enabled`, `browser.contentanalysis.interception_point.drag_and_drop.enabled`, `browser.contentanalysis.interception_point.file_upload.enabled`, `browser.contentanalysis.interception_point.print.enabled`, `browser.contentanalysis.is_per_user`, `browser.contentanalysis.pipe_path_name`, `browser.contentanalysis.show_blocked_result`
+**Preferences Affected:** `browser.contentanalysis.agent_name`, `browser.contentanalysis.agent_timeout`, `browser.contentanalysis.allow_url_regex_list`, `browser.contentanalysis.bypass_for_same_tab_operations`, `browser.contentanalysis.client_signature`, `browser.contentanalysis.default_result`, `browser.contentanalysis.deny_url_regex_list`, `browser.contentanalysis.enabled`, `browser.contentanalysis.interception_point.clipboard.enabled`, `browser.contentanalysis.interception_point.clipboard.plain_text_only`, `browser.contentanalysis.interception_point.drag_and_drop.enabled`, `browser.contentanalysis.interception_point.drag_and_drop.plain_text_only`, `browser.contentanalysis.interception_point.file_upload.enabled`, `browser.contentanalysis.interception_point.print.enabled`, `browser.contentanalysis.is_per_user`, `browser.contentanalysis.pipe_path_name`, `browser.contentanalysis.show_blocked_result`, `browser.contentanalysis.timeout_result`
 
 #### Windows (GPO)
 ```
@@ -1298,12 +1313,15 @@ Software\Policies\Mozilla\Firefox\ContentAnalysis\DefaultResult = 0x0 | 0x1 | 0x
 Software\Policies\Mozilla\Firefox\ContentAnalysis\DenyUrlRegexList = "https://example\.com/.* https://subdomain\.example\.com/.*"
 Software\Policies\Mozilla\Firefox\ContentAnalysis\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Clipboard\Enabled = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Clipboard\PlainTextOnly = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\DragAndDrop\Enabled = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\DragAndDrop\PlainTextOnly = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\FileUpload\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Print\Enabled = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\ContentAnalysis\IsPerUser = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\ContentAnalysis\PipePathName = "pipe_custom_name"
 Software\Policies\Mozilla\Firefox\ContentAnalysis\ShowBlockedResult = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\ContentAnalysis\TimeoutResult = 0x0 | 0x1 | 0x2
 ```
 
 #### Windows (Intune)
@@ -1379,7 +1397,7 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_Clipboard
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints~Clipboard/ContentAnalysis_InterceptionPoints_Clipboard
 ```
 Value (string):
 ```
@@ -1387,7 +1405,7 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_DragAndDrop
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints~Clipboard/ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly
 ```
 Value (string):
 ```
@@ -1395,7 +1413,7 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_FileUpload
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints~DragAndDrop/ContentAnalysis_InterceptionPoints_DragAndDrop
 ```
 Value (string):
 ```
@@ -1403,7 +1421,23 @@ Value (string):
 ```
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_Print
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints~DragAndDrop/ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_FileUpload_Enabled
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis~InterceptionPoints/ContentAnalysis_InterceptionPoints_Print_Enabled
 ```
 Value (string):
 ```
@@ -1434,6 +1468,15 @@ Value (string):
 ```
 <enabled/> or <disabled/>
 ```
+OMA-URI:
+```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~ContentAnalysis/ContentAnalysis_TimeoutResult
+```
+Value (string):
+```
+<enabled/>
+<data id="ContentAnalysis_TimeoutResult" value="1"/>
+```
 
 #### policies.json
 ```
@@ -1450,10 +1493,12 @@ Value (string):
       "Enabled": true | false,
       "InterceptionPoints": {
         "Clipboard": {
-          "Enabled": true | false
+          "Enabled": true | false,
+          "PlainTextOnly": true | false
         },
         "DragAndDrop": {
-          "Enabled": true | false
+          "Enabled": true | false,
+          "PlainTextOnly": true | false
         },
         "FileUpload": {
           "Enabled": true | false
@@ -1465,6 +1510,7 @@ Value (string):
       "IsPerUser": true | false,
       "PipePathName": "pipe_custom_name",
       "ShowBlockedResult": true | false,
+      "TimeoutResult": 0 | 1 | 2,
     }
   }
 }
@@ -1730,26 +1776,29 @@ Value (string):
 Disable specific cryptographic ciphers, listed below.
 
 ```
-TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
-TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256
-TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256
-TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
-TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
-TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
-TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA
-TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
-TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA
 TLS_DHE_RSA_WITH_AES_128_CBC_SHA
 TLS_DHE_RSA_WITH_AES_256_CBC_SHA
-TLS_RSA_WITH_AES_128_GCM_SHA256
-TLS_RSA_WITH_AES_256_GCM_SHA384
 TLS_RSA_WITH_AES_128_CBC_SHA
 TLS_RSA_WITH_AES_256_CBC_SHA
+TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
+TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256
+TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA
+TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA
 TLS_RSA_WITH_3DES_EDE_CBC_SHA
+TLS_RSA_WITH_AES_128_GCM_SHA256 (Firefox 78)
+TLS_RSA_WITH_AES_256_GCM_SHA384 (Firefox 78)
+TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 (Firefox 97 and Firefox ESR 91.6)
+TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 (Firefox 97 and Firefox ESR 91.6)
+TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 (Firefox 97 and Firefox ESR 91.6)
+TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Firefox 97 and Firefox ESR 91.6)
+TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA (Firefox 97 and Firefox ESR 91.6)
+TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA (Firefox 97 and Firefox ESR 91.6)
+TLS_CHACHA20_POLY1305_SHA256 (Firefox 138, Firefox ESR 128.10)
+TLS_AES_128_GCM_SHA256 (Firefox 138, Firefox ESR 128.10)
+TLS_AES_256_GCM_SHA384 (Firefox 138, Firefox ESR 128.10)
 ```
 
-**Preferences Affected:** `security.ssl3.ecdhe_rsa_aes_128_gcm_sha256`, `security.ssl3.ecdhe_ecdsa_aes_128_gcm_sha256`, `security.ssl3.ecdhe_ecdsa_chacha20_poly1305_sha256`, `security.ssl3.ecdhe_rsa_chacha20_poly1305_sha256`, `security.ssl3.ecdhe_ecdsa_aes_256_gcm_sha384`, `security.ssl3.ecdhe_rsa_aes_256_gcm_sha384`, `security.ssl3.ecdhe_rsa_aes_128_sha`, `security.ssl3.ecdhe_ecdsa_aes_128_sha`, `security.ssl3.ecdhe_rsa_aes_256_sha`, `security.ssl3.ecdhe_ecdsa_aes_256_sha`, `security.ssl3.dhe_rsa_aes_128_sha`, `security.ssl3.dhe_rsa_aes_256_sha`, `security.ssl3.rsa_aes_128_gcm_sha256`, `security.ssl3.rsa_aes_256_gcm_sha384`, `security.ssl3.rsa_aes_128_sha`, `security.ssl3.rsa_aes_256_sha`, `security.ssl3.deprecated.rsa_des_ede3_sha`
+**Preferences Affected:** `security.ssl3.ecdhe_rsa_aes_128_gcm_sha256`, `security.ssl3.ecdhe_ecdsa_aes_128_gcm_sha256`, `security.ssl3.ecdhe_ecdsa_chacha20_poly1305_sha256`, `security.ssl3.ecdhe_rsa_chacha20_poly1305_sha256`, `security.ssl3.ecdhe_ecdsa_aes_256_gcm_sha384`, `security.ssl3.ecdhe_rsa_aes_256_gcm_sha384`, `security.ssl3.ecdhe_rsa_aes_128_sha`, `security.ssl3.ecdhe_ecdsa_aes_128_sha`, `security.ssl3.ecdhe_rsa_aes_256_sha`, `security.ssl3.ecdhe_ecdsa_aes_256_sha`, `security.ssl3.dhe_rsa_aes_128_sha`, `security.ssl3.dhe_rsa_aes_256_sha`, `security.ssl3.rsa_aes_128_gcm_sha256`, `security.ssl3.rsa_aes_256_gcm_sha384`, `security.ssl3.rsa_aes_128_sha`, `security.ssl3.rsa_aes_256_sha`, `security.ssl3.deprecated.rsa_des_ede3_sha`, `security.tls13.chacha20_poly1305_sha256`, `security.tls13.aes_128_gcm_sha256`, `security.tls13.aes_256_gcm_sha384`
 
 ---
 **Note:**
@@ -1757,7 +1806,7 @@ TLS_RSA_WITH_3DES_EDE_CBC_SHA
 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, TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA, TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA38, TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256, TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384, and TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 were added in Firefox 97 and Firefox 91.6)\
+**Compatibility:** Firefox 76, Firefox ESR 68.8\
 **CCK2 Equivalent:** N/A\
 **Preferences Affected:** N/A
 
@@ -3027,7 +3076,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/ExemptDomainFileTypePairsFromFileTypeDownloadWarningsOneLine
 ```
 Value (string):
 ```
@@ -3228,8 +3277,7 @@ Value (string):
     "installation_mode": "force_installed",
     "install_url": "https://addons.mozilla.org/firefox/downloads/latest/adguardadblocker@adguard.com/latest.xpi"
   },
-  {
-    "https-everywhere@eff.org": {
+  "https-everywhere@eff.org": {
     "installation_mode": "allowed",
     "updates_disabled": false
   }
@@ -3646,7 +3694,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/HandlersOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/HandlersOneLine
 ```
 Value (string):
 ```
@@ -4262,7 +4310,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/ManagedBoomarksOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/ManagedBookmarksOneLine
 ```
 Value (string):
 ```
@@ -5474,7 +5522,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/PreferencesOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/PreferencesOneLine
 ```
 Value (string):
 ```
@@ -5964,17 +6012,17 @@ or
 ### SanitizeOnShutdown (Selective)
 Clear data on shutdown.
 
-Note: Starting with Firefox 128, History clears FormData and Downloads as well.
+Note: Starting with Firefox 136, FormData and History have been separated again.
 
 `Cache`
 
 `Cookies`
 
-`Downloads` Download History (*Deprecated*)
+`Downloads` Download History (*Deprecated - part of History*)
 
-`FormData` Form & Search History (*Deprecated*)
+`FormData` Form History
 
-`History` Browsing History, Download History, Form & Search History.
+`History` Browsing History, Download History
 
 `Sessions` Active Logins
 
@@ -5986,12 +6034,13 @@ Note: Starting with Firefox 128, History clears FormData and Downloads as well.
 
 **Compatibility:** Firefox 68, Firefox ESR 68 (Locked added in 74/68.6, History update in Firefox 128)\
 **CCK2 Equivalent:** N/A\
-**Preferences Affected:** `privacy.sanitize.sanitizeOnShutdown`, `privacy.clearOnShutdown.cache`, `privacy.clearOnShutdown.cookies`, `privacy.clearOnShutdown.downloads`, `privacy.clearOnShutdown.formdata`, `privacy.clearOnShutdown.history`, `privacy.clearOnShutdown.sessions`, `privacy.clearOnShutdown.siteSettings`, `privacy.clearOnShutdown.offlineApps`, `privacy.clearOnShutdown_v2.historyFormDataAndDownloads` (Firefox 128), `privacy.clearOnShutdown_v2.cookiesAndStorage` (Firefox 128), `privacy.clearOnShutdown_v2.cache` (Firefox 128), `privacy.clearOnShutdown_v2.siteSettings` (Firefox 128)
+**Preferences Affected:** `privacy.sanitize.sanitizeOnShutdown`, `privacy.clearOnShutdown.cache`, `privacy.clearOnShutdown.cookies`, `privacy.clearOnShutdown.downloads`, `privacy.clearOnShutdown.formdata`, `privacy.clearOnShutdown.history`, `privacy.clearOnShutdown.sessions`, `privacy.clearOnShutdown.siteSettings`, `privacy.clearOnShutdown.offlineApps`, `privacy.clearOnShutdown_v2.historyFormDataAndDownloads` (Firefox 128), `privacy.clearOnShutdown_v2.cookiesAndStorage` (Firefox 128), `privacy.clearOnShutdown_v2.cache` (Firefox 128), `privacy.clearOnShutdown_v2.siteSettings` (Firefox 128), `privacy.clearOnShutdown_v2.formdata` (Firefox 128)
 
 #### Windows (GPO)
 ```
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cache = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Cookies = 0x1 | 0x0
+Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\FormData = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\History = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\Sessions = 0x1 | 0x0
 Software\Policies\Mozilla\Firefox\SanitizeOnShutdown\SiteSettings = 0x1 | 0x0
@@ -6016,6 +6065,14 @@ Value (string):
 ```
 OMA-URI:
 ```
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/E_SanitizeOnShutdown_FormData
+```
+Value (string):
+```
+<enabled/> or <disabled/>
+```
+OMA-URI:
+```
 ./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~SanitizeOnShutdown/E_SanitizeOnShutdown_History
 ```
 Value (string):
@@ -6055,6 +6112,8 @@ Value (string):
     <true/> | <false/>
     <key>Cookies</key>
     <true/> | <false/>
+    <key>FormData</key>
+    <true/> | <false/>
     <key>History</key>
     <true/> | <false/>
     <key>Sessions</key>
@@ -6073,6 +6132,7 @@ Value (string):
     "SanitizeOnShutdown": {
       "Cache": true | false,
       "Cookies": true | false,
+      "FormData": true | false,
       "History": true | false,
       "Sessions": true | false,
       "SiteSettings": true | false,
@@ -6082,7 +6142,7 @@ Value (string):
 }
 ```
 ### SanitizeOnShutdown (All)
-Clear all data on shutdown, including Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data.
+Clear all data on shutdown, including Browsing & Download History, Cookies, Active Logins, Cache, Form History, Site Preferences and Offline Website Data.
 
 **Compatibility:** Firefox 60, Firefox ESR 60\
 **CCK2 Equivalent:** N/A\
@@ -6784,6 +6844,8 @@ Prevent Firefox from messaging the user in certain situations.
 
 `FirefoxLabs` If false, don't show the "Firefox Labs" section in Preferences. (Firefox 130.0.1)
 
+Note: Firefox Labs is now controlled by Nimbus, our testing platform, so disabling telemetry also disables Firefox Labs.
+
 `Locked` prevents the user from changing user messaging preferences.
 
 **Compatibility:** Firefox 75, Firefox ESR 68.7\
@@ -6930,7 +6992,7 @@ to workaround the limit on the length of strings. Put all of your JSON on one li
 
 OMA-URI:
 ```
-./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox~Extensions/WebsiteFilterOneLine
+./Device/Vendor/MSFT/Policy/Config/Firefox~Policy~firefox/WebsiteFilterOneLine
 ```
 Value (string):
 ```
index 1d1c295f14e0ea2e968e2005541980a2d6dd0801..d0fe6a11ebf7546ae8972bf6b0dfe709db3fa291 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.8" schemaVersion="1.0">
+<policyDefinitionResources revision="6.9" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>
@@ -76,6 +76,8 @@
       <string id="SUPPORTED_FF130_ONLY">Firefox 130 oder höher</string>
       <string id="SUPPORTED_FF131">Firefox 131 oder höher, Firefox 128.3 ESR oder höhe</string>
       <string id="SUPPORTED_FF137_ONLY">Firefox 137 oder höher</string>
+      <string id="SUPPORTED_FF138_ONLY">Firefox 138 oder höher</string>
+      <string id="SUPPORTED_FF138">Firefox 138 oder höher, Firefox 128.10 ESR oder höhe</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Berechtigungen</string>
       <string id="Camera_group">Kamera</string>
       <string id="FirefoxSuggest_group">Firefox Suggest (nur USA)</string>
       <string id="ContentAnalysis_group">Verhinderung von Datenverlust (DLP)</string>
       <string id="InterceptionPoints_group">Abfangpunkte</string>
+      <string id="InterceptionPoints_Clipboard_group">Zwischenablage</string>
+      <string id="InterceptionPoints_DragAndDrop_group">Drag-and-Drop</string>
       <string id="Allow">Erlaubte Seiten</string>
       <string id="AllowSession">Erlaubte Seiten (Session Only)</string>
       <string id="Block">Gesperrte Seiten</string>
@@ -897,6 +901,9 @@ Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, können
       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384">TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_CHACHA20_POLY1305_SHA256">TLS_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_128_GCM_SHA256">TLS_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_256_GCM_SHA384">TLS_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_Explain">Wenn diese Richtlinieneinstellung aktiviert ist, ist die ausgewählte Verschlüsselung deaktiviert.
 
 Wenn diese Richtlinieneinstellung deaktiviert ist, ist der ausgewählte Verschlüsselung aktiviert.
@@ -1191,14 +1198,22 @@ Wenn diese Richtlinieneinstellung deaktiviert oder nicht konfiguriert ist, wird
       <string id="ContentAnalysis_ShowBlockedResult_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, zeigt Firefox keine Benachrichtigung an, wenn eine DLP-Anfrage abgelehnt wird.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, zeigt Firefox eine Benachrichtigung an, wenn eine DLP-Anfrage abgelehnt wird.</string>
-      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Zwischenablage</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Aktiviert</string>
       <string id="ContentAnalysis_InterceptionPoints_Clipboard_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird bei Vorgängen in der Zwischenablage kein DLP verwendet.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird bei Vorgängen in der Zwischenablage DLP verwendet.</string>
-      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Drag-and-Drop</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed on the clipboard, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed on the clipboard.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Aktiviert</string>
       <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird bei Drag-and-Drop-Vorgängen kein DLP verwendet.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, verwenden Drag-and-Drop-Vorgänge DLP.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed in what is being dropped, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed in what is being dropped.</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload">Datei-Upload</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird bei Datei-Upload-Vorgängen kein DLP verwendet.
 
@@ -1207,6 +1222,10 @@ Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird be
       <string id="ContentAnalysis_InterceptionPoints_Print_Explain">Wenn diese Richtlinieneinstellung deaktiviert ist, wird bei Druckvorgängen kein DLP verwendet.
 
 Wenn diese Richtlinieneinstellung aktiviert oder nicht konfiguriert ist, wird bei Druckvorgängen DLP verwendet.</string>
+      <string id="ContentAnalysis_TimeoutResult">Timeout Result</string>
+      <string id="ContentAnalysis_TimeoutResult_Explain">If this policy is enabled, you can indicate the desired behavior for DLP requests if the DLP agent does not respond to a request in less than AgentTimeout seconds. 
+
+If this policy is disabled or not configured, the request will be denied.</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:
@@ -1582,6 +1601,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences (E
       <presentation id="Number">
         <decimalTextBox refId="Number"/>
       </presentation>
+      <presentation id="ContentAnalysis_TimeoutResult">
+        <dropdownList refId="ContentAnalysis_TimeoutResult"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
index 0033bbdbedd4bdde739ff2eaa9b2c84fbc23ad06..34f89174c9d2bbd0cb1408e6c857f8d6f7ad9fbf 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.8" schemaVersion="1.0">
+<policyDefinitionResources revision="6.9" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>
@@ -76,6 +76,8 @@
       <string id="SUPPORTED_FF130_ONLY">Firefox 130 or later</string>
       <string id="SUPPORTED_FF131">Firefox 131 or later, Firefox 128.3 ESR or later</string>
       <string id="SUPPORTED_FF137_ONLY">Firefox 137 or later</string>
+      <string id="SUPPORTED_FF138_ONLY">Firefox 138 or later</string>
+      <string id="SUPPORTED_FF138">Firefox 138, Firefox 128.10 ESR</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
       <string id="FirefoxSuggest_group">Firefox Suggest (US only)</string>
       <string id="ContentAnalysis_group">Content Analysis (DLP)</string>
       <string id="InterceptionPoints_group">Interception Points</string>
+      <string id="InterceptionPoints_Clipboard_group">Clipboard</string>
+      <string id="InterceptionPoints_DragAndDrop_group">Drag And Drop</string>
       <string id="Allow">Allowed Sites</string>
       <string id="AllowSession">Allowed Sites (Session Only)</string>
       <string id="Block">Blocked Sites</string>
@@ -897,6 +901,9 @@ If this policy is enabled or not configured, user messaging preferences cannot b
       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384">TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_CHACHA20_POLY1305_SHA256">TLS_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_128_GCM_SHA256">TLS_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_256_GCM_SHA384">TLS_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_Explain">If this policy is enabled, the corresponding cipher is disabled.
 
 If this policy is disabled, the corresponding cipher is enabled.
@@ -1185,14 +1192,22 @@ If this policy is disabled or not configured, the default pipe name of 'path_use
       <string id="ContentAnalysis_ShowBlockedResult_Explain">If this policy is disabled, Firefox will not show a notification when a DLP request is denied.
 
 If this policy is enabled or not configured, Firefox will show a notification when a DLP request is denied.</string>
-      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Clipboard</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Enabled</string>
       <string id="ContentAnalysis_InterceptionPoints_Clipboard_Explain">If this policy is disabled, clipboard operations will not use DLP.
 
 If this policy is enabled or not configured, clipboard operations will use DLP.</string>
-      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Drag And Drop</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed on the clipboard, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed on the clipboard.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Enabled</string>
       <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_Explain">If this policy is disabled, drag and drop operations will not use DLP.
 
 If this policy is enabled or not configured, drag and drop operations will use DLP.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed in what is being dropped, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed in what is being dropped.</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload">File Upload</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload_Explain">If this policy is disabled, file upload operations will not use DLP.
 
@@ -1201,6 +1216,10 @@ If this policy is enabled or not configured, file upload operations will use DLP
       <string id="ContentAnalysis_InterceptionPoints_Print_Explain">If this policy is disabled, print operations will not use DLP.
 
 If this policy is enabled or not configured, print operations will use DLP.</string>
+      <string id="ContentAnalysis_TimeoutResult">Timeout Result</string>
+      <string id="ContentAnalysis_TimeoutResult_Explain">If this policy is enabled, you can indicate the desired behavior for DLP requests if the DLP agent does not respond to a request in less than AgentTimeout seconds. 
+
+If this policy is disabled or not configured, the request will be denied.</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:
@@ -1579,6 +1598,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="Number">
         <decimalTextBox refId="Number"/>
       </presentation>
+      <presentation id="ContentAnalysis_TimeoutResult">
+        <dropdownList refId="ContentAnalysis_TimeoutResult"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
index 83d29c03500add04ccda47dfd9754e499b902bd1..4b9a88811ded79c45a34747d1579dc826877e126 100644 (file)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitions revision="6.8" schemaVersion="1.0">
+<policyDefinitions revision="6.9" schemaVersion="1.0">
   <policyNamespaces>
     <target prefix="firefox" namespace="Mozilla.Policies.Firefox"/>
     <using prefix="Mozilla" namespace="Mozilla.Policies"/>
   </policyNamespaces>
-  <resources minRequiredRevision="6.8"/>
+  <resources minRequiredRevision="6.9"/>
   <supportedOn>
     <definitions>
       <definition name="UNSUPPORTED" displayName="$(string.UNSUPPORTED)"/>
@@ -78,6 +78,7 @@
       <definition name="SUPPORTED_FF130_ONLY" displayName="$(string.SUPPORTED_FF130_ONLY)"/>
       <definition name="SUPPORTED_FF131" displayName="$(string.SUPPORTED_FF131)"/>
       <definition name="SUPPORTED_FF137_ONLY" displayName="$(string.SUPPORTED_FF137_ONLY)"/>
+      <definition name="SUPPORTED_FF138_ONLY" displayName="$(string.SUPPORTED_FF138_ONLY)"/>
     </definitions>
   </supportedOn>
   <categories>
     <category displayName="$(string.InterceptionPoints_group)" name="InterceptionPoints">
       <parentCategory ref="ContentAnalysis"/>
     </category>
+    <category displayName="$(string.InterceptionPoints_Clipboard_group)" name="InterceptionPoints_Clipboard">
+      <parentCategory ref="InterceptionPoints"/>
+    </category>
+    <category displayName="$(string.InterceptionPoints_DragAndDrop_group)" name="InterceptionPoints_DragAndDrop">
+      <parentCategory ref="InterceptionPoints"/>
+    </category>
   </categories>
   <policies>
     <policy name="AppAutoUpdate" class="Both" displayName="$(string.AppAutoUpdate)" explainText="$(string.AppAutoUpdate_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="AppAutoUpdate">
         <decimal value="0"/>
       </disabledValue>
     </policy>
+    <policy name="DisabledCiphers_TLS_CHACHA20_POLY1305_SHA256" class="Both" displayName="$(string.DisabledCiphers_TLS_CHACHA20_POLY1305_SHA256)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_CHACHA20_POLY1305_SHA256">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF138"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_AES_128_GCM_SHA256" class="Both" displayName="$(string.DisabledCiphers_TLS_AES_128_GCM_SHA256)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_AES_128_GCM_SHA256">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF138"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="DisabledCiphers_TLS_AES_256_GCM_SHA384" class="Both" displayName="$(string.DisabledCiphers_TLS_AES_256_GCM_SHA384)" explainText="$(string.DisabledCiphers_Explain)" key="Software\Policies\Mozilla\Firefox\DisabledCiphers" valueName="TLS_AES_256_GCM_SHA384">
+      <parentCategory ref="DisabledCiphers"/>
+      <supportedOn ref="SUPPORTED_FF138"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy name="EncryptedMediaExtensions_Enabled" class="Both" displayName="$(string.EncryptedMediaExtensions_Enabled)" explainText="$(string.EncryptedMediaExtensions_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\EncryptedMediaExtensions" valueName="Enabled">
       <parentCategory ref="EncryptedMediaExtensions"/>
       <supportedOn ref="SUPPORTED_FF77"/>
     </policy>
     <policy name="ContentAnalysis_AgentName" class="Both" displayName="$(string.ContentAnalysis_AgentName)" explainText="$(string.ContentAnalysis_AgentName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <text id="String" valueName="AgentName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AgentTimeout" class="Both" displayName="$(string.ContentAnalysis_AgentTimeout)" explainText="$(string.ContentAnalysis_AgentTimeout_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.Number)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <decimal id="Number" valueName="AgentTimeout"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_AllowUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_AllowUrlRegexList)" explainText="$(string.ContentAnalysis_AllowUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <text id="String" valueName="AllowUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_BypassForSameTabOperations" class="Both" displayName="$(string.ContentAnalysis_BypassForSameTabOperations)" explainText="$(string.ContentAnalysis_BypassForSameTabOperations_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="BypassForSameTabOperations">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
     </policy>
     <policy name="ContentAnalysis_ClientSignature" class="Both" displayName="$(string.ContentAnalysis_ClientSignature)" explainText="$(string.ContentAnalysis_ClientSignature_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <text id="String" valueName="ClientSignature"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_DefaultResult" class="Both" displayName="$(string.ContentAnalysis_DefaultResult)" explainText="$(string.ContentAnalysis_DefaultResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.ContentAnalysis_DefaultResult)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <enum id="ContentAnalysis_DefaultResult" valueName="DefaultResult">
           <item displayName="$(string.ContentAnalysis_DefaultResult_0)">
     </policy>
     <policy name="ContentAnalysis_DenyUrlRegexList" class="Both" displayName="$(string.ContentAnalysis_DenyUrlRegexList)" explainText="$(string.ContentAnalysis_DenyUrlRegexList_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <text id="String" valueName="DenyUrlRegexList"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_Enabled" class="Both" displayName="$(string.ContentAnalysis_Enabled)" explainText="$(string.ContentAnalysis_Enabled_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="Enabled">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
     </policy>
     <policy name="ContentAnalysis_IsPerUser" class="Both" displayName="$(string.ContentAnalysis_IsPerUser)" explainText="$(string.ContentAnalysis_IsPerUser_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="IsPerUser">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
     </policy>
     <policy name="ContentAnalysis_PipePathName" class="Both" displayName="$(string.ContentAnalysis_PipePathName)" explainText="$(string.ContentAnalysis_PipePathName_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.String)">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <elements>
         <text id="String" valueName="PipePathName"/>
       </elements>
     </policy>
     <policy name="ContentAnalysis_ShowBlockedResult" class="Both" displayName="$(string.ContentAnalysis_ShowBlockedResult)" explainText="$(string.ContentAnalysis_ShowBlockedResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" valueName="ShowBlockedResult">
       <parentCategory ref="ContentAnalysis"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       </disabledValue>
     </policy>
     <policy name="ContentAnalysis_InterceptionPoints_Clipboard" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_Clipboard)" explainText="$(string.ContentAnalysis_InterceptionPoints_Clipboard_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Clipboard" valueName="Enabled">
-      <parentCategory ref="InterceptionPoints"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <parentCategory ref="InterceptionPoints_Clipboard"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly)" explainText="$(string.ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Clipboard" valueName="PlainTextOnly">
+      <parentCategory ref="InterceptionPoints_Clipboard"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
       </disabledValue>
     </policy>
     <policy name="ContentAnalysis_InterceptionPoints_DragAndDrop" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_DragAndDrop)" explainText="$(string.ContentAnalysis_InterceptionPoints_DragAndDrop_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\DragAndDrop" valueName="Enabled">
-      <parentCategory ref="InterceptionPoints"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <parentCategory ref="InterceptionPoints_DragAndDrop"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly)" explainText="$(string.ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\DragAndDrop" valueName="PlainTextEnabled">
+      <parentCategory ref="InterceptionPoints_DragAndDrop"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
     </policy>
     <policy name="ContentAnalysis_InterceptionPoints_FileUpload" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_FileUpload)" explainText="$(string.ContentAnalysis_InterceptionPoints_FileUpload_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\FileUpload" valueName="Enabled">
       <parentCategory ref="InterceptionPoints"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
     </policy>
     <policy name="ContentAnalysis_InterceptionPoints_Print" class="Both" displayName="$(string.ContentAnalysis_InterceptionPoints_Print)" explainText="$(string.ContentAnalysis_InterceptionPoints_Print_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis\InterceptionPoints\Print" valueName="Enabled">
       <parentCategory ref="InterceptionPoints"/>
-      <supportedOn ref="SUPPORTED_FF137_ONLY"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
         <decimal value="0"/>
       </disabledValue>
     </policy>
-  </policies>
+    <policy name="ContentAnalysis_TimeoutResult" class="Both" displayName="$(string.ContentAnalysis_TimeoutResult)" explainText="$(string.ContentAnalysis_TimeoutResult_Explain)" key="Software\Policies\Mozilla\Firefox\ContentAnalysis" presentation="$(presentation.ContentAnalysis_TimeoutResult)">
+      <parentCategory ref="ContentAnalysis"/>
+      <supportedOn ref="SUPPORTED_FF138_ONLY"/>
+        <elements>
+        <enum id="ContentAnalysis_TimeoutResult" valueName="TimeoutResult">
+          <item displayName="$(string.ContentAnalysis_DefaultResult_0)">
+            <value>
+              <decimal value="0"/>
+            </value>
+          </item>
+          <item displayName="$(string.ContentAnalysis_DefaultResult_1)">
+            <value>
+              <decimal value="1"/>
+            </value>
+          </item>
+          <item displayName="$(string.ContentAnalysis_DefaultResult_2)">
+            <value>
+              <decimal value="2"/>
+            </value>
+          </item>
+        </enum>
+      </elements>
+    </policy>  </policies>
 </policyDefinitions>
index c6f25eeb8c41cee9ede503fd35152a71dce44d92..30ca46e25cf2a04bf90c1e9644eba91da9f84174 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.8" schemaVersion="1.0">
+<policyDefinitionResources revision="6.9" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>
@@ -76,6 +76,8 @@
       <string id="SUPPORTED_FF130_ONLY">Firefox 130 ou supérieur</string>
       <string id="SUPPORTED_FF131">Firefox 131 ou supérieur, Firefox 128.3 ESR ou supérieur</string>
       <string id="SUPPORTED_FF137_ONLY">Firefox 137 ou supérieur</string>
+      <string id="SUPPORTED_FF138_ONLY">Firefox 138 ou supérieur</string>
+      <string id="SUPPORTED_FF138">Firefox 138 ou supérieur, Firefox 128.10 ESR ou supérieur</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Caméra</string>
       <string id="FirefoxSuggest_group">Firefox Suggest (US seulement)</string>
       <string id="ContentAnalysis_group">Content Analysis (DLP)</string>
       <string id="InterceptionPoints_group">Interception Points</string>
+      <string id="InterceptionPoints_Clipboard_group">Clipboard</string>
+      <string id="InterceptionPoints_DragAndDrop_group">Drag And Drop</string>
       <string id="Allow">Sites autorisés</string>
       <string id="AllowSession">Sites autorisés (Session seulement)</string>
       <string id="Block">Sites bloqués</string>
@@ -897,6 +901,9 @@ Si cette stratégie est activée ou non configurée, les préférences de messag
       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384">TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_CHACHA20_POLY1305_SHA256">TLS_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_128_GCM_SHA256">TLS_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_256_GCM_SHA384">TLS_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_Explain">Si cette stratégie est activée, le chiffrement correspondant est désactivé.
 
 Si cette stratégie est désactivée, le chiffrement correspondant est activé.
@@ -1185,14 +1192,22 @@ If this policy is disabled or not configured, the default pipe name of 'path_use
       <string id="ContentAnalysis_ShowBlockedResult_Explain">If this policy is disabled, Firefox will not show a notification when a DLP request is denied.
 
 If this policy is enabled or not configured, Firefox will show a notification when a DLP request is denied.</string>
-      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Clipboard</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Enabled</string>
       <string id="ContentAnalysis_InterceptionPoints_Clipboard_Explain">If this policy is disabled, clipboard operations will not use DLP.
 
 If this policy is enabled or not configured, clipboard operations will use DLP.</string>
-      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Drag And Drop</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed on the clipboard, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed on the clipboard.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Enabled</string>
       <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_Explain">If this policy is disabled, drag and drop operations will not use DLP.
 
 If this policy is enabled or not configured, drag and drop operations will use DLP.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed in what is being dropped, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed in what is being dropped.</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload">File Upload</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload_Explain">If this policy is disabled, file upload operations will not use DLP.
 
@@ -1201,6 +1216,10 @@ If this policy is enabled or not configured, file upload operations will use DLP
       <string id="ContentAnalysis_InterceptionPoints_Print_Explain">If this policy is disabled, print operations will not use DLP.
 
 If this policy is enabled or not configured, print operations will use DLP.</string>
+      <string id="ContentAnalysis_TimeoutResult">Timeout Result</string>
+      <string id="ContentAnalysis_TimeoutResult_Explain">If this policy is enabled, you can indicate the desired behavior for DLP requests if the DLP agent does not respond to a request in less than AgentTimeout seconds. 
+
+If this policy is disabled or not configured, the request will be denied.</string>
       <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".
 
 Pour une description de la préférence, consultez :
@@ -1579,6 +1598,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="Number">
         <decimalTextBox refId="Number"/>
       </presentation>
+      <presentation id="ContentAnalysis_TimeoutResult">
+        <dropdownList refId="ContentAnalysis_TimeoutResult"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>
index 57f753f3e658ded7c4cbe4f4d0a231a6274cb457..e7520c7c1ace331d485a091f8b5cff0ecb480dd9 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<policyDefinitionResources revision="6.8" schemaVersion="1.0">
+<policyDefinitionResources revision="6.9" schemaVersion="1.0">
   <displayName/>
   <description/>
   <resources>
@@ -77,6 +77,8 @@
       <string id="SUPPORTED_FF130_ONLY">Firefox 130 или более поздние версии</string>
       <string id="SUPPORTED_FF131">Firefox 131 или более поздние версии, Firefox 128.3 ESR или более поздние версии</string>
       <string id="SUPPORTED_FF137_ONLY">Firefox 137 или более поздние версии</string>
+      <string id="SUPPORTED_FF138_ONLY">Firefox 138 или более поздние версии</string>
+      <string id="SUPPORTED_FF138">Firefox 138 или более поздние версии, Firefox 128.10 ESR или более поздние версии</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Разрешения</string>
       <string id="Camera_group">Камера</string>
       <string id="FirefoxSuggest_group">Firefox Suggest (US only)</string>
       <string id="ContentAnalysis_group">Content Analysis (DLP)</string>
       <string id="InterceptionPoints_group">Interception Points</string>
+      <string id="InterceptionPoints_Clipboard_group">Clipboard</string>
+      <string id="InterceptionPoints_DragAndDrop_group">Drag And Drop</string>
       <string id="Allow">Разрешённые сайты</string>
       <string id="AllowSession">Разрешённые сайты (Session Only)</string>
       <string id="Block">Заблокированные сайты</string>
@@ -900,6 +904,9 @@ Mozilla рекомендует не отключать телеметрию. И
       <string id="DisabledCiphers_TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384">TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256">TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_CHACHA20_POLY1305_SHA256">TLS_CHACHA20_POLY1305_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_128_GCM_SHA256">TLS_AES_128_GCM_SHA256</string>
+      <string id="DisabledCiphers_TLS_AES_256_GCM_SHA384">TLS_AES_256_GCM_SHA384</string>
       <string id="DisabledCiphers_Explain">Если эта политика включена, соответствующий шифр отключен.
 
 Если эта политика отключена, соответствующий шифр включен.
@@ -1188,14 +1195,22 @@ If this policy is disabled or not configured, the default pipe name of 'path_use
       <string id="ContentAnalysis_ShowBlockedResult_Explain">If this policy is disabled, Firefox will not show a notification when a DLP request is denied.
 
 If this policy is enabled or not configured, Firefox will show a notification when a DLP request is denied.</string>
-      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Clipboard</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard">Enabled</string>
       <string id="ContentAnalysis_InterceptionPoints_Clipboard_Explain">If this policy is disabled, clipboard operations will not use DLP.
 
 If this policy is enabled or not configured, clipboard operations will use DLP.</string>
-      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Drag And Drop</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_Clipboard_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed on the clipboard, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed on the clipboard.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop">Enabled</string>
       <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_Explain">If this policy is disabled, drag and drop operations will not use DLP.
 
 If this policy is enabled or not configured, drag and drop operations will use DLP.</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly">Plain Text Only</string>
+      <string id="ContentAnalysis_InterceptionPoints_DragAndDrop_PlainTextOnly_Explain">If this policy is disabled, all formats will be analyzed in what is being dropped, which some DLP agents may not expect.
+
+If this policy is enabled or not configured, only the text/plain format will be analyzed in what is being dropped.</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload">File Upload</string>
       <string id="ContentAnalysis_InterceptionPoints_FileUpload_Explain">If this policy is disabled, file upload operations will not use DLP.
 
@@ -1204,6 +1219,10 @@ If this policy is enabled or not configured, file upload operations will use DLP
       <string id="ContentAnalysis_InterceptionPoints_Print_Explain">If this policy is disabled, print operations will not use DLP.
 
 If this policy is enabled or not configured, print operations will use DLP.</string>
+      <string id="ContentAnalysis_TimeoutResult">Timeout Result</string>
+      <string id="ContentAnalysis_TimeoutResult_Explain">If this policy is enabled, you can indicate the desired behavior for DLP requests if the DLP agent does not respond to a request in less than AgentTimeout seconds. 
+
+If this policy is disabled or not configured, the request will be denied.</string>
       <string id="Preferences_Boolean_Explain">Если эта политика включена, предпочтение заблокировано на true. Если эта политика отключена, предпочтение заблокировано на false.
 
 Описание предпочтения см.:
@@ -1582,6 +1601,9 @@ https://github.com/mozilla/policy-templates/blob/master/README.md#preferences.</
       <presentation id="Number">
         <decimalTextBox refId="Number"/>
       </presentation>
+      <presentation id="ContentAnalysis_TimeoutResult">
+        <dropdownList refId="ContentAnalysis_TimeoutResult"/>
+      </presentation>
     </presentationTable>
   </resources>
 </policyDefinitionResources>

patrick-canterino.de