From c6cd57bfd883aef8ac9bfcdab5016b43a9ec1b11 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Tue, 18 Mar 2014 20:38:35 -0400
Subject: [PATCH] Added extensions, made them all lower case, fixed default
 settings

---
 .../FileExtMismatchIngestModule.java            |  8 +++++---
 .../fileextmismatch/FileExtMismatchXML.java     | 12 ++++++------
 .../autopsy/fileextmismatch/mismatch_config.xml | 17 +++++++++++++++--
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
index 6243d80530..61c0d3ff52 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchIngestModule.java
@@ -60,8 +60,10 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
     private static long processTime = 0;
     private static int messageId = 0;
     private static long numFiles = 0;
+    // note: because of current design, these values must be in sync with default GUI values
+    // they only get updated when the user changes from the default UI values
     private static boolean skipNoExt = true;
-    private static boolean skipTextPlain = false;  
+    private static boolean skipTextPlain = true;  
      
     private FileExtMismatchSimpleConfigPanel simpleConfigPanel;
     private FileExtMismatchConfigPanel advancedConfigPanel;
@@ -267,10 +269,10 @@ public class FileExtMismatchIngestModule extends org.sleuthkit.autopsy.ingest.In
         return false;
     }
 
-    public static void setSkipNoExt(boolean flag) {
+    protected static void setSkipNoExt(boolean flag) {
         skipNoExt = flag;
     }               
-    public static void setSkipTextPlain(boolean flag) {
+    protected static void setSkipTextPlain(boolean flag) {
         skipTextPlain = flag;
     }
 }
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
index b93708308c..8fe9e84a89 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
@@ -153,20 +153,20 @@ class FileExtMismatchXML {
             Element rootEl = doc.createElement(ROOT_EL);
             doc.appendChild(rootEl);
             
-            ArrayList<String> appTypeList = new ArrayList<>(sigTypeToExtMap.keySet());
-            Collections.sort(appTypeList);
+            ArrayList<String> mimeTypeList = new ArrayList<>(sigTypeToExtMap.keySet());
+            Collections.sort(mimeTypeList);
             
-            for (String appType : appTypeList) {
+            for (String mimeType : mimeTypeList) {
                 Element sigEl = doc.createElement(SIG_EL);
-                sigEl.setAttribute(SIG_MIMETYPE_ATTR, appType);
+                sigEl.setAttribute(SIG_MIMETYPE_ATTR, mimeType.toLowerCase());
                 
-                String[] extArray = sigTypeToExtMap.get(appType);
+                String[] extArray = sigTypeToExtMap.get(mimeType);
                 if (extArray != null) {
                     ArrayList<String> extList = new ArrayList<>(Arrays.asList(extArray));
                     Collections.sort(extList);
                     for (String ext : extList) {
                         Element extEl = doc.createElement(EXT_EL);
-                        extEl.setTextContent(ext);
+                        extEl.setTextContent(ext.toLowerCase());
                         sigEl.appendChild(extEl);
                     }
                 }
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
index d689d2f6b9..476c5e78b5 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
@@ -69,8 +69,9 @@
   <ext>tgz</ext>
  </signature>
  <signature mimetype="application/x-msoffice">
-  <ext>automaticDestinations-ms</ext>
-  <ext>customDestinations-ms</ext>
+  <ext>automaticdestinations-ms</ext>
+  <ext>bag</ext>
+  <ext>customdestinations-ms</ext>
   <ext>db</ext>
   <ext>db.keep</ext>
   <ext>doc</ext>
@@ -79,6 +80,7 @@
   <ext>dot</ext>
   <ext>dotm</ext>
   <ext>dotx</ext>
+  <ext>dpb</ext>
   <ext>feed-ms</ext>
   <ext>gra</ext>
   <ext>msi</ext>
@@ -139,6 +141,7 @@
   <ext>ppsm</ext>
   <ext>pptm</ext>
   <ext>pptx</ext>
+  <ext>vs</ext>
   <ext>wmz</ext>
   <ext>xlam</ext>
   <ext>xlsb</ext>
@@ -251,6 +254,7 @@
  <signature mimetype="text/plain">
   <ext>acro</ext>
   <ext>adm</ext>
+  <ext>admx</ext>
   <ext>aff</ext>
   <ext>arff</ext>
   <ext>ashx</ext>
@@ -263,6 +267,7 @@
   <ext>c</ext>
   <ext>catalog</ext>
   <ext>cc</ext>
+  <ext>cdxml</ext>
   <ext>cfg</ext>
   <ext>chs</ext>
   <ext>cht</ext>
@@ -308,6 +313,7 @@
   <ext>iem</ext>
   <ext>inc</ext>
   <ext>inf</ext>
+  <ext>inf_loc</ext>
   <ext>ini</ext>
   <ext>ins</ext>
   <ext>iqy</ext>
@@ -356,7 +362,11 @@
   <ext>properties</ext>
   <ext>prx</ext>
   <ext>ps</ext>
+  <ext>ps1</ext>
+  <ext>ps1xml</ext>
+  <ext>psd1</ext>
   <ext>psm</ext>
+  <ext>psm1</ext>
   <ext>psp</ext>
   <ext>py</ext>
   <ext>pyw</ext>
@@ -397,10 +407,12 @@
   <ext>winprf_backup</ext>
   <ext>wpl</ext>
   <ext>wsdl</ext>
+  <ext>xaml</ext>
   <ext>xdc</ext>
   <ext>xdr</ext>
   <ext>xhtml</ext>
   <ext>xml</ext>
+  <ext>xrm-ms</ext>
   <ext>xsd</ext>
   <ext>xsl</ext>
   <ext>xsml</ext>
@@ -421,6 +433,7 @@
   <ext>mpv</ext>
  </signature>
  <signature mimetype="video/quicktime">
+  <ext>m4a</ext>
   <ext>mov</ext>
   <ext>mp4</ext>
   <ext>qt</ext>