From 2ec02ee649c02648e2ae20ec813e7c118510219e Mon Sep 17 00:00:00 2001
From: Michael Kaply <consulting@kaply.com>
Date: Mon, 9 Apr 2018 10:03:20 -0500
Subject: [PATCH] SanitizeOnShutdown policy

---
 README.md                  | 11 ++++++++++-
 windows/en-US/firefox.adml |  4 ++++
 windows/firefox.admx       | 10 ++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4ca48a0..4cc4496 100644
--- a/README.md
+++ b/README.md
@@ -392,7 +392,7 @@ This policy allowed you to override the upgrade page page. If you leave the URL
 ```
 {
   "policies": {
-    "OverridePostUpdatePagep": "http://example.org"
+    "OverridePostUpdatePage": "http://example.org"
   }
 }
 ```
@@ -436,3 +436,12 @@ To specify ports, append them to the hostnames with a colon (:). If Locked is se
   }
 }
 ```
+### SanitizeOnShutdown
+If this policy is set to true,  all data is cleared when Firefox is closed. This includes Browsing & Download History, Cookies, Active Logins, Cache, Form & Search History, Site Preferences and Offline Website Data.
+```
+{
+  "policies": {
+    "SanitizeOnShutdown": [true|false]
+  }
+}
+```
diff --git a/windows/en-US/firefox.adml b/windows/en-US/firefox.adml
index 7e962f8..42113ab 100644
--- a/windows/en-US/firefox.adml
+++ b/windows/en-US/firefox.adml
@@ -175,6 +175,10 @@ If this policy is disabled or not configured the first run page is displayed.</s
       <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 all data when browser is closed</string>
+      <string id="SanitizeOnShutdown_Explain">If this policy is enabled, all data is cleared when Firefox is closed. This includes Browsing &amp; Download History, Cookies, Active Logins, Cache, Form &amp; Search History, Site Preferences and Offline Website Data.
+
+If this policy is disabled or not configured, data is not cleared when the browser is closed.</string>
       <string id="Bookmark1">Bookmark 1</string>
       <string id="Bookmark2">Bookmark 2</string>
       <string id="Bookmark3">Bookmark 3</string>
diff --git a/windows/firefox.admx b/windows/firefox.admx
index 07862d3..f8589c6 100644
--- a/windows/firefox.admx
+++ b/windows/firefox.admx
@@ -558,6 +558,16 @@
         <text id="OverridePage" valueName="OverridePostUpdatePage"/>
       </elements>
     </policy>
+    <policy name="SanitizeOnShutdown" class="Both" displayName="$(string.SanitizeOnShutdown)" explainText="$(string.SanitizeOnShutdown_Explain)" key="Software\Policies\Mozilla\Firefox" valueName="SanitizeOnShutdown">
+      <parentCategory ref="firefox"/>
+      <supportedOn ref="SUPPORTED_WINXPSP2"/>
+      <enabledValue>
+        <decimal value="1"/>
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0"/>
+      </disabledValue>
+    </policy>
     <policy class="Both" displayName="$(string.HomepageURL)" name="HomepageURL" explainText="$(string.HomepageURL_Explain)" key="Software\Policies\Mozilla\Firefox\Homepage" presentation="$(presentation.HomepageURL)" >
       <parentCategory ref="Homepage" />
       <supportedOn ref="SUPPORTED_WINXPSP2" />
-- 
2.34.1