From 2e8c6070d6f86be19372340cffa2fa566bc84c79 Mon Sep 17 00:00:00 2001
From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Tue, 3 Mar 2020 11:35:34 -0600
Subject: [PATCH] Add Locked to SanitizeOnShutdown policy, correct registry
 paths, add explanations.

---
 windows/en-US/firefox.adml | 41 ++++++++++++++++++++++++++++--------
 windows/firefox.admx       | 43 ++++++++++++++++++++++++--------------
 2 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 65231b1..11cdfec 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -21,6 +21,7 @@
       <string id="SUPPORTED_FF71">Firefox 71 or later, Firefox 68.3 ESR or later</string>
       <string id="SUPPORTED_FF72">Firefox 72 or later, Firefox 68.4 ESR or later</string>
       <string id="SUPPORTED_FF73">Firefox 73 or later, Firefox 68.5 ESR or later</string>
+      <string id="SUPPORTED_FF74">Firefox 74 or later, Firefox 68.6 ESR or later</string>
       <string id="firefox">Firefox</string>
       <string id="Permissions_group">Permissions</string>
       <string id="Camera_group">Camera</string>
@@ -407,28 +408,50 @@ If this policy is disabled or not configured, the first run page is displayed.</
       <string id="OverridePostUpdatePage_Explain">If this policy is enabled, you can specify a URL to be displayed after Firefox is updated. If you leave the URL blank, no upgrade page will be shown.
 
 If this policy is disabled or not configured, the upgrade is displayed.</string>
-      <string id="SanitizeOnShutdown">Clear data when browser is closed</string>
+      <string id="SanitizeOnShutdown">Clear data when browser is closed (Moved)</string>
       <string id="SanitizeOnShutdown_Explain">If this policy is enabled, you can choose data to be cleared when Firefox is closed.
 
 If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_group">Clear data when browser is closed</string>
 
       <string id="SanitizeOnShutdown_Cache">Cache</string>
-      <string id="SanitizeOnShutdown_Cache_Explain">Cache</string>
+      <string id="SanitizeOnShutdown_Cache_Explain">If the policy is enabled, the cache is cleared when the browser is closed.
+
+If this policy is disabled or not configured, the cache is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_Cookies">Cookies</string>
-      <string id="SanitizeOnShutdown_Cookies_Explain">Cookies</string>
+      <string id="SanitizeOnShutdown_Cookies_Explain">If the policy is enabled, cookies are cleared when the browser is closed.
+
+If this policy is disabled or not configured, cookies are not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_Downloads">Download History</string>
-      <string id="SanitizeOnShutdown_Downloads_Explain">Download History</string>
+      <string id="SanitizeOnShutdown_Downloads_Explain">If the policy is enabled, download history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, download history is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_FormData">Form &amp; Search History</string>
-      <string id="SanitizeOnShutdown_FormData_Explain">Form &amp; Search History</string>
+      <string id="SanitizeOnShutdown_FormData_Explain">If the policy is enabled, form data is cleared when the browser is closed.
+
+If this policy is disabled or not configured, form data is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_History">Browsing History</string>
-      <string id="SanitizeOnShutdown_History_Explain">Browsing History</string>
+      <string id="SanitizeOnShutdown_History_Explain">If the policy is enabled, browsing history is cleared when the browser is closed.
+
+If this policy is disabled or not configured, browsing history is not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_Sessions">Active Logins</string>
-      <string id="SanitizeOnShutdown_Sessions_Explain">Active Logins</string>
+      <string id="SanitizeOnShutdown_Sessions_Explain">If the policy is enabled, sessions cleared when the browser is closed.
+
+If this policy is disabled or not configured, sessions not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_SiteSettings">Site Preferences</string>
-      <string id="SanitizeOnShutdown_SiteSettings_Explain">Site Preferences</string>
+      <string id="SanitizeOnShutdown_SiteSettings_Explain">If the policy is enabled, sire preferences arecleared when the browser is closed.
+
+If this policy is disabled or not configured, site preferences not cleared when the browser is closed.</string>
       <string id="SanitizeOnShutdown_OfflineApps">Offline Website Data</string>
-      <string id="SanitizeOnShutdown_OfflineApps_Explain">Offline Website Data</string>
+      <string id="SanitizeOnShutdown_OfflineApps_Explain">If the policy is enabled, offline application storage is cleared when the browser is closed.
+
+If this policy is disabled or not configured, offline application storage is not cleared when the browser is closed.</string>
+      <string id="SanitizeOnShutdown_Locked">Locked</string>
+      <string id="SanitizeOnShutdown_Locked_Explain">If this policy is disabled, all shutdown preferences can be changed by the user.
+
+If this policy is enabled, any shutdown preferences explicitly set via policy cannot be changed by the user.
+
+If this policy is not configured, no shutdown preferences can be changed by the user (previous behavior).</string>
       <string id="WebsiteFilter_Block">Blocked websites</string>
       <string id="WebsiteFilter_Block_Explain">If this policy is enabled, you can specify match patterns that indicate sites to be blocked. The match patterns are documented at https://developer.mozilla.org/en-US/Add-ons/WebExtensions/Match_patterns. Only http/https addresses are supported at the moment. There is a 1000 entry limit.
 
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 5d460f6..94c77b3 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -22,6 +22,7 @@
       <definition name="SUPPORTED_FF71" displayName="$(string.SUPPORTED_FF71)"/>
       <definition name="SUPPORTED_FF72" displayName="$(string.SUPPORTED_FF72)"/>
       <definition name="SUPPORTED_FF73" displayName="$(string.SUPPORTED_FF73)"/>
