Merge remote-tracking branch 'upstream/develop' into aut-1900

Core/src/org/sleuthkit/autopsy/events/MessageServiceConnectionInfo.java

@@ -144,7 +144,7 @@ public final class MessageServiceConnectionInfo {
         } catch (JMSException ex) {
             String result;
             Throwable cause = ex.getCause();
-            if (cause != null) {
+            if (null != cause && null != cause.getMessage()) {
                 // there is more information from another exception
                 String msg = cause.getMessage();
                 if (msg.startsWith(CONNECTION_TIMED_OUT)) {

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties

@@ -52,3 +52,4 @@ FileExtMismatchSettingsPanel.removeExtButton.text=Remove Selected Extension
 FileExtMismatchSettingsPanel.userTypeTextField.text=
 FileExtMismatchDetectorModuleFactory.getIngestJobSettingsPanel.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
 FileExtMismatchDetectorModuleFactory.createFileIngestModule.exception.msg=Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings
+FileExtMismatchModuleSettingsPanel.skipKnownFiles.text=Skip known files

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchDetectorModuleSettings.java

@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2014 Basis Technology Corp.
+ * Copyright 2011-2016 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,8 @@
  */
 package org.sleuthkit.autopsy.modules.fileextmismatch;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 
 /**
@@ -26,15 +28,21 @@ import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
 final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings {
 
     private static final long serialVersionUID = 1L;
-    private boolean skipFilesWithNoExtension = true;
+    private long versionNumber;
-    private boolean skipFilesWithTextPlainMimeType = true;
+    private boolean skipFilesWithNoExtension;
+    private boolean skipFilesWithTextPlainMimeType;
+    private boolean skipKnownFiles;
 
     FileExtMismatchDetectorModuleSettings() {
+        this.skipFilesWithNoExtension = true;
+        this.skipFilesWithTextPlainMimeType = true;
+        this.skipKnownFiles = true;
     }
 
     FileExtMismatchDetectorModuleSettings(boolean skipKnownFiles, boolean skipFilesWithNoExtension, boolean skipFilesWithTextPlainMimeType) {
         this.skipFilesWithNoExtension = skipFilesWithNoExtension;
         this.skipFilesWithTextPlainMimeType = skipFilesWithTextPlainMimeType;
+        this.skipKnownFiles = skipKnownFiles;
     }
 
     @Override
@@ -42,19 +50,41 @@ final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJ
         return serialVersionUID;
     }
 
-    void setSkipFilesWithNoExtension(boolean enabled) {
+    void setSkipFilesWithNoExtension(boolean skipFilesWithNoExtension) {
-        skipFilesWithNoExtension = enabled;
+        this.skipFilesWithNoExtension = skipFilesWithNoExtension;
     }
 
     boolean skipFilesWithNoExtension() {
         return skipFilesWithNoExtension;
     }
 
-    void setSkipFilesWithTextPlainMimeType(boolean enabled) {
+    void setSkipFilesWithTextPlainMimeType(boolean skipFilesWithTextPlainMimeType) {
-        skipFilesWithTextPlainMimeType = enabled;
+        this.skipFilesWithTextPlainMimeType = skipFilesWithTextPlainMimeType;
     }
 
     boolean skipFilesWithTextPlainMimeType() {
         return skipFilesWithTextPlainMimeType;
     }
+
+    boolean skipKnownFiles() {
+        return skipKnownFiles;
+    }
+
+    void setSkipKnownFiles(boolean skipKnownFiles) {
+        this.skipKnownFiles = skipKnownFiles;
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        in.defaultReadObject();
+        if (0L == versionNumber) {
+            /*
+             * If the version number is set to the Java field default value of
+             * zero, then skipKnownFiles is a new field. Change this to the
+             * desired default value of true.
+             */
+            skipKnownFiles = true;
+        }
+        versionNumber = 1;
+    }
+
 }

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchIngestModule.java

@@ -40,6 +40,7 @@ import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
+import org.sleuthkit.datamodel.TskData.FileKnown;
 import org.sleuthkit.datamodel.TskException;
 
 /**
@@ -103,6 +104,9 @@ public class FileExtMismatchIngestModule implements FileIngestModule {
     @Override
     public ProcessResult process(AbstractFile abstractFile) {
         blackboard = Case.getCurrentCase().getServices().getBlackboard();
+        if(this.settings.skipKnownFiles() && (abstractFile.getKnown() == FileKnown.KNOWN)) {
+            return ProcessResult.OK;
+        }
 
         // skip non-files
         if ((abstractFile.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.form

@@ -21,6 +21,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="skipTextPlain" min="-2" max="-2" attributes="0"/>
                   <Component id="skipNoExtCheckBox" alignment="0" min="-2" max="-2" attributes="0"/>
+                  <Component id="skipKnownFiles" alignment="0" min="-2" max="-2" attributes="0"/>
               </Group>
               <EmptySpace min="0" pref="138" max="32767" attributes="0"/>
           </Group>
@@ -32,7 +33,9 @@
               <Component id="skipNoExtCheckBox" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
               <Component id="skipTextPlain" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="51" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="skipKnownFiles" min="-2" max="-2" attributes="0"/>
+              <EmptySpace pref="28" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
@@ -62,5 +65,16 @@
         <AuxValue name="JavaCodeGenerator_InitCodePost" type="java.lang.String" value="skipTextPlain.setSelected(true);"/>
       </AuxValues>
     </Component>
+    <Component class="javax.swing.JCheckBox" name="skipKnownFiles">
+      <Properties>
+        <Property name="selected" type="boolean" value="true"/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/modules/fileextmismatch/Bundle.properties" key="FileExtMismatchModuleSettingsPanel.skipKnownFiles.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="skipKnownFilesActionPerformed"/>
+      </Events>
+    </Component>
   </SubComponents>
 </Form>

Core/src/org/sleuthkit/autopsy/modules/fileextmismatch/FileExtMismatchModuleSettingsPanel.java

@@ -38,6 +38,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
     private void customizeComponents() {
         skipNoExtCheckBox.setSelected(settings.skipFilesWithNoExtension());
         skipTextPlain.setSelected(settings.skipFilesWithTextPlainMimeType());
+        skipKnownFiles.setSelected(settings.skipKnownFiles());
     }
 
     @Override
@@ -56,6 +57,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
 
         skipNoExtCheckBox = new javax.swing.JCheckBox();
         skipTextPlain = new javax.swing.JCheckBox();
+        skipKnownFiles = new javax.swing.JCheckBox();
 
         skipNoExtCheckBox.setSelected(true);
         skipNoExtCheckBox.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchModuleSettingsPanel.class, "FileExtMismatchModuleSettingsPanel.skipNoExtCheckBox.text")); // NOI18N
@@ -73,6 +75,14 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
             }
         });
 
+        skipKnownFiles.setSelected(true);
+        skipKnownFiles.setText(org.openide.util.NbBundle.getMessage(FileExtMismatchModuleSettingsPanel.class, "FileExtMismatchModuleSettingsPanel.skipKnownFiles.text")); // NOI18N
+        skipKnownFiles.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                skipKnownFilesActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -81,7 +91,8 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
                 .addContainerGap()
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(skipTextPlain)
-                    .addComponent(skipNoExtCheckBox))
+                    .addComponent(skipNoExtCheckBox)
+                    .addComponent(skipKnownFiles))
                 .addGap(0, 138, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
@@ -90,7 +101,9 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
                 .addComponent(skipNoExtCheckBox)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(skipTextPlain)
-                .addContainerGap(51, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(skipKnownFiles)
+                .addContainerGap(28, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
@@ -102,7 +115,12 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSett
         settings.setSkipFilesWithTextPlainMimeType(skipTextPlain.isSelected());
     }//GEN-LAST:event_skipTextPlainActionPerformed
 
+    private void skipKnownFilesActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_skipKnownFilesActionPerformed
+        settings.setSkipKnownFiles(skipKnownFiles.isSelected());
+    }//GEN-LAST:event_skipKnownFilesActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JCheckBox skipKnownFiles;
     private javax.swing.JCheckBox skipNoExtCheckBox;
     private javax.swing.JCheckBox skipTextPlain;
     // End of variables declaration//GEN-END:variables

Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java

@@ -1055,6 +1055,7 @@ class ReportGenerator {
                         List<String> columnHeaderNames = new ArrayList<>();
                         columnHeaderNames.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.preview"));
                         columnHeaderNames.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.srcFile"));
+                        columnHeaderNames.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.tags"));
                         module.startTable(columnHeaderNames);
                     }
                 }
@@ -1190,6 +1191,7 @@ class ReportGenerator {
                         List<String> columnHeaderNames = new ArrayList<>();
                         columnHeaderNames.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.file"));
                         columnHeaderNames.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.size"));
+                        columnHeaderNames.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.artTableColHdr.tags"));
                         module.startTable(columnHeaderNames);
                         tableProgress.get(module).updateStatusLabel(
                                 NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processingList",
@@ -1927,7 +1929,6 @@ class ReportGenerator {
                         orderedRowData.add(cellData);
                     }
                 }
-                orderedRowData.add(makeCommaSeparatedList(getTags()));
             }
 
             return orderedRowData;