From fde8a70c01c7089f5a1802db87a63901f4484ac0 Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 13 Aug 2024 17:31:46 -0400
Subject: [PATCH] Additional DLP policies

---
 windows/en-US/firefox.adml | 8 ++++++--
 windows/firefox.admx       | 7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 67c9ac4..90c964e 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -1119,10 +1119,14 @@ If this policy is disabled or not configured, HTTPS-Only Mode is not enabled.</s
       <string id="HttpAllowlist_Explain">If this policy is enabled, you can specify a list origins that will not be upgraded to HTTPS.
 
 If this policy is disabled or not configured, all origins are upgraded to HTTPS if HTTPS-Only Mode is enabled.</string>
+      <string id="ContentAnalysis_AgentName">Agent Name</string>
+      <string id="ContentAnalysis_AgentName_Explain">If this policy is enabled, you can specify the name of the DLP agent, used in dialogs and notifications about DLP operations.
+
+If this policy is disabled or not configured, the agent name "A DLP Agent" is used.</string>
       <string id="ContentAnalysis_AgentTimeout">Agent Timeout</string>
-      <string id="ContentAnalysis_AgentTimeout_Explain">If this policy is enabled, you can specify 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|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.
+      <string id="ContentAnalysis_AgentTimeout_Explain">If this policy is enabled, you can specify 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.
 
-If this policy is disabled or not configured, the DLP agent will always be consulted.</string>
+If this policy is disabled or not configured, the timeout is 30 seconds.</string>
       <string id="ContentAnalysis_AllowUrlRegexList">Allow Url Regex List</string>
       <string id="ContentAnalysis_AllowUrlRegexList_Explain">If this policy is enabled, you can specify 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|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.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 0823d55..9311483 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -4273,6 +4273,13 @@
         <list id="List" key="Software\Policies\Mozilla\Firefox\HttpAllowlist" valuePrefix=""/>
       </elements>
     </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_FF130"/>
+      <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_FF130"/>
-- 
2.43.0