+      <definition name="SUPPORTED_FF74" displayName="$(string.SUPPORTED_FF74)"/>
       <definition name="SUPPORTED_FF68ESR" displayName="$(string.SUPPORTED_FF68ESR)"/>
     </definitions>
   </supportedOn>
@@ -3135,9 +3136,9 @@
         <text id="Preferences_String" valueName="widget.content.gtk-theme-override" required="true" />
       </elements>
     </policy>
-    <policy name="SanitizeOnShutdown_Cache" class="Both" displayName="$(string.SanitizeOnShutdown_Cache)" explainText="$(string.SanitizeOnShutdown_Cache_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Cache">
+    <policy name="A_SanitizeOnShutdown_Cache" class="Both" displayName="$(string.SanitizeOnShutdown_Cache)" explainText="$(string.SanitizeOnShutdown_Cache_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Cache">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3145,9 +3146,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_Cookies" class="Both" displayName="$(string.SanitizeOnShutdown_Cookies)" explainText="$(string.SanitizeOnShutdown_Cookies_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Cookies">
+    <policy name="B_SanitizeOnShutdown_Cookies" class="Both" displayName="$(string.SanitizeOnShutdown_Cookies)" explainText="$(string.SanitizeOnShutdown_Cookies_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Cookies">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3155,9 +3156,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_Downloads" class="Both" displayName="$(string.SanitizeOnShutdown_Downloads)" explainText="$(string.SanitizeOnShutdown_Downloads_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Downloads">
+    <policy name="C_SanitizeOnShutdown_Downloads" class="Both" displayName="$(string.SanitizeOnShutdown_Downloads)" explainText="$(string.SanitizeOnShutdown_Downloads_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Downloads">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3165,9 +3166,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_FormData" class="Both" displayName="$(string.SanitizeOnShutdown_FormData)" explainText="$(string.SanitizeOnShutdown_FormData_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="FormData">
+    <policy name="D_SanitizeOnShutdown_FormData" class="Both" displayName="$(string.SanitizeOnShutdown_FormData)" explainText="$(string.SanitizeOnShutdown_FormData_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="FormData">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3175,9 +3176,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_History" class="Both" displayName="$(string.SanitizeOnShutdown_History)" explainText="$(string.SanitizeOnShutdown_History_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="History">
+    <policy name="E_SanitizeOnShutdown_History" class="Both" displayName="$(string.SanitizeOnShutdown_History)" explainText="$(string.SanitizeOnShutdown_History_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="History">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3185,9 +3186,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_Sessions" class="Both" displayName="$(string.SanitizeOnShutdown_Sessions)" explainText="$(string.SanitizeOnShutdown_Sessions_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="Sessions">
+    <policy name="F_SanitizeOnShutdown_Sessions" class="Both" displayName="$(string.SanitizeOnShutdown_Sessions)" explainText="$(string.SanitizeOnShutdown_Sessions_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Sessions">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3195,9 +3196,9 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_SiteSettings" class="Both" displayName="$(string.SanitizeOnShutdown_SiteSettings)" explainText="$(string.SanitizeOnShutdown_SiteSettings_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SiteSettings">
+    <policy name="G_SanitizeOnShutdown_SiteSettings" class="Both" displayName="$(string.SanitizeOnShutdown_SiteSettings)" explainText="$(string.SanitizeOnShutdown_SiteSettings_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="SiteSettings">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
@@ -3205,9 +3206,19 @@
         <decimal value="0"/>
       </disabledValue>
     </policy>
-    <policy name="SanitizeOnShutdown_OfflineApps" class="Both" displayName="$(string.SanitizeOnShutdown_OfflineApps)" explainText="$(string.SanitizeOnShutdown_OfflineApps_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="OfflineApps">
+    <policy name="H_SanitizeOnShutdown_OfflineApps" class="Both" displayName="$(string.SanitizeOnShutdown_OfflineApps)" explainText="$(string.SanitizeOnShutdown_OfflineApps_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="OfflineApps">
       <parentCategory ref="SanitizeOnShutdown"/>
-      <supportedOn ref="SUPPORTED_FF68"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
+    <policy name="H_SanitizeOnShutdown_Locked" class="Both" displayName="$(string.SanitizeOnShutdown_Locked)" explainText="$(string.SanitizeOnShutdown_Locked_Explain)" key="Software\Policies\Mozilla\Firefox\SanitizeOnShutdown" valueName="Locked">
+      <parentCategory ref="SanitizeOnShutdown"/>
+      <supportedOn ref="SUPPORTED_FF74"/>
       <enabledValue>
         <decimal value="1"/>
       </enabledValue>
-- 
2.34.1