Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3964-testZipBomb-Rev2

Core/manifest.mf

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.core/10
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/core/Bundle.properties
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/core/layer.xml
-OpenIDE-Module-Implementation-Version: 23
+OpenIDE-Module-Implementation-Version: 24
 OpenIDE-Module-Requires: org.openide.windows.WindowManager
 AutoUpdate-Show-In-Client: true
 AutoUpdate-Essential-Module: true

Core/nbproject/project.properties

@@ -17,7 +17,6 @@ file.reference.sevenzipjbinding-AllPlatforms.jar=release/modules/ext/sevenzipjbi
 file.reference.sevenzipjbinding.jar=release/modules/ext/sevenzipjbinding.jar
 file.reference.sqlite-jdbc-3.8.11.jar=release/modules/ext/sqlite-jdbc-3.8.11.jar
 file.reference.StixLib.jar=release/modules/ext/StixLib.jar
-file.reference.sleuthkit-postgresql-4.6.1.jar=release/modules/ext/sleuthkit-postgresql-4.6.1.jar
 file.reference.bcprov-jdk15on-1.54.jar=release/modules/ext/bcprov-jdk15on-1.54.jar
 file.reference.jackcess-2.1.8.jar=release/modules/ext/jackcess-2.1.8.jar
 file.reference.jackcess-encrypt-2.1.2.jar=release/modules/ext/jackcess-encrypt-2.1.2.jar
@@ -30,7 +29,7 @@ file.reference.cxf-rt-transports-http-3.0.16.jar=release/modules/ext/cxf-rt-tran
 file.reference.fontbox-2.0.8.jar=release/modules/ext/fontbox-2.0.8.jar
 file.reference.pdfbox-2.0.8.jar=release/modules/ext/pdfbox-2.0.8.jar
 file.reference.pdfbox-tools-2.0.8.jar=release/modules/ext/pdfbox-tools-2.0.8.jar
-file.reference.sleuthkit-postgresql-4.6.1.jar=release/modules/ext/sleuthkit-postgresql-4.6.1.jar
+file.reference.sleuthkit-postgresql-4.6.2.jar=release/modules/ext/sleuthkit-postgresql-4.6.2.jar
 file.reference.tika-core-1.17.jar=release/modules/ext/tika-core-1.17.jar
 file.reference.tika-parsers-1.17.jar=release/modules/ext/tika-parsers-1.17.jar
 file.reference.curator-client-2.8.0.jar=release/modules/ext/curator-client-2.8.0.jar
@@ -47,5 +46,5 @@ nbm.homepage=http://www.sleuthkit.org/
 nbm.module.author=Brian Carrier
 nbm.needs.restart=true
 source.reference.curator-recipes-2.8.0.jar=release/modules/ext/curator-recipes-2.8.0-sources.jar
-spec.version.base=10.11
+spec.version.base=10.12
 

Core/nbproject/project.xml

@@ -251,7 +251,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>
@@ -412,8 +412,8 @@
                 <binary-origin>release/modules/ext/metadata-extractor-2.10.1.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
-                <runtime-relative-path>ext/sleuthkit-postgresql-4.6.1.jar</runtime-relative-path>
-                <binary-origin>release/modules/ext/sleuthkit-postgresql-4.6.1.jar</binary-origin>
+                <runtime-relative-path>ext/sleuthkit-postgresql-4.6.2.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/sleuthkit-postgresql-4.6.2.jar</binary-origin>
             </class-path-extension>
             <class-path-extension>
                 <runtime-relative-path>ext/tika-core-1.17.jar</runtime-relative-path>
@@ -499,7 +499,7 @@
                 <runtime-relative-path>ext/xmpcore-5.1.3.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/xmpcore-5.1.3.jar</binary-origin>
             </class-path-extension>
-			<class-path-extension>
+            <class-path-extension>
                 <runtime-relative-path>ext/SparseBitSet-1.1.jar</runtime-relative-path>
                 <binary-origin>release/modules/ext/SparseBitSet-1.1.jar</binary-origin>
             </class-path-extension>

Core/src/org/sleuthkit/autopsy/actions/ReplaceBlackboardArtifactTagAction.java

@@ -64,14 +64,14 @@ public final class ReplaceBlackboardArtifactTagAction extends ReplaceTagAction<B
      * 
      * @param oldArtifactTag tag to be replaced
      * @param newTagName name of the tag to replace with
-     * @param comment the comment for the tag use an empty string for no comment
+     * @param newComment the newComment for the tag use an empty string for no newComment
      */
     @NbBundle.Messages({
         "# {0} - old tag name",
         "# {1} - artifactID",
         "ReplaceBlackboardArtifactTagAction.replaceTag.alert=Unable to replace tag {0} for artifact {1}."})
     @Override
-    protected void replaceTag( BlackboardArtifactTag oldArtifactTag, TagName newTagName, String comment) {
+    protected void replaceTag( BlackboardArtifactTag oldArtifactTag, TagName newTagName, String newComment) {
         new SwingWorker<Void, Void>() {
             
             @Override
@@ -91,7 +91,7 @@ public final class ReplaceBlackboardArtifactTagAction extends ReplaceTagAction<B
                     logger.log(Level.INFO, "Replacing tag {0}  with tag {1} for artifact {2}", new Object[]{oldArtifactTag.getName().getDisplayName(), newTagName.getDisplayName(), oldArtifactTag.getContent().getName()}); //NON-NLS
 
                     tagsManager.deleteBlackboardArtifactTag(oldArtifactTag);
-                    tagsManager.addBlackboardArtifactTag(oldArtifactTag.getArtifact(), newTagName, comment);
+                    tagsManager.addBlackboardArtifactTag(oldArtifactTag.getArtifact(), newTagName, newComment);
 
                 } catch (TskCoreException tskCoreException) {
                     logger.log(Level.SEVERE, "Error replacing artifact tag", tskCoreException); //NON-NLS

Core/src/org/sleuthkit/autopsy/actions/ReplaceContentTagAction.java

@@ -64,7 +64,7 @@ public final class ReplaceContentTagAction extends ReplaceTagAction<ContentTag>
         "# {1} - content obj id",
         "ReplaceContentTagAction.replaceTag.alert=Unable to replace tag {0} for {1}."})
     @Override
-    protected void replaceTag(ContentTag oldTag, TagName newTagName, String comment) {
+    protected void replaceTag(ContentTag oldTag, TagName newTagName, String newComment) {
         new SwingWorker<Void, Void>() {
 
             @Override
@@ -84,7 +84,7 @@ public final class ReplaceContentTagAction extends ReplaceTagAction<ContentTag>
                     logger.log(Level.INFO, "Replacing tag {0}  with tag {1} for artifact {2}", new Object[]{oldTag.getName().getDisplayName(), newTagName.getDisplayName(), oldTag.getContent().getName()}); //NON-NLS
 
                     tagsManager.deleteContentTag(oldTag);
-                    tagsManager.addContentTag(oldTag.getContent(), newTagName, comment);
+                    tagsManager.addContentTag(oldTag.getContent(), newTagName, newComment);
 
                 } catch (TskCoreException tskCoreException) {
                     logger.log(Level.SEVERE, "Error replacing artifact tag", tskCoreException); //NON-NLS

Core/src/org/sleuthkit/autopsy/actions/ReplaceTagAction.java

@@ -141,7 +141,7 @@ abstract class ReplaceTagAction<T extends Tag> extends AbstractAction implements
                     // Add action to replace the tag
                     tagNameItem.addActionListener((ActionEvent event) -> {
                         selectedTags.forEach((oldtag) -> {
-                            replaceTag(oldtag, entry.getValue(), "");
+                            replaceTag(oldtag, entry.getValue(), oldtag.getComment());
                         });
                     });
 
@@ -178,7 +178,7 @@ abstract class ReplaceTagAction<T extends Tag> extends AbstractAction implements
                 TagName newTagName = GetTagNameDialog.doDialog();
                 if (null != newTagName) {
                     selectedTags.forEach((oldtag) -> {
-                        replaceTag(oldtag, newTagName, "");
+                        replaceTag(oldtag, newTagName, oldtag.getComment());
                     });
                 }
             });

Core/src/org/sleuthkit/autopsy/casemodule/Bundle.properties

@@ -114,7 +114,6 @@ LocalFilesDSProcessor.toString.text=Logical Files
 LocalFilesPanel.contentType.text=LOCAL
 LocalFilesPanel.moduleErr=Module Error
 LocalFilesPanel.moduleErr.msg=A module caused an error listening to LocalFilesPanel updates. See log to determine which module. Some data could be incomplete.
-MissingImageDialog.allDesc.text=All Supported Types
 MissingImageDialog.display.title=Search for Missing Image
 MissingImageDialog.confDlg.noFileSel.msg=No image file has been selected. Are you sure you\nwould like to exit without finding the image?
 MissingImageDialog.confDlg.noFileSel.title=Missing Image

Core/src/org/sleuthkit/autopsy/casemodule/Bundle_ja.properties

@@ -101,7 +101,6 @@ LocalFilesDSProcessor.toString.text=\u30ed\u30b8\u30ab\u30eb\u30d5\u30a1\u30a4\u
 LocalFilesPanel.contentType.text=\u30ed\u30fc\u30ab\u30eb
 LocalFilesPanel.moduleErr=\u30e2\u30b8\u30e5\u30fc\u30eb\u30a8\u30e9\u30fc
 LocalFilesPanel.moduleErr.msg=LocalFilesPanel\u30a2\u30c3\u30d7\u30c7\u30fc\u30c8\u3092\u78ba\u8a8d\u4e2d\u306b\u30e2\u30b8\u30e5\u30fc\u30eb\u304c\u30a8\u30e9\u30fc\u3092\u8d77\u3053\u3057\u307e\u3057\u305f\u3002\u3069\u306e\u30e2\u30b8\u30e5\u30fc\u30eb\u304b\u30ed\u30b0\u3092\u78ba\u8a8d\u3057\u3066\u4e0b\u3055\u3044\u3002\u4e00\u90e8\u306e\u30c7\u30fc\u30bf\u304c\u4e0d\u5b8c\u5168\u304b\u3082\u3057\u308c\u307e\u305b\u3093\u3002
-MissingImageDialog.allDesc.text=\u30b5\u30dd\u30fc\u30c8\u3055\u308c\u3066\u3044\u308b\u5168\u3066\u306e\u30bf\u30a4\u30d7
 MissingImageDialog.display.title=\u6b20\u843d\u30a4\u30e1\u30fc\u30b8\u3092\u691c\u7d22
 MissingImageDialog.confDlg.noFileSel.msg=\u30a4\u30e1\u30fc\u30b8\u30d5\u30a1\u30a4\u30eb\u304c\u9078\u629e\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u30a4\u30e1\u30fc\u30b8\u3092\u898b\u3064\u3051\u308b\n\u524d\u306b\u672c\u5f53\u306b\u7d42\u4e86\u3057\u307e\u3059\u304b\uff1f
 MissingImageDialog.confDlg.noFileSel.title=\u6b20\u843d\u30a4\u30e1\u30fc\u30b8

Core/src/org/sleuthkit/autopsy/casemodule/Case.java

@@ -129,6 +129,7 @@ public class Case {
     private static final String EXPORT_FOLDER = "Export"; //NON-NLS
     private static final String LOG_FOLDER = "Log"; //NON-NLS
     private static final String REPORTS_FOLDER = "Reports"; //NON-NLS
+    private static final String CONFIG_FOLDER = "Config"; // NON-NLS
     private static final String TEMP_FOLDER = "Temp"; //NON-NLS
     private static final String MODULE_FOLDER = "ModuleOutput"; //NON-NLS
     private static final String CASE_ACTION_THREAD_NAME = "%s-case-action";
@@ -291,9 +292,10 @@ public class Case {
          */
         ADDING_DATA_SOURCE_FAILED,
         /**
-         * A new data source has been added to the current case. The old value
-         * of the PropertyChangeEvent is null, the new value is the newly-added
-         * data source (type: Content). Cast the PropertyChangeEvent to
+         * A new data source or series of data sources have been added to the
+         * current case. The old value of the PropertyChangeEvent is null, the
+         * new value is the newly-added data source (type: Content). Cast the
+         * PropertyChangeEvent to
          * org.sleuthkit.autopsy.casemodule.events.DataSourceAddedEvent to
          * access additional event data.
          */
@@ -1098,6 +1100,10 @@ public class Case {
                 /*
                  * Open the top components (windows within the main application
                  * window).
+                 * 
+                 * Note: If the core windows are not opened here, they will be
+                 * opened via the DirectoryTreeTopComponent 'propertyChange()'
+                 * method on a DATA_SOURCE_ADDED event.
                  */
                 if (newCurrentCase.hasData()) {
                     CoreComponentControl.openCoreWindows();
@@ -1351,6 +1357,16 @@ public class Case {
         return getOrCreateSubdirectory(REPORTS_FOLDER);
     }
 
+    /**
+     * Gets the full path to the config directory for this case, creating it if
+     * it does not exist.
+     *
+     * @return The config directory path.
+     */
+    public String getConfigDirectory() {
+        return getOrCreateSubdirectory(CONFIG_FOLDER);
+    }
+
     /**
      * Gets the full path to the module output directory for this case, creating
      * it if it does not exist.

Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java

@@ -89,6 +89,15 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour
     public ImageDSProcessor() {
         configPanel = ImageFilePanel.createInstance(ImageDSProcessor.class.getName(), filtersList);
     }
+    
+    /**
+     * Get the list of file filters supported by this DSP.
+     * 
+     * @return A list of all supported file filters.
+     */
+    static List<FileFilter> getFileFiltersList() {
+        return filtersList;
+    }
 
     /**
      * Gets a string that describes the type of data sources this processor is

Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java

@@ -257,6 +257,7 @@ final class LocalDiskPanel extends JPanel {
         pathTextField.setEnabled(copyImageCheckbox.isSelected());
         browseButton.setEnabled(copyImageCheckbox.isSelected());
         changeDatabasePathCheckbox.setEnabled(copyImageCheckbox.isSelected());
+        changeDatabasePathCheckbox.setSelected(copyImageCheckbox.isSelected());
         fireUpdateEvent();
     }//GEN-LAST:event_copyImageCheckboxActionPerformed
 

Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java

@@ -28,6 +28,7 @@ import java.io.File;
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
+import javax.swing.filechooser.FileFilter;
 import org.openide.util.NbBundle;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.DriveUtils;
@@ -44,17 +45,8 @@ class MissingImageDialog extends javax.swing.JDialog {
     private static final Logger logger = Logger.getLogger(MissingImageDialog.class.getName());
     long obj_id;
     SleuthkitCase db;
-    static final GeneralFilter rawFilter = new GeneralFilter(GeneralFilter.RAW_IMAGE_EXTS, GeneralFilter.RAW_IMAGE_DESC);
-    static final GeneralFilter encaseFilter = new GeneralFilter(GeneralFilter.ENCASE_IMAGE_EXTS, GeneralFilter.ENCASE_IMAGE_DESC);
-    static final List<String> allExt = new ArrayList<String>();
 
-    static {
-        allExt.addAll(GeneralFilter.RAW_IMAGE_EXTS);
-        allExt.addAll(GeneralFilter.ENCASE_IMAGE_EXTS);
-    }
-    static final String allDesc = NbBundle.getMessage(MissingImageDialog.class, "MissingImageDialog.allDesc.text");
-    static final GeneralFilter allFilter = new GeneralFilter(allExt, allDesc);
-    private final JFileChooser fc = new JFileChooser();
+    private final JFileChooser fileChooser = new JFileChooser();
 
     /**
      * Instantiate a MissingImageDialog.
@@ -68,13 +60,15 @@ class MissingImageDialog extends javax.swing.JDialog {
         this.db = db;
         initComponents();
 
-        fc.setDragEnabled(false);
-        fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
-        fc.setMultiSelectionEnabled(false);
+        fileChooser.setDragEnabled(false);
+        fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        fileChooser.setMultiSelectionEnabled(false);
 
-        fc.addChoosableFileFilter(rawFilter);
-        fc.addChoosableFileFilter(encaseFilter);
-        fc.setFileFilter(allFilter);
+        List<FileFilter> fileFiltersList = ImageDSProcessor.getFileFiltersList();
+        for (FileFilter fileFilter : fileFiltersList) {
+            fileChooser.addChoosableFileFilter(fileFilter);
+        }
+        fileChooser.setFileFilter(fileFiltersList.get(0));
 
         selectButton.setEnabled(false);
     }
@@ -286,12 +280,12 @@ class MissingImageDialog extends javax.swing.JDialog {
         // set the current directory of the FileChooser if the ImagePath Field is valid
         File currentDir = new File(oldText);
         if (currentDir.exists()) {
-            fc.setCurrentDirectory(currentDir);
+            fileChooser.setCurrentDirectory(currentDir);
         }
 
-        int retval = fc.showOpenDialog(this);
+        int retval = fileChooser.showOpenDialog(this);
         if (retval == JFileChooser.APPROVE_OPTION) {
-            String path = fc.getSelectedFile().getPath();
+            String path = fileChooser.getSelectedFile().getPath();
             pathNameTextField.setText(path);
         }
         //pcs.firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.FOCUS_NEXT.toString(), false, true);

Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties

@@ -1,6 +1,5 @@
 OptionsCategory_Name_TagNamesOptions=Tags
 OptionsCategory_TagNames=TagNames
-Blackboard.unableToIndexArtifact.error.msg=Unable to index blackboard artifact {0}
 TagNameDialog.title.text=New Tag
 TagNameDialog.JOptionPane.tagNameIllegalCharacters.message=Tag name may not contain any of the following symbols\: \\ \: * ? " < > | , ;
 TagNameDialog.JOptionPane.tagNameIllegalCharacters.title=Invalid character in tag name

Core/src/org/sleuthkit/autopsy/casemodule/services/TagNameDefinition.java

@@ -54,7 +54,7 @@ final class TagNameDefinition implements Comparable<TagNameDefinition> {
     private static final List<String> STANDARD_TAG_DISPLAY_NAMES = Arrays.asList(Bundle.TagNameDefinition_predefTagNames_bookmark_text(), Bundle.TagNameDefinition_predefTagNames_followUp_text(),
             Bundle.TagNameDefinition_predefTagNames_notableItem_text(), DhsImageCategory.ONE.getDisplayName(),
             DhsImageCategory.TWO.getDisplayName(), DhsImageCategory.THREE.getDisplayName(),
-            DhsImageCategory.FOUR.getDisplayName(), DhsImageCategory.FIVE.getDisplayName());
+            DhsImageCategory.FOUR.getDisplayName(), DhsImageCategory.FIVE.getDisplayName(), DhsImageCategory.ZERO.getDisplayName());
     private final String displayName;
     private final String description;
     private final TagName.HTML_COLOR color;

Core/src/org/sleuthkit/autopsy/centralrepository/AddEditCentralRepoCommentAction.java

@@ -21,51 +21,48 @@ package org.sleuthkit.autopsy.centralrepository;
 import java.awt.event.ActionEvent;
 import java.util.logging.Level;
 import javax.swing.AbstractAction;
+import org.openide.DialogDisplayer;
+import org.openide.NotifyDescriptor;
+import org.openide.util.NbBundle;
 import org.openide.util.NbBundle.Messages;
-import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttribute;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamArtifactUtil;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDb;
 import org.sleuthkit.autopsy.centralrepository.datamodel.EamDbException;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.AbstractFile;
-import org.sleuthkit.datamodel.TskCoreException;
 
 /**
  * An AbstractAction to manage adding and modifying a Central Repository file
  * instance comment.
  */
+@Messages({"AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoComment=Add/Edit Central Repository Comment"})
 public final class AddEditCentralRepoCommentAction extends AbstractAction {
 
     private static final Logger logger = Logger.getLogger(AddEditCentralRepoCommentAction.class.getName());
 
     private boolean addToDatabase;
     private CorrelationAttribute correlationAttribute;
-    String title;
+    private String comment;
 
     /**
-     * Private constructor to create an instance given a CorrelationAttribute.
+     * Constructor to create an instance given a CorrelationAttribute.
      *
      * @param correlationAttribute The correlation attribute to modify.
-     * @param title                The text for the menu item.
      */
-    private AddEditCentralRepoCommentAction(CorrelationAttribute correlationAttribute, String title) {
-        super(title);
-        this.title = title;
+    public AddEditCentralRepoCommentAction(CorrelationAttribute correlationAttribute) {
+        super(Bundle.AddEditCentralRepoCommentAction_menuItemText_addEditCentralRepoComment());
         this.correlationAttribute = correlationAttribute;
     }
 
     /**
-     * Private constructor to create an instance given an AbstractFile.
+     * Constructor to create an instance given an AbstractFile.
      *
-     * @param file  The file from which a correlation attribute to modify is
-     *              derived.
-     * @param title The text for the menu item.
+     * @param file The file from which a correlation attribute to modify is
+     *             derived.
      */
-    private AddEditCentralRepoCommentAction(AbstractFile file, String title) {
-
-        super(title);
-        this.title = title;
+    public AddEditCentralRepoCommentAction(AbstractFile file) {
+        super(Bundle.AddEditCentralRepoCommentAction_menuItemText_addEditCentralRepoComment());
         correlationAttribute = EamArtifactUtil.getCorrelationAttributeFromContent(file);
         if (correlationAttribute == null) {
             addToDatabase = true;
@@ -73,26 +70,24 @@ public final class AddEditCentralRepoCommentAction extends AbstractAction {
         }
     }
 
-    @Override
-    public void actionPerformed(ActionEvent event) {
-        addEditCentralRepoComment();
-    }
-
     /**
      * Create a Add/Edit dialog for the correlation attribute file instance
      * comment. The comment will be updated in the database if the file instance
      * exists there, or a new file instance will be added to the database with
      * the comment attached otherwise.
-     * 
-     * The current comment for this instance is returned in case it is needed to 
-     * update the display.
      *
-     * @return the current comment for this instance
+     * The current comment for this instance is saved in case it is needed to
+     * update the display. If the comment was not changed either due to the
+     * action being canceled or the occurrence of an error, the comment will be
+     * null.
      */
-    public String addEditCentralRepoComment() {
-        CentralRepoCommentDialog centralRepoCommentDialog = new CentralRepoCommentDialog(correlationAttribute, title);
+    @Override
+    public void actionPerformed(ActionEvent event) {
+        CentralRepoCommentDialog centralRepoCommentDialog = new CentralRepoCommentDialog(correlationAttribute);
         centralRepoCommentDialog.display();
 
+        comment = null;
+
         if (centralRepoCommentDialog.isCommentUpdated()) {
             EamDb dbManager;
 
@@ -104,45 +99,35 @@ public final class AddEditCentralRepoCommentAction extends AbstractAction {
                 } else {
                     dbManager.updateAttributeInstanceComment(correlationAttribute);
                 }
+
+                comment = centralRepoCommentDialog.getComment();
             } catch (EamDbException ex) {
-                logger.log(Level.SEVERE, "Error connecting to Central Repository database.", ex);
+                logger.log(Level.SEVERE, "Error adding comment", ex);
+                NotifyDescriptor notifyDescriptor = new NotifyDescriptor.Message(
+                        "An error occurred while trying to save the comment to the central repository.",
+                        NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notify(notifyDescriptor);
             }
         }
-        return centralRepoCommentDialog.getComment();
     }
 
     /**
-     * Create an instance labeled "Add/Edit Central Repository Comment" given an
-     * AbstractFile. This is intended for the result view.
+     * Retrieve the comment that was last saved. If a comment update was
+     * canceled or an error occurred while attempting to save the comment, the
+     * comment will be null.
      *
-     * @param file The file from which a correlation attribute to modify is
-     *             derived.
-     *
-     * @return The instance.
-     *
-     * @throws EamDbException
-     * @throws NoCurrentCaseException
-     * @throws TskCoreException
+     * @return The comment.
      */
-    @Messages({"AddEditCentralRepoCommentAction.menuItemText.addEditCentralRepoComment=Add/Edit Central Repository Comment"})
-    public static AddEditCentralRepoCommentAction createAddEditCentralRepoCommentAction(AbstractFile file) {
-
-        return new AddEditCentralRepoCommentAction(file,
-                Bundle.AddEditCentralRepoCommentAction_menuItemText_addEditCentralRepoComment());
+    public String getComment() {
+        return comment;
     }
-
+    
     /**
-     * Create an instance labeled "Add/Edit Comment" given a
-     * CorrelationAttribute. This is intended for the content view.
-     *
-     * @param correlationAttribute The correlation attribute to modify.
-     *
-     * @return The instance.
+     * Retrieve the associated correlation attribute.
+     * 
+     * @return The correlation attribute.
      */
-    @Messages({"AddEditCentralRepoCommentAction.menuItemText.addEditComment=Add/Edit Comment"})
-    public static AddEditCentralRepoCommentAction createAddEditCommentAction(CorrelationAttribute correlationAttribute) {
-
-        return new AddEditCentralRepoCommentAction(correlationAttribute,
-                Bundle.AddEditCentralRepoCommentAction_menuItemText_addEditComment());
+    public CorrelationAttribute getCorrelationAttribute() {
+        return correlationAttribute;
     }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/CentralRepoCommentDialog.java

@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.centralrepository;
 
+import org.openide.util.NbBundle.Messages;
 import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttribute;
 import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeInstance;
@@ -26,6 +27,7 @@ import org.sleuthkit.autopsy.centralrepository.datamodel.CorrelationAttributeIns
  * Dialog to allow Central Repository file instance comments to be added and
  * modified.
  */
+@Messages({"CentralRepoCommentDialog.title.addEditCentralRepoComment=Add/Edit Central Repository Comment"})
 @SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
 final class CentralRepoCommentDialog extends javax.swing.JDialog {
 
@@ -37,10 +39,9 @@ final class CentralRepoCommentDialog extends javax.swing.JDialog {
      * Create an instance.
      *
      * @param correlationAttribute The correlation attribute to be modified.
-     * @param title                The title to assign the dialog.
      */
-    CentralRepoCommentDialog(CorrelationAttribute correlationAttribute, String title) {
-        super(WindowManager.getDefault().getMainWindow(), title);
+    CentralRepoCommentDialog(CorrelationAttribute correlationAttribute) {
+        super(WindowManager.getDefault().getMainWindow(), Bundle.CentralRepoCommentDialog_title_addEditCentralRepoComment());
         
         initComponents();
 
@@ -82,6 +83,7 @@ final class CentralRepoCommentDialog extends javax.swing.JDialog {
      * Get the current comment.
      * If the user hit OK, this will be the new comment.
      * If the user canceled, this will be the original comment.
+     * 
      * @return the comment
      */
     String getComment() {

Core/src/org/sleuthkit/autopsy/centralrepository/CentralRepoContextMenuActionsProvider.java

@@ -38,19 +38,23 @@ public class CentralRepoContextMenuActionsProvider implements ContextMenuActions
 
     @Override
     public List<Action> getActions() {
-        ArrayList<Action> actions = new ArrayList<>();
+        ArrayList<Action> actionsList = new ArrayList<>();
         Collection<? extends AbstractFile> selectedFiles = Utilities.actionsGlobalContext().lookupAll(AbstractFile.class);
 
         if (selectedFiles.size() != 1) {
-            return actions;
+            return actionsList;
         }
 
         for (AbstractFile file : selectedFiles) {
             if (EamDbUtil.useCentralRepo() && EamArtifactUtil.isSupportedAbstractFileType(file) && file.isFile()) {
-                actions.add(AddEditCentralRepoCommentAction.createAddEditCentralRepoCommentAction(file));
+                AddEditCentralRepoCommentAction action = new AddEditCentralRepoCommentAction(file);
+                if (action.getCorrelationAttribute() == null) {
+                    action.setEnabled(false);
+                }
+                actionsList.add(action);
             }
         }
 
-        return actions;
+        return actionsList;
     }
 }

Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/Bundle.properties

@@ -3,7 +3,7 @@ DataContentViewerOtherCases.showCaseDetailsMenuItem.text=Show Case Details
 DataContentViewerOtherCases.table.toolTip.text=Click column name to sort. Right-click on the table for more options.
 DataContentViewerOtherCases.exportToCSVMenuItem.text=Export Selected Rows to CSV
 DataContentViewerOtherCases.showCommonalityMenuItem.text=Show Frequency
-DataContentViewerOtherCases.addCommentMenuItem.text=Add/Edit Comment
+DataContentViewerOtherCases.addCommentMenuItem.text=Add/Edit Central Repository Comment
 DataContentViewerOtherCases.earliestCaseDate.text=Earliest Case Date
 DataContentViewerOtherCases.earliestCaseLabel.toolTipText=
 DataContentViewerOtherCases.earliestCaseLabel.text=Central Repository Starting Date:

Core/src/org/sleuthkit/autopsy/centralrepository/contentviewer/DataContentViewerOtherCases.java

@@ -38,7 +38,6 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.logging.Level;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import java.util.stream.Collectors;
 import javax.swing.JFileChooser;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
@@ -127,12 +126,15 @@ public class DataContentViewerOtherCases extends JPanel implements DataContentVi
                 } else if (jmi.equals(addCommentMenuItem)) {
                     try {
                         OtherOccurrenceNodeData selectedNode = (OtherOccurrenceNodeData) tableModel.getRow(otherCasesTable.getSelectedRow());
-                        AddEditCentralRepoCommentAction action = AddEditCentralRepoCommentAction.createAddEditCommentAction(selectedNode.createCorrelationAttribute());
-                        String currentComment = action.addEditCentralRepoComment();
-                        selectedNode.updateComment(currentComment);
-                        otherCasesTable.repaint();
+                        AddEditCentralRepoCommentAction action = new AddEditCentralRepoCommentAction(selectedNode.createCorrelationAttribute());
+                        action.actionPerformed(null);
+                        String currentComment = action.getComment();
+                        if (currentComment != null) {
+                            selectedNode.updateComment(action.getComment());
+                            otherCasesTable.repaint();
+                        }
                     } catch (EamDbException ex) {
-                        logger.log(Level.SEVERE, "Error performing Add/Edit Comment action", ex);
+                        logger.log(Level.SEVERE, "Error performing Add/Edit Central Repository Comment action", ex);
                     }
                 }
             }

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java

@@ -58,6 +58,9 @@ abstract class AbstractSqlEamDb implements EamDb {
     protected int bulkArtifactsThreshold;
     private final Map<String, Collection<CorrelationAttribute>> bulkArtifacts;
 
+    // Maximum length for the value column in the instance tables
+    static final int MAX_VALUE_LENGTH = 256;
+
     // number of instances to keep in bulk queue before doing an insert.
     // Update Test code if this changes.  It's hard coded there.
     static final int DEFAULT_BULK_THRESHHOLD = 1000;
@@ -432,7 +435,8 @@ abstract class AbstractSqlEamDb implements EamDb {
         if (eamDataSource.getCaseID() == -1) {
             throw new EamDbException("Case ID is -1");
         } else if (eamDataSource.getID() != -1) {
-            throw new EamDbException("Database ID is already set in object");
+            // This data source is already in the central repo
+            return;
         }
         Connection conn = connect();
 
@@ -550,6 +554,13 @@ abstract class AbstractSqlEamDb implements EamDb {
         if (eamArtifact.getCorrelationValue() == null) {
             throw new EamDbException("Correlation value is null");
         }
+        if (eamArtifact.getCorrelationValue().length() >= MAX_VALUE_LENGTH) {
+            throw new EamDbException("Artifact value too long for central repository."
+                    + "\nCorrelationArtifact ID: " + eamArtifact.getID()
+                    + "\nCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                    + "\nCorrelationArtifact Value: " + eamArtifact.getCorrelationValue());
+
+        }
 
         Connection conn = connect();
 
@@ -975,27 +986,50 @@ abstract class AbstractSqlEamDb implements EamDb {
                             if (!eamArtifact.getCorrelationValue().isEmpty()) {
 
                                 if (eamInstance.getCorrelationCase() == null) {
-                                    throw new EamDbException("CorrelationAttributeInstance case is null");
+                                    throw new EamDbException("CorrelationAttributeInstance case is null for: "
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue());
                                 }
                                 if (eamInstance.getCorrelationDataSource() == null) {
-                                    throw new EamDbException("CorrelationAttributeInstance data source is null");
+                                    throw new EamDbException("CorrelationAttributeInstance data source is null for: "
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue());
                                 }
                                 if (eamInstance.getKnownStatus() == null) {
-                                    throw new EamDbException("CorrelationAttributeInstance known status is null");
+                                    throw new EamDbException("CorrelationAttributeInstance known status is null for: "
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue() 
+                                            + "\n\tEam Instance: "
+                                            + "\n\t\tCaseId: " + eamInstance.getCorrelationDataSource().getCaseID()
+                                            + "\n\t\tDeviceID: " + eamInstance.getCorrelationDataSource().getDeviceID());
                                 }
 
-                                bulkPs.setString(1, eamInstance.getCorrelationCase().getCaseUUID());
-                                bulkPs.setString(2, eamInstance.getCorrelationDataSource().getDeviceID());
-                                bulkPs.setInt(3, eamInstance.getCorrelationDataSource().getCaseID());
-                                bulkPs.setString(4, eamArtifact.getCorrelationValue());
-                                bulkPs.setString(5, eamInstance.getFilePath());
-                                bulkPs.setByte(6, eamInstance.getKnownStatus().getFileKnownValue());
-                                if ("".equals(eamInstance.getComment())) {
-                                    bulkPs.setNull(7, Types.INTEGER);
+                                if (eamArtifact.getCorrelationValue().length() < MAX_VALUE_LENGTH) {
+                                    bulkPs.setString(1, eamInstance.getCorrelationCase().getCaseUUID());
+                                    bulkPs.setString(2, eamInstance.getCorrelationDataSource().getDeviceID());
+                                    bulkPs.setInt(3, eamInstance.getCorrelationDataSource().getCaseID());
+                                    bulkPs.setString(4, eamArtifact.getCorrelationValue());
+                                    bulkPs.setString(5, eamInstance.getFilePath());
+                                    bulkPs.setByte(6, eamInstance.getKnownStatus().getFileKnownValue());
+                                    if ("".equals(eamInstance.getComment())) {
+                                        bulkPs.setNull(7, Types.INTEGER);
+                                    } else {
+                                        bulkPs.setString(7, eamInstance.getComment());
+                                    }
+                                    bulkPs.addBatch();
                                 } else {
-                                    bulkPs.setString(7, eamInstance.getComment());
+                                    logger.log(Level.WARNING, ("Artifact value too long for central repository."
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue())
+                                            + "\n\tEam Instance: "
+                                            + "\n\t\tCaseId: " + eamInstance.getCorrelationDataSource().getCaseID()
+                                            + "\n\t\tDeviceID: " + eamInstance.getCorrelationDataSource().getDeviceID()
+                                            + "\n\t\tFilePath: " + eamInstance.getFilePath());
                                 }
-                                bulkPs.addBatch();
                             }
                         }
                     }
@@ -1740,11 +1774,13 @@ abstract class AbstractSqlEamDb implements EamDb {
 
         return 0 < badInstances;
     }
+
     /**
      * Process the Artifact instance in the EamDb
      *
-     * @param type EamArtifact.Type to search for
+     * @param type                  EamArtifact.Type to search for
      * @param instanceTableCallback callback to process the instance
+     *
      * @throws EamDbException
      */
     @Override

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationDataSource.java

@@ -67,6 +67,7 @@ public class CorrelationDataSource implements Serializable {
 
     /**
      * Create a CorrelationDataSource object from a TSK Content object.
+     * This will add it to the central repository.
      *
      * @param correlationCase the current CorrelationCase used for ensuring
      *                        uniqueness of DataSource

Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/EamArtifactUtil.java

@@ -235,21 +235,37 @@ public class EamArtifactUtil {
             return null;
         }
 
-        CorrelationAttribute correlationAttribute = null;
-
+        CorrelationAttribute correlationAttribute;
+        CorrelationAttribute.Type type;
+        CorrelationCase correlationCase;
+        CorrelationDataSource correlationDataSource;
+        String value;
+        String filePath;
+        
         try {
-            CorrelationAttribute.Type type = EamDb.getInstance().getCorrelationTypeById(CorrelationAttribute.FILES_TYPE_ID);
-            CorrelationCase correlationCase = EamDb.getInstance().getCase(Case.getCurrentCaseThrows());
+            type = EamDb.getInstance().getCorrelationTypeById(CorrelationAttribute.FILES_TYPE_ID);
+            correlationCase = EamDb.getInstance().getCase(Case.getCurrentCaseThrows());
             if (null == correlationCase) {
                 correlationCase = EamDb.getInstance().newCase(Case.getCurrentCaseThrows());
             }
-            CorrelationDataSource correlationDataSource = CorrelationDataSource.fromTSKDataSource(correlationCase, file.getDataSource());
-            String value = file.getMd5Hash();
-            String filePath = (file.getParentPath() + file.getName()).toLowerCase();
-
-            correlationAttribute = EamDb.getInstance().getCorrelationAttribute(type, correlationCase, correlationDataSource, value, filePath);
-        } catch (TskCoreException | EamDbException | NoCurrentCaseException ex) {
+            correlationDataSource = CorrelationDataSource.fromTSKDataSource(correlationCase, file.getDataSource());
+            value = file.getMd5Hash();
+            filePath = (file.getParentPath() + file.getName()).toLowerCase();
+        } catch (TskCoreException | EamDbException ex) {
             logger.log(Level.SEVERE, "Error retrieving correlation attribute.", ex);
+            return null;
+        } catch (NoCurrentCaseException ex) {
+            logger.log(Level.SEVERE, "Case is closed.", ex);
+            return null;
+        }
+        
+        try {
+            correlationAttribute = EamDb.getInstance().getCorrelationAttribute(type, correlationCase, correlationDataSource, value, filePath);
+        } catch (EamDbException ex) {
+            logger.log(Level.WARNING, String.format(
+                    "Correlation attribute could not be retrieved for '%s' (id=%d): %s",
+                    content.getName(), content.getId(), ex.getMessage()));
+            return null;
         }
 
         return correlationAttribute;
@@ -300,9 +316,12 @@ public class EamArtifactUtil {
                     af.getParentPath() + af.getName());
             eamArtifact.addInstance(cei);
             return eamArtifact;
-        } catch (TskCoreException | EamDbException | NoCurrentCaseException ex) {
+        } catch (TskCoreException | EamDbException ex) {
             logger.log(Level.SEVERE, "Error making correlation attribute.", ex);
             return null;
+        } catch (NoCurrentCaseException ex) {
+            logger.log(Level.SEVERE, "Case is closed.", ex);
+            return null;
         }
     }
 

Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/CaseEventListener.java

@@ -450,10 +450,10 @@ final class CaseEventListener implements PropertyChangeListener {
                     correlationCase = dbManager.newCase(openCase);
                 }
                 if (null == dbManager.getDataSource(correlationCase, deviceId)) {
-                    dbManager.newDataSource(CorrelationDataSource.fromTSKDataSource(correlationCase, newDataSource));
+                    CorrelationDataSource.fromTSKDataSource(correlationCase, newDataSource);
                 }
             } catch (EamDbException ex) {
-                LOGGER.log(Level.SEVERE, "Error connecting to Central Repository database.", ex); //NON-NLS
+                LOGGER.log(Level.SEVERE, "Error adding new data source to the central repository", ex); //NON-NLS
             } catch (TskCoreException | TskDataException ex) {
                 LOGGER.log(Level.SEVERE, "Error getting data source from DATA_SOURCE_ADDED event content.", ex); //NON-NLS
             }

Core/src/org/sleuthkit/autopsy/centralrepository/eventlisteners/IngestEventsListener.java

@@ -276,12 +276,12 @@ public class IngestEventsListener {
                 }
             }
             if (FALSE == eamArtifacts.isEmpty()) {
-                try {
-                    for (CorrelationAttribute eamArtifact : eamArtifacts) {
+                for (CorrelationAttribute eamArtifact : eamArtifacts) {
+                    try {
                         dbManager.addArtifact(eamArtifact);
+                    } catch (EamDbException ex) {
+                        LOGGER.log(Level.SEVERE, "Error adding artifact to database.", ex); //NON-NLS
                     }
-                } catch (EamDbException ex) {
-                    LOGGER.log(Level.SEVERE, "Error connecting to Central Repository database.", ex); //NON-NLS
                 }
             } // DATA_ADDED
         }

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesPanel.java

@@ -264,7 +264,6 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                     viewers.add(table);
                     progress.setDisplayName(Bundle.CommonFilesPanel_search_done_searchProgressDisplay());
                     DataResultTopComponent.createInstance(tabTitle, pathText, tableFilterWithDescendantsNode, metadata.size(), viewers);
-                    progress.finish();
                 } catch (InterruptedException ex) {
                     LOGGER.log(Level.SEVERE, "Interrupted while loading Common Files", ex);
                     MessageNotifyUtil.Message.error(Bundle.CommonFilesPanel_search_done_interupted());
@@ -285,6 +284,8 @@ public final class CommonFilesPanel extends javax.swing.JPanel {
                         errorMessage = Bundle.CommonFilesPanel_search_done_exception();
                     }
                     MessageNotifyUtil.Message.error(errorMessage);
+                } finally {
+                    progress.finish();
                 }
             }
         }.execute();

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchAction.java

@@ -24,7 +24,6 @@ import org.openide.util.HelpCtx;
 import org.openide.util.NbBundle;
 import org.openide.util.actions.CallableSystemAction;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.core.Installer;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.autopsy.coreutils.Logger;
 

Core/src/org/sleuthkit/autopsy/commonfilesearch/CommonFilesSearchResultsViewerTable.java

@@ -23,23 +23,29 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableColumnModel;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.corecomponents.DataResultViewerTable;
 
 /**
- * <code>DataResultViewerTable</code> which overrides the default column
- * header width calculations.  The <code>CommonFilesSearchResultsViewerTable</code>
- * presents multiple tiers of data which are not always present and it may not 
- * make sense to try to calculate the column widths for such tables by sampling 
- * rows and looking for wide cells.  Rather, we just pick some reasonable values.
+ * <code>DataResultViewerTable</code> which overrides the default column header
+ * width calculations. The <code>CommonFilesSearchResultsViewerTable</code>
+ * presents multiple tiers of data which are not always present and it may not
+ * make sense to try to calculate the column widths for such tables by sampling
+ * rows and looking for wide cells. Rather, we just pick some reasonable values.
  */
 public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
-    
+
     private static final Map<String, Integer> COLUMN_WIDTHS;
     private static final long serialVersionUID = 1L;
+
+    private static final Logger LOGGER = Logger.getLogger(CommonFilesSearchResultsViewerTable.class.getName());
     
+    private static final int DEFAULT_WIDTH = 100;
+
     static {
         Map<String, Integer> map = new HashMap<>();
         map.put(Bundle.CommonFilesSearchResultsViewerTable_filesColLbl(), 260);
@@ -49,10 +55,10 @@ public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
         map.put(Bundle.CommonFilesSearchResultsViewerTable_hashsetHitsColLbl(), 100);
         map.put(Bundle.CommonFilesSearchResultsViewerTable_mimeTypeColLbl(), 130);
         map.put(Bundle.CommonFilesSearchResultsViewerTable_tagsColLbl1(), 300);
-        
+
         COLUMN_WIDTHS = Collections.unmodifiableMap(map);
     }
-    
+
     @NbBundle.Messages({
         "CommonFilesSearchResultsViewerTable.filesColLbl=Files",
         "CommonFilesSearchResultsViewerTable.instancesColLbl=Instances",
@@ -63,18 +69,24 @@ public class CommonFilesSearchResultsViewerTable extends DataResultViewerTable {
         "CommonFilesSearchResultsViewerTable.tagsColLbl1=Tags"
     })
     @Override
-    protected void setColumnWidths(){
+    protected void setColumnWidths() {
         TableColumnModel model = this.getColumnModel();
-        
+
         Enumeration<TableColumn> columnsEnumerator = model.getColumns();
-        while(columnsEnumerator.hasMoreElements()){
-            
+        while (columnsEnumerator.hasMoreElements()) {
+
             TableColumn column = columnsEnumerator.nextElement();
-            
+
             final String headerValue = column.getHeaderValue().toString();
-            final Integer get = COLUMN_WIDTHS.get(headerValue);
-                        
-            column.setPreferredWidth(get);
+
+            final Integer defaultWidth = COLUMN_WIDTHS.get(headerValue);
+            
+            if(defaultWidth == null){
+                column.setPreferredWidth(DEFAULT_WIDTH);
+                LOGGER.log(Level.SEVERE, String.format("Tried to set width on a column not supported by the CommonFilesSearchResultsViewerTable: %s", headerValue));
+            } else {
+                column.setPreferredWidth(defaultWidth);
+            }
         }
     }
 }

Core/src/org/sleuthkit/autopsy/commonfilesearch/FileInstanceNode.java

@@ -77,7 +77,7 @@ public class FileInstanceNode extends FileNode {
         
         sheetSet.put(new NodeProperty<>(Bundle.CommonFilesSearchResultsViewerTable_filesColLbl(), Bundle.CommonFilesSearchResultsViewerTable_filesColLbl(), NO_DESCR, this.getContent().getName()));
         sheetSet.put(new NodeProperty<>(Bundle.CommonFilesSearchResultsViewerTable_pathColLbl(), Bundle.CommonFilesSearchResultsViewerTable_pathColLbl(), NO_DESCR, this.getContent().getParentPath()));
-        sheetSet.put(new NodeProperty<>(Bundle.CommonFilesSearchResultsViewerTable_hashsetHitsColLbl(), Bundle.CommonFilesSearchResultsViewerTable_hashsetHitsColLbl(), NO_DESCR, getHashSetHitsForFile(this.getContent())));
+        sheetSet.put(new NodeProperty<>(Bundle.CommonFilesSearchResultsViewerTable_hashsetHitsColLbl(), Bundle.CommonFilesSearchResultsViewerTable_hashsetHitsColLbl(), NO_DESCR, getHashSetHitsCsvList(this.getContent())));
         sheetSet.put(new NodeProperty<>(Bundle.CommonFilesSearchResultsViewerTable_dataSourceColLbl(), Bundle.CommonFilesSearchResultsViewerTable_dataSourceColLbl(), NO_DESCR, this.getDataSource()));
         sheetSet.put(new NodeProperty<>(Bundle.CommonFilesSearchResultsViewerTable_mimeTypeColLbl(), Bundle.CommonFilesSearchResultsViewerTable_mimeTypeColLbl(), NO_DESCR, StringUtils.defaultString(this.getContent().getMIMEType())));
 

Core/src/org/sleuthkit/autopsy/contentviewers/SQLiteViewer.java

@@ -56,7 +56,6 @@ import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
-import org.sleuthkit.autopsy.coreutils.TimeStampUtils;
 
 /**
  * A file content viewer for SQLite database files.
@@ -289,28 +288,22 @@ class SQLiteViewer extends javax.swing.JPanel implements FileTypeViewer {
         fileChooser.setAcceptAllFileFilterUsed(true);
         fileChooser.setFileFilter(csvFilter);
         fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
+        String defaultFileName = (String) this.tablesDropdownList.getSelectedItem();
+        fileChooser.setSelectedFile(new File(defaultFileName));
         int choice = fileChooser.showSaveDialog((Component) evt.getSource()); //TODO
         if (JFileChooser.APPROVE_OPTION == choice) {
-            boolean overwrite = false;
             File file = fileChooser.getSelectedFile();
-            if (file == null) {
-                JOptionPane.showMessageDialog(this,
-                        Bundle.SQLiteViewer_csvExport_fileName_empty(),
-                        Bundle.SQLiteViewer_csvExport_title(), 
-                        JOptionPane.WARNING_MESSAGE);
-                return;
-            } else if (file.exists() && FilenameUtils.getExtension(file.getName()).equalsIgnoreCase("csv")) {
+            if (file.exists() && FilenameUtils.getExtension(file.getName()).equalsIgnoreCase("csv")) {
                 if (JOptionPane.YES_OPTION == JOptionPane.showConfirmDialog(this,
                         Bundle.SQLiteViewer_csvExport_confirm_msg(), 
                         Bundle.SQLiteViewer_csvExport_title(), 
                         JOptionPane.YES_NO_OPTION)) {
-                    overwrite = true;
                 } else {
                     return;
                 }            
             }
          
-            exportTableToCsv(file, overwrite);
+            exportTableToCsv(file);
         }
     }//GEN-LAST:event_exportCsvButtonActionPerformed
 
@@ -567,9 +560,8 @@ class SQLiteViewer extends javax.swing.JPanel implements FileTypeViewer {
                         "SQLiteViewer.exportTableToCsv.FileName=File name: ",
                         "SQLiteViewer.exportTableToCsv.TableName=Table name: "
     })
-    private void exportTableToCsv(File file, boolean overwrite) {
+    private void exportTableToCsv(File file) {
         String tableName = (String) this.tablesDropdownList.getSelectedItem();
-        String csvFileSuffix = "_" + tableName + "_" + TimeStampUtils.createTimeStamp() + ".csv";
         try (
                 Statement statement = connection.createStatement();
                 ResultSet resultSet = statement.executeQuery("SELECT * FROM " + tableName)) {
@@ -578,42 +570,42 @@ class SQLiteViewer extends javax.swing.JPanel implements FileTypeViewer {
             if (Objects.isNull(currentTableRows) || currentTableRows.isEmpty()) {
                 logger.log(Level.INFO, String.format("The table %s is empty. (objId=%d)", tableName, sqliteDbFile.getId())); //NON-NLS
             } else {
-                String fileName = file.getName();
                 File csvFile;
-                if (overwrite) {
+                String fileName = file.getName();
+                if (FilenameUtils.getExtension(fileName).equalsIgnoreCase("csv")) {
                     csvFile = file;
-                } else if (FilenameUtils.getExtension(fileName).equalsIgnoreCase("csv")) {
-                    csvFile = new File(file.getParentFile(), FilenameUtils.removeExtension(fileName) + csvFileSuffix);                    
                 } else {
-                    csvFile = new File(file.toString() + csvFileSuffix);
+                    csvFile = new File(file.toString() + ".csv");
                 }
-                FileOutputStream out = new FileOutputStream(csvFile, false);
 
-                out.write((Bundle.SQLiteViewer_exportTableToCsv_FileName() + csvFile.getName() + "\n").getBytes());
-                out.write((Bundle.SQLiteViewer_exportTableToCsv_TableName() + tableName + "\n").getBytes());
-                // Set up the column names
-                Map<String, Object> row = currentTableRows.get(0);
-                StringBuffer header = new StringBuffer();
-                for (Map.Entry<String, Object> col : row.entrySet()) {
-                    String colName = col.getKey();
-                    if (header.length() > 0) {
-                        header.append(',').append(colName);
-                    } else {
-                        header.append(colName);
-                    }
-                }
-                out.write(header.append('\n').toString().getBytes());
+                try (FileOutputStream out = new FileOutputStream(csvFile, false)) {
 
-                for (Map<String, Object> maps : currentTableRows) {
-                    StringBuffer valueLine = new StringBuffer();
-                    maps.values().forEach((value) -> {
-                        if (valueLine.length() > 0) {
-                            valueLine.append(',').append(value.toString());
+                    out.write((Bundle.SQLiteViewer_exportTableToCsv_FileName() + csvFile.getName() + "\n").getBytes());
+                    out.write((Bundle.SQLiteViewer_exportTableToCsv_TableName() + tableName + "\n").getBytes());
+                    // Set up the column names
+                    Map<String, Object> row = currentTableRows.get(0);
+                    StringBuffer header = new StringBuffer();
+                    for (Map.Entry<String, Object> col : row.entrySet()) {
+                        String colName = col.getKey();
+                        if (header.length() > 0) {
+                            header.append(',').append(colName);
                         } else {
-                            valueLine.append(value.toString());
+                            header.append(colName);
                         }
-                    });
-                    out.write(valueLine.append('\n').toString().getBytes());
+                    }
+                    out.write(header.append('\n').toString().getBytes());
+
+                    for (Map<String, Object> maps : currentTableRows) {
+                        StringBuffer valueLine = new StringBuffer();
+                        maps.values().forEach((value) -> {
+                            if (valueLine.length() > 0) {
+                                valueLine.append(',').append(value.toString());
+                            } else {
+                                valueLine.append(value.toString());
+                            }
+                        });
+                        out.write(valueLine.append('\n').toString().getBytes());
+                    }
                 }
             }
         } catch (SQLException ex) {

Core/src/org/sleuthkit/autopsy/corecomponentinterfaces/CoreComponentControl.java

@@ -88,7 +88,21 @@ final public class CoreComponentControl {
         TopComponent directoryTree = null;
         TopComponent favorites = null;
         final WindowManager windowManager = WindowManager.getDefault();
+        
+        // Set the UI selections to null before closing the top components.
+        // Otherwise it may experience errors trying to load data for the closed case.
         for (Mode mode : windowManager.getModes()) {
+            for (TopComponent tc : windowManager.getOpenedTopComponents(mode)) {
+                if(tc instanceof DataContent) {
+                    ((DataContent) tc).setNode(null);
+                } else if(tc instanceof DataResult) {
+                    ((DataResult) tc).setNode(null);
+                }
+            }
+        }
+        
+        for (Mode mode : windowManager.getModes()) {
+            
             for (TopComponent tc : windowManager.getOpenedTopComponents(mode)) {
                 String tcName = tc.getName();
 
@@ -105,7 +119,7 @@ final public class CoreComponentControl {
                 }
             }
         }
-
+        
         if (directoryTree != null) {
             directoryTree.close();
         }

Core/src/org/sleuthkit/autopsy/corecomponents/DataResultPanel.java

@@ -26,7 +26,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import javax.swing.JTabbedPane;
-import javax.swing.SwingWorker;
+import javax.swing.SwingUtilities;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import org.openide.explorer.ExplorerManager;
@@ -579,29 +579,6 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
         }
     }
 
-    /**
-     * Worker for RootNodeListener childrenAdded.
-     */
-    class SetupTabsChildrenWorker extends SwingWorker<Void, Void> {
-
-        private final Node childNode;
-
-        SetupTabsChildrenWorker(Node aChildNode) {
-            childNode = aChildNode;
-        }
-
-        @Override
-        protected Void doInBackground() throws Exception {
-            setupTabs(childNode);
-            return null;
-        }
-
-        @Override
-        protected void done() {
-            setupTabs(childNode);
-        }
-    }
-
     /**
      * Responds to changes in the root node due to asynchronous child node
      * creation.
@@ -628,8 +605,13 @@ public class DataResultPanel extends javax.swing.JPanel implements DataResult, C
              */
             if (waitingForData && containsReal(delta)) {
                 waitingForData = false;
-                Node childNode = nme.getNode();
-                new SetupTabsChildrenWorker(childNode).execute();
+                if (SwingUtilities.isEventDispatchThread()) {
+                    setupTabs(nme.getNode());
+                } else {
+                    SwingUtilities.invokeLater(() -> {
+                        setupTabs(nme.getNode());
+                    });
+                }
             }
         }
 

Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java

@@ -141,7 +141,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
          * Configure the child OutlineView (explorer view) component.
          */
         outlineView.setAllowedDragActions(DnDConstants.ACTION_NONE);
-        
+
         outline = outlineView.getOutline();
         outline.setRowSelectionAllowed(true);
         outline.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
@@ -208,6 +208,11 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
     @Override
     @ThreadConfined(type = ThreadConfined.ThreadType.AWT)
     public void setNode(Node rootNode) {
+        if (! SwingUtilities.isEventDispatchThread()) {
+            LOGGER.log(Level.SEVERE, "Attempting to run setNode() from non-EDT thread");
+            return;
+        }
+        
         /*
          * The quick filter must be reset because when determining column width,
          * ETable.getRowCount is called, and the documentation states that quick
@@ -281,7 +286,7 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
          * let the table resize itself.
          */
         outline.setAutoResizeMode((props.isEmpty()) ? JTable.AUTO_RESIZE_ALL_COLUMNS : JTable.AUTO_RESIZE_OFF);
-
+       
         assignColumns(props); // assign columns to match the properties
         if (firstProp != null) {
             ((DefaultOutlineModel) outline.getOutlineModel()).setNodesColumnLabel(firstProp.getDisplayName());

Core/src/org/sleuthkit/autopsy/datamodel/AbstractAbstractFileNode.java

@@ -251,7 +251,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
         map.put(TYPE_DIR.toString(), content.getDirType().getLabel());
         map.put(TYPE_META.toString(), content.getMetaType().toString());
         map.put(KNOWN.toString(), content.getKnown().getName());
-        map.put(HASHSETS.toString(), getHashSetHitsForFile(content));
+        map.put(HASHSETS.toString(), getHashSetHitsCsvList(content));
         map.put(MD5HASH.toString(), StringUtils.defaultString(content.getMd5Hash()));
         map.put(ObjectID.toString(), content.getId());
         map.put(MIMETYPE.toString(), StringUtils.defaultString(content.getMIMEType()));
@@ -263,7 +263,7 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
      * to their sheets.
      *
      * @param sheetSet the modifiable Sheet.Set returned by
-     *           Sheet.get(Sheet.PROPERTIES)
+     *                 Sheet.get(Sheet.PROPERTIES)
      */
     @NbBundle.Messages("AbstractAbstractFileNode.tagsProperty.displayName=Tags")
     protected void addTagProperty(Sheet.Set sheetSet) {
@@ -301,7 +301,15 @@ public abstract class AbstractAbstractFileNode<T extends AbstractFile> extends A
         }
     }
 
-    public static String getHashSetHitsForFile(AbstractFile file) {
+    /**
+     * Gets a comma-separated values list of the names of the hash sets
+     * currently identified as including a given file.
+     *
+     * @param file The file.
+     *
+     * @return The CSV list of hash set names.
+     */
+    protected static String getHashSetHitsCsvList(AbstractFile file) {
         try {
             return StringUtils.join(file.getHashSetNames(), ", ");
         } catch (TskCoreException tskCoreException) {

Core/src/org/sleuthkit/autopsy/datamodel/AutopsyTreeChildFactory.java

@@ -41,9 +41,9 @@ import org.sleuthkit.datamodel.TskCoreException;
  * Child factory to create the top level children of the autopsy tree
  *  
  */
-public class AutopsyTreeChildrenFactory extends ChildFactory.Detachable<Object> { 
+public final class AutopsyTreeChildFactory extends ChildFactory.Detachable<Object> { 
     
-    private static final Logger logger = Logger.getLogger(AutopsyTreeChildrenFactory.class.getName());
+    private static final Logger logger = Logger.getLogger(AutopsyTreeChildFactory.class.getName());
     
     /**
      * Listener for handling DATA_SOURCE_ADDED events.

Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java

@@ -312,7 +312,11 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         "BlackboardArtifactNode.createSheet.artifactDetails.name=Artifact Details",
         "BlackboardArtifactNode.artifact.displayName=Artifact",
         "BlackboardArtifactNode.createSheet.artifactMD5.displayName=MD5 Hash",
-        "BlackboardArtifactNode.createSheet.artifactMD5.name=MD5 Hash"})
+        "BlackboardArtifactNode.createSheet.artifactMD5.name=MD5 Hash",
+        "BlackboardArtifactNode.createSheet.fileSize.name=Size",
+        "BlackboardArtifactNode.createSheet.fileSize.displayName=Size",
+        "BlackboardArtifactNode.createSheet.path.displayName=Path",
+        "BlackboardArtifactNode.createSheet.path.name=Path"})
 
     @Override
     protected Sheet createSheet() {
@@ -452,6 +456,31 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
                         dataSourceStr));
             }
         }
+        
+        // If EXIF, add props for file size and path
+        if (artifactTypeId == BlackboardArtifact.ARTIFACT_TYPE.TSK_METADATA_EXIF.getTypeID()) {
+            
+            long size = 0;
+            String path = ""; //NON-NLS
+            if (associated instanceof AbstractFile) {
+                AbstractFile af = (AbstractFile) associated;
+                size = af.getSize();
+                try {
+                    path = af.getUniquePath();
+                } catch (TskCoreException ex) {
+                    path = af.getParentPath();
+                }
+            }
+            sheetSet.put(new NodeProperty<>(NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.fileSize.name"),
+                    NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.fileSize.displayName"),
+                    NO_DESCR,
+                    size));
+            sheetSet.put(new NodeProperty<>(
+                    NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.path.name"),
+                    NbBundle.getMessage(BlackboardArtifactNode.class, "BlackboardArtifactNode.createSheet.path.displayName"),
+                    NO_DESCR,
+                    path));
+        }
 
         addTagProperty(sheetSet);
 

Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties

@@ -54,7 +54,6 @@ DataModelActionsFactory.srcFileInDir.text=View Source File in Directory
 DataModelActionsFactory.fileInDir.text=View File in Directory
 DataModelActionsFactory.viewNewWin.text=View in New Window
 DataModelActionsFactory.openExtViewer.text=Open in External Viewer
-DataModelActionsFactory.srfFileSameMD5.text=Search for files with the same MD5 hash
 DataSourcesNode.name=Data Sources
 DataSourcesNode.group_by_datasource.name=Data Source Files
 DataSourcesNode.createSheet.name.name=Name

Core/src/org/sleuthkit/autopsy/datamodel/Bundle_ja.properties

@@ -55,7 +55,6 @@ DataModelActionsFactory.srcFileInDir.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u
 DataModelActionsFactory.fileInDir.text=\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u5185\u306e\u30d5\u30a1\u30a4\u30eb\u3092\u8868\u793a
 DataModelActionsFactory.viewNewWin.text=\u65b0\u898f\u30a6\u30a3\u30f3\u30c9\u30a6\u306b\u8868\u793a
 DataModelActionsFactory.openExtViewer.text=\u5916\u90e8\u30d3\u30e5\u30fc\u30a2\u306b\u8868\u793a
-DataModelActionsFactory.srfFileSameMD5.text=\u540c\u3058MD5\u30cf\u30c3\u30b7\u30e5\u3092\u6301\u3064\u30d5\u30a1\u30a4\u30eb\u3092\u691c\u7d22
 DataSourcesNode.name=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9
 DataSourcesNode.group_by_datasource.name=\u30c7\u30fc\u30bf\u30bd\u30fc\u30b9\u30d5\u30a1\u30a4\u30eb
 DataSourcesNode.createSheet.name.name=\u540d\u524d

Core/src/org/sleuthkit/autopsy/datamodel/CommonFileChildNodeLoading.java

@@ -1,95 +0,0 @@
-/*
- * 
- * Autopsy Forensic Browser
- * 
- * Copyright 2018 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.datamodel;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import org.openide.nodes.Children;
-import org.openide.nodes.Sheet;
-import org.openide.util.NbBundle;
-
-/**
- * A dummy node used by the child factory to display while children are being
- * generated
- */
-public class CommonFileChildNodeLoading extends DisplayableItemNode {
-
-    public CommonFileChildNodeLoading(Children children) {
-        super(children);
-    }
-
-    @Override
-    public <T> T accept(DisplayableItemNodeVisitor<T> visitor) {
-        return visitor.visit(this);
-    }
-
-    @Override
-    public boolean isLeafTypeNode() {
-        return true;
-    }
-
-    @Override
-    public String getItemType() {
-        return getClass().getName();
-    }
-
-    @Override
-    protected Sheet createSheet() {
-        Sheet sheet = new Sheet();
-        Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES);
-        if (sheetSet == null) {
-            sheetSet = Sheet.createPropertiesSet();
-            sheet.put(sheetSet);
-        }
-
-        Map<String, Object> map = new LinkedHashMap<>();
-        map.put(CommonFileChildLoadingPropertyType.File.toString(), "Loading...");
-
-        final String NO_DESCR = Bundle.AbstractFsContentNode_noDesc_text();
-        for (CommonFileChildLoadingPropertyType propType : CommonFileChildLoadingPropertyType.values()) {
-            final String propString = propType.toString();
-            sheetSet.put(new NodeProperty<>(propString, propString, NO_DESCR, map.get(propString)));
-        }
-
-        return sheet;
-    }
-
-    /**
-     * Represents the sole column for the 'dummy' loading node.
-     */
-    @NbBundle.Messages({
-        "CommonFileChildLoadingPropertyType.fileColLbl=File"
-    })
-    public enum CommonFileChildLoadingPropertyType {
-
-        File(Bundle.CommonFileChildLoadingPropertyType_fileColLbl());
-
-        final private String displayString;
-
-        private CommonFileChildLoadingPropertyType(String displayString) {
-            this.displayString = displayString;
-        }
-
-        @Override
-        public String toString() {
-            return displayString;
-        }
-    }
-}

Core/src/org/sleuthkit/autopsy/datamodel/DataModelActionsFactory.java

@@ -38,7 +38,6 @@ import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.datamodel.Reports.ReportNode;
 import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
-import org.sleuthkit.autopsy.directorytree.HashSearchAction;
 import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
 import org.sleuthkit.autopsy.directorytree.ViewContextAction;
 import org.sleuthkit.datamodel.AbstractFile;
@@ -76,8 +75,6 @@ public class DataModelActionsFactory {
             .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.viewNewWin.text");
     public static final String OPEN_IN_EXTERNAL_VIEWER = NbBundle
             .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.openExtViewer.text");
-    public static final String SEARCH_FOR_FILES_SAME_MD5 = NbBundle
-            .getMessage(DataModelActionsFactory.class, "DataModelActionsFactory.srfFileSameMD5.text");
 
     public static List<Action> getActions(File file, boolean isArtifactSource) {
         List<Action> actionsList = new ArrayList<>();
@@ -88,7 +85,6 @@ public class DataModelActionsFactory {
         actionsList.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, fileNode));
         actionsList.add(null); // creates a menu separator
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction(SEARCH_FOR_FILES_SAME_MD5, fileNode));
         actionsList.add(null); // creates a menu separator
         actionsList.add(AddContentTagAction.getInstance());
         if (isArtifactSource) {
@@ -367,7 +363,6 @@ public class DataModelActionsFactory {
         actionsList.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, tagNode));
         actionsList.add(null); // creates a menu separator
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction(SEARCH_FOR_FILES_SAME_MD5, tagNode));
         actionsList.add(null); // creates a menu separator
         actionsList.add(AddContentTagAction.getInstance());
         if (isArtifactSource) {
@@ -404,7 +399,6 @@ public class DataModelActionsFactory {
         actionsList.add(new ExternalViewerAction(OPEN_IN_EXTERNAL_VIEWER, tagNode));
         actionsList.add(null); // creates a menu separator
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction(SEARCH_FOR_FILES_SAME_MD5, tagNode));
         actionsList.add(null); // creates a menu separator
         actionsList.add(AddContentTagAction.getInstance());
         if (isArtifactSource) {

Core/src/org/sleuthkit/autopsy/datamodel/DisplayableItemNodeVisitor.java

@@ -120,8 +120,6 @@ public interface DisplayableItemNodeVisitor<T> {
     T visit(CommonFilesNode cfn);
 
     T visit(FileInstanceNode fin);
-
-    T visit(CommonFileChildNodeLoading cfcnl);
     
     T visit(InstanceCountNode icn);
 
@@ -213,11 +211,6 @@ public interface DisplayableItemNodeVisitor<T> {
             return defaultVisit(icn);
         }
 
-        @Override
-        public T visit(CommonFileChildNodeLoading cfcnl) {
-            return defaultVisit(cfcnl);
-        }
-
         @Override
         public T visit(DirectoryNode dn) {
             return defaultVisit(dn);

Core/src/org/sleuthkit/autopsy/datamodel/FileNode.java

@@ -34,7 +34,6 @@ import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
-import org.sleuthkit.autopsy.directorytree.HashSearchAction;
 import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
 import org.sleuthkit.autopsy.directorytree.ViewContextAction;
 import org.sleuthkit.autopsy.modules.embeddedfileextractor.ExtractArchiveWithPasswordAction;
@@ -166,7 +165,6 @@ public class FileNode extends AbstractFsContentNode<AbstractFile> {
         actionsList.add(null); // Creates an item separator
 
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction(Bundle.FileNode_getActions_searchFilesSameMD5_text(), this));
         actionsList.add(null); // Creates an item separator
 
         actionsList.add(AddContentTagAction.getInstance());

Core/src/org/sleuthkit/autopsy/datamodel/FileTypes.java

@@ -249,7 +249,7 @@ public final class FileTypes implements AutopsyVisitableItem {
             if (typesRoot.showCounts) {
                 //only show "(counting...)" the first time, otherwise it is distracting.
                 setDisplayName(getDisplayNameBase() + ((childCount < 0) ? Bundle.FileTypes_bgCounting_placeholder()
-                        : ("(" + childCount + ")"))); //NON-NLS
+                        : (" (" + childCount + ")"))); //NON-NLS
                 new SwingWorker<Long, Void>() {
                     @Override
                     protected Long doInBackground() throws Exception {

Core/src/org/sleuthkit/autopsy/datamodel/LocalFileNode.java

@@ -36,7 +36,6 @@ import org.sleuthkit.autopsy.coreutils.ContextMenuExtensionPoint;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
-import org.sleuthkit.autopsy.directorytree.HashSearchAction;
 import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
 import org.sleuthkit.autopsy.directorytree.ViewContextAction;
 import org.sleuthkit.autopsy.modules.embeddedfileextractor.ExtractArchiveWithPasswordAction;
@@ -107,8 +106,6 @@ public class LocalFileNode extends AbstractAbstractFileNode<AbstractFile> {
         actionsList.add(null); // creates a menu separator
 
         actionsList.add(ExtractAction.getInstance());
-        actionsList.add(new HashSearchAction(
-                NbBundle.getMessage(this.getClass(), "LocalFileNode.getActions.searchFilesSameMd5.text"), this));
         actionsList.add(null); // creates a menu separator
         actionsList.add(AddContentTagAction.getInstance());
 

Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties

@@ -120,3 +120,8 @@ AddExternalViewerRulePanel.exePathTextField.text=
 AddExternalViewerRulePanel.exePathLabel.text=Path of the program to use for files with this type or extension
 AddExternalViewerRulePanel.extRadioButton.text=Extension
 DirectoryTreeTopComponent.groupByDatasourceCheckBox.text=Group by Data Source
+GroupDataSourcesDialog.dataSourceCountLabel.text=jLabel1
+GroupDataSourcesDialog.queryLabel.text=Would you like to group by data source for faster loading?
+GroupDataSourcesDialog.yesButton.text=Yes
+GroupDataSourcesDialog.noButton.text=No
+GroupDataSourcesDialog.title=Group by Data Source?

Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java

@@ -401,10 +401,8 @@ public class DataResultFilterNode extends FilterNode {
             }
             Content c = ban.getLookup().lookup(File.class);
             Node n = null;
-            boolean md5Action = false;
             if (c != null) {
                 n = new FileNode((AbstractFile) c);
-                md5Action = true;
             } else if ((c = ban.getLookup().lookup(Directory.class)) != null) {
                 n = new DirectoryNode((Directory) c);
             } else if ((c = ban.getLookup().lookup(VirtualDirectory.class)) != null) {
@@ -438,10 +436,6 @@ public class DataResultFilterNode extends FilterNode {
                         NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.openInExtViewer.text"), n));
                 actionsList.add(null); // creates a menu separator
                 actionsList.add(ExtractAction.getInstance());
-                if (md5Action) {
-                    actionsList.add(new HashSearchAction(
-                            NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.searchFilesSameMd5.text"), n));
-                }
                 actionsList.add(null); // creates a menu separator
                 actionsList.add(AddContentTagAction.getInstance());
                 actionsList.add(AddBlackboardArtifactTagAction.getInstance());

Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java

@@ -24,6 +24,11 @@ import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyVetoException;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
@@ -35,6 +40,7 @@ import java.util.concurrent.ExecutionException;
 import java.util.logging.Level;
 import java.util.prefs.PreferenceChangeEvent;
 import java.util.prefs.PreferenceChangeListener;
+import java.util.Properties;
 import javax.swing.Action;
 import javax.swing.SwingUtilities;
 import javax.swing.SwingWorker;
@@ -62,6 +68,7 @@ import org.sleuthkit.autopsy.corecomponentinterfaces.DataExplorer;
 import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
 import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.datamodel.ArtifactNodeSelectionInfo;
 import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode;
 import org.sleuthkit.autopsy.datamodel.CreditCards;
@@ -73,7 +80,7 @@ import org.sleuthkit.autopsy.datamodel.FileTypesByMimeType;
 import org.sleuthkit.autopsy.datamodel.InterestingHits;
 import org.sleuthkit.autopsy.datamodel.KeywordHits;
 import org.sleuthkit.autopsy.datamodel.ResultsNode;
-import org.sleuthkit.autopsy.datamodel.AutopsyTreeChildrenFactory;
+import org.sleuthkit.autopsy.datamodel.AutopsyTreeChildFactory;
 import org.sleuthkit.autopsy.datamodel.ViewsNode;
 import org.sleuthkit.autopsy.datamodel.accounts.Accounts;
 import org.sleuthkit.autopsy.datamodel.accounts.BINRange;
@@ -101,8 +108,11 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     private final LinkedList<String[]> forwardList;
     private static final String PREFERRED_ID = "DirectoryTreeTopComponent"; //NON-NLS
     private static final Logger LOGGER = Logger.getLogger(DirectoryTreeTopComponent.class.getName());
-    private AutopsyTreeChildrenFactory autopsyTreeChildrenFactory;
+    private AutopsyTreeChildFactory autopsyTreeChildFactory;
     private Children autopsyTreeChildren;
+    private static final long DEFAULT_DATASOURCE_GROUPING_THRESHOLD = 5; // Threshold for prompting the user about grouping by data source
+    private static final String GROUPING_THRESHOLD_NAME = "GroupDataSourceThreshold";
+    private static final String SETTINGS_FILE = "CasePreferences.properties"; //NON-NLS
 
     /**
      * the constructor
@@ -125,7 +135,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         this.forwardList = new LinkedList<>();
         backButton.setEnabled(false);
         forwardButton.setEnabled(false);
-        
+
         groupByDatasourceCheckBox.setSelected(UserPreferences.groupItemsInTreeByDatasource());
     }
 
@@ -149,7 +159,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                 }
             }
         });
-        
+
         Case.addEventTypeSubscriber(EnumSet.of(Case.Events.CURRENT_CASE, Case.Events.DATA_SOURCE_ADDED), this);
         this.em.addPropertyChangeListener(this);
         IngestManager.getInstance().addIngestJobEventListener(this);
@@ -370,6 +380,51 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         return TopComponent.PERSISTENCE_NEVER;
     }
 
+    /**
+     * Ask the user if they want to group by data source when opening a large
+     * case.
+     *
+     * @param currentCase
+     * @param dataSourceCount
+     */
+    private void promptForDataSourceGrouping(Case currentCase, int dataSourceCount) {
+        Path settingsFile = Paths.get(currentCase.getConfigDirectory(), SETTINGS_FILE); //NON-NLS
+        if (settingsFile.toFile().exists()) {
+            // Read the setting
+            try (InputStream inputStream = Files.newInputStream(settingsFile)) {
+                Properties props = new Properties();
+                props.load(inputStream);
+                if (props.getProperty("groupByDataSource", "false").equals("true")) {
+                    UserPreferences.setGroupItemsInTreeByDatasource(true);
+                    groupByDatasourceCheckBox.setSelected(true);
+                }
+            } catch (IOException ex) {
+                LOGGER.log(Level.SEVERE, "Error reading settings file", ex);
+            }
+        } else {
+            GroupDataSourcesDialog dialog = new GroupDataSourcesDialog(dataSourceCount);
+            dialog.display();
+            if (dialog.groupByDataSourceSelected()) {
+                UserPreferences.setGroupItemsInTreeByDatasource(true);
+                groupByDatasourceCheckBox.setSelected(true);
+            }
+
+            // Save the response
+            Properties props = new Properties();
+            if (dialog.groupByDataSourceSelected()) {
+                props.setProperty("groupByDataSource", "true");
+            } else {
+                props.setProperty("groupByDataSource", "false");
+            }
+
+            try (OutputStream fos = Files.newOutputStream(settingsFile)) {
+                props.store(fos, ""); //NON-NLS
+            } catch (IOException ex) {
+                LOGGER.log(Level.SEVERE, "Error writing settings file", ex);
+            }
+        }
+    }
+
     /**
      * Called only when top component was closed on all workspaces before and
      * now is opened for the first time on some workspace. The intent is to
@@ -377,6 +432,9 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
      * existing workspaces. Subclasses will usually perform initializing tasks
      * here.
      */
+    @NbBundle.Messages({"# {0} - dataSourceCount",
+        "DirectoryTreeTopComponent.componentOpened.groupDataSources.text=This case contains {0} data sources. Would you like to group by data source for faster loading?",
+        "DirectoryTreeTopComponent.componentOpened.groupDataSources.title=Group by data source?"})
     @Override
     public void componentOpened() {
         // change the cursor to "waiting cursor" for this operation
@@ -392,9 +450,34 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
         if (null == currentCase || currentCase.hasData() == false) {
             getTree().setRootVisible(false); // hide the root
         } else {
+            // If the case contains a lot of data sources, and they aren't already grouping
+            // by data source, give the user the option to do so before loading the tree.
+            if (RuntimeProperties.runningWithGUI()) {
+                long threshold = DEFAULT_DATASOURCE_GROUPING_THRESHOLD;
+                if (ModuleSettings.settingExists(ModuleSettings.MAIN_SETTINGS, GROUPING_THRESHOLD_NAME)) {
+                    try {
+                        threshold = Long.parseLong(ModuleSettings.getConfigSetting(ModuleSettings.MAIN_SETTINGS, GROUPING_THRESHOLD_NAME));
+                    } catch (NumberFormatException ex) {
+                        LOGGER.log(Level.SEVERE, "Group data sources threshold is not a number", ex);
+                    }
+                } else {
+                    ModuleSettings.setConfigSetting(ModuleSettings.MAIN_SETTINGS, GROUPING_THRESHOLD_NAME, String.valueOf(threshold));
+                }
+
+                try {
+                    int dataSourceCount = currentCase.getDataSources().size();
+                    if (!UserPreferences.groupItemsInTreeByDatasource()
+                            && dataSourceCount > threshold) {
+                        promptForDataSourceGrouping(currentCase, dataSourceCount);
+                    }
+                } catch (TskCoreException ex) {
+                    LOGGER.log(Level.SEVERE, "Error loading data sources", ex);
+                }
+            }
+
             // if there's at least one image, load the image and open the top componen
-            autopsyTreeChildrenFactory = new AutopsyTreeChildrenFactory();
-            autopsyTreeChildren = Children.create(autopsyTreeChildrenFactory, true);     
+            autopsyTreeChildFactory = new AutopsyTreeChildFactory();
+            autopsyTreeChildren = Children.create(autopsyTreeChildFactory, true);
             Node root = new AbstractNode(autopsyTreeChildren) {
                 //JIRA-2807: What is the point of these overrides?
                 /**
@@ -453,9 +536,9 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                         tree.collapseNode(views);
                     }
                     /*
-                     * JIRA-2806: What is this supposed to do? Right now it selects
-                     * the data sources node, but the comment seems to indicate
-                     * it is supposed to select the first datasource.
+                     * JIRA-2806: What is this supposed to do? Right now it
+                     * selects the data sources node, but the comment seems to
+                     * indicate it is supposed to select the first datasource.
                      */
                     // select the first image node, if there is one
                     // (this has to happen after dataResult is opened, because the event
@@ -484,7 +567,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                     // dataResult active)
                     try {
                         Node[] selections = get();
-                        if (selections != null && selections.length > 0){
+                        if (selections != null && selections.length > 0) {
                             em.setSelectedNodes(selections);
                         }
                     } catch (PropertyVetoException ex) {
@@ -592,15 +675,15 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
     }
 
     /**
-     * The "listener" that listens to any changes made in the Case.java class.
-     * It will do something based on the changes in the Case.java class.
+     * The "listener" that monitors changes made in the Case class. This serves
+     * the purpose of keeping the UI in sync with the data as it changes.
      *
-     * @param evt the property change event
+     * @param event The property change event.
      */
     @Override
-    public void propertyChange(PropertyChangeEvent evt) {
+    public void propertyChange(PropertyChangeEvent event) {
         if (RuntimeProperties.runningWithGUI()) {
-            String changed = evt.getPropertyName();
+            String changed = event.getPropertyName();
             if (changed.equals(Case.Events.CURRENT_CASE.toString())) { // changed current case
                 // When a case is closed, the old value of this property is the 
                 // closed Case object and the new value is null. When a case is 
@@ -610,15 +693,15 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                 // opened events instead of property change events would be a better
                 // solution. Either way, more probably needs to be done to clean up
                 // data model objects when a case is closed.
-                if (evt.getOldValue() != null && evt.getNewValue() == null) {
+                if (event.getOldValue() != null && event.getNewValue() == null) {
                     // The current case has been closed. Reset the ExplorerManager.
                     SwingUtilities.invokeLater(() -> {
                         Node emptyNode = new AbstractNode(Children.LEAF);
                         em.setRootContext(emptyNode);
                     });
-                } else if (evt.getNewValue() != null) {
+                } else if (event.getNewValue() != null) {
                     // A new case has been opened. Reset the ExplorerManager. 
-                    Case newCase = (Case) evt.getNewValue();
+                    Case newCase = (Case) event.getNewValue();
                     final String newCaseName = newCase.getName();
                     SwingUtilities.invokeLater(() -> {
                         em.getRootContext().setName(newCaseName);
@@ -642,20 +725,29 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
                  * already closed.
                  */
                 try {
-                    Case currentCase = Case.getCurrentCaseThrows();
-                    // We only need to trigger openCoreWindows() when the
-                    // first data source is added.
-                    if (currentCase.getDataSources().size() == 1) {
-                        SwingUtilities.invokeLater(CoreComponentControl::openCoreWindows);
-                    }
-                } catch (NoCurrentCaseException | TskCoreException notUsed) {
+                    Case.getCurrentCaseThrows();
+                    /*
+                     * In case the Case 'updateGUIForCaseOpened()' method hasn't
+                     * already done so, open the tree and all other core
+                     * windows.
+                     *
+                     * TODO: (JIRA-4053) DirectoryTreeTopComponent should not be
+                     * responsible for opening core windows. Consider moving
+                     * this elsewhere.
+                     */
+                    SwingUtilities.invokeLater(() -> {
+                        if (! DirectoryTreeTopComponent.this.isOpened()) {
+                            CoreComponentControl.openCoreWindows();
+                        }
+                    });
+                } catch (NoCurrentCaseException notUsed) {
                     /**
                      * Case is closed, do nothing.
                      */
                 }
             } // change in node selection
             else if (changed.equals(ExplorerManager.PROP_SELECTED_NODES)) {
-                respondSelection((Node[]) evt.getOldValue(), (Node[]) evt.getNewValue());
+                respondSelection((Node[]) event.getOldValue(), (Node[]) event.getNewValue());
             } else if (changed.equals(IngestManager.IngestModuleEvent.DATA_ADDED.toString())) {
                 // nothing to do here.
                 // all nodes should be listening for these events and update accordingly.
@@ -800,7 +892,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
 
     /**
      * Rebuilds the autopsy tree.
-     * 
+     *
      * Does nothing if there is no open case.
      */
     private void rebuildTree() {
@@ -813,11 +905,11 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             return;
         }
         if (null == currentCase || currentCase.hasData() == false) {
-           return;
+            return;
         }
-        
+
         // refresh all children of the root.
-        autopsyTreeChildrenFactory.refreshChildren();
+        autopsyTreeChildFactory.refreshChildren();
 
         // Select the first node and reset the selection history
         // This should happen on the EDT once the tree has been rebuilt.
@@ -842,14 +934,14 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             }
         }.execute();
     }
-    
+
     /**
      * Selects the first node in the tree.
-     * 
+     *
      */
-    private void selectFirstChildNode () {
+    private void selectFirstChildNode() {
         Children rootChildren = em.getRootContext().getChildren();
-        
+
         if (rootChildren.getNodesCount() > 0) {
             Node firstNode = rootChildren.getNodeAt(0);
             if (firstNode != null) {
@@ -858,6 +950,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
             }
         }
     }
+
     /**
      * Set the selected node using a path to a previously selected node.
      *

Core/src/org/sleuthkit/autopsy/directorytree/GroupDataSourcesDialog.form

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<Form version="1.5" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+  <Properties>
+    <Property name="defaultCloseOperation" type="int" value="2"/>
+    <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+      <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="GroupDataSourcesDialog.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+    </Property>
+  </Properties>
+  <SyntheticProperties>
+    <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
+  </SyntheticProperties>
+  <AuxValues>
+    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
+    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+  </AuxValues>
+
+  <Layout>
+    <DimensionLayout dim="0">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="0" attributes="0">
+                  <Component id="queryLabel" max="32767" attributes="0"/>
+                  <Group type="102" attributes="0">
+                      <Component id="dataSourceCountLabel" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
+                  <Group type="102" alignment="1" attributes="0">
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                      <Component id="yesButton" min="-2" pref="76" max="-2" attributes="0"/>
+                      <EmptySpace max="-2" attributes="0"/>
+                      <Component id="noButton" min="-2" pref="76" max="-2" attributes="0"/>
+                  </Group>
+              </Group>
+              <EmptySpace max="-2" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+    <DimensionLayout dim="1">
+      <Group type="103" groupAlignment="0" attributes="0">
+          <Group type="102" alignment="0" attributes="0">
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="dataSourceCountLabel" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="queryLabel" min="-2" max="-2" attributes="0"/>
+              <EmptySpace type="unrelated" max="-2" attributes="0"/>
+              <Group type="103" groupAlignment="3" attributes="0">
+                  <Component id="yesButton" alignment="3" min="-2" max="-2" attributes="0"/>
+                  <Component id="noButton" alignment="3" min="-2" max="-2" attributes="0"/>
+              </Group>
+              <EmptySpace max="32767" attributes="0"/>
+          </Group>
+      </Group>
+    </DimensionLayout>
+  </Layout>
+  <SubComponents>
+    <Component class="javax.swing.JLabel" name="dataSourceCountLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="GroupDataSourcesDialog.dataSourceCountLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="queryLabel">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="GroupDataSourcesDialog.queryLabel.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JButton" name="yesButton">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="GroupDataSourcesDialog.yesButton.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="yesButtonActionPerformed"/>
+      </Events>
+    </Component>
+    <Component class="javax.swing.JButton" name="noButton">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="GroupDataSourcesDialog.noButton.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="noButtonActionPerformed"/>
+      </Events>
+    </Component>
+  </SubComponents>
+</Form>

Core/src/org/sleuthkit/autopsy/directorytree/GroupDataSourcesDialog.java

@@ -0,0 +1,147 @@
+/*
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2011-2018 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.directorytree;
+
+import javax.swing.JFrame;
+import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
+
+/**
+ *
+ */
+@SuppressWarnings("PMD.SingularField") // UI widgets cause lots of false positives
+final class GroupDataSourcesDialog extends javax.swing.JDialog {
+
+    boolean shouldGroupByDataSource = false;
+    
+    /**
+     * Creates new form GroupDataSourcesDialog
+     */
+    @NbBundle.Messages({"# {0} - dataSourceCount",
+                    "GroupDataSourcesDialog.groupDataSources.text=This case contains {0} data sources."})
+    GroupDataSourcesDialog(int dataSourceCount) {
+        super((JFrame) WindowManager.getDefault().getMainWindow());
+        initComponents();
+        dataSourceCountLabel.setText(Bundle.GroupDataSourcesDialog_groupDataSources_text(dataSourceCount));
+    }
+    
+    /**
+     * Display the dialog.
+     */
+    void display() {
+        setModal(true);
+        setSize(getPreferredSize());
+        setLocationRelativeTo(this.getParent());
+        setAlwaysOnTop(false);
+        pack();
+        setVisible(true);
+    }
+    
+    boolean groupByDataSourceSelected() {
+        return shouldGroupByDataSource;
+    }
+
+    /**
+     * This method is called from within the constructor to initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is always
+     * regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        dataSourceCountLabel = new javax.swing.JLabel();
+        queryLabel = new javax.swing.JLabel();
+        yesButton = new javax.swing.JButton();
+        noButton = new javax.swing.JButton();
+
+        setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
+        setTitle(org.openide.util.NbBundle.getMessage(GroupDataSourcesDialog.class, "GroupDataSourcesDialog.title")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(dataSourceCountLabel, org.openide.util.NbBundle.getMessage(GroupDataSourcesDialog.class, "GroupDataSourcesDialog.dataSourceCountLabel.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(queryLabel, org.openide.util.NbBundle.getMessage(GroupDataSourcesDialog.class, "GroupDataSourcesDialog.queryLabel.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(yesButton, org.openide.util.NbBundle.getMessage(GroupDataSourcesDialog.class, "GroupDataSourcesDialog.yesButton.text")); // NOI18N
+        yesButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                yesButtonActionPerformed(evt);
+            }
+        });
+
+        org.openide.awt.Mnemonics.setLocalizedText(noButton, org.openide.util.NbBundle.getMessage(GroupDataSourcesDialog.class, "GroupDataSourcesDialog.noButton.text")); // NOI18N
+        noButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                noButtonActionPerformed(evt);
+            }
+        });
+
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
+        getContentPane().setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(queryLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(dataSourceCountLabel)
+                        .addGap(0, 0, Short.MAX_VALUE))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                        .addGap(0, 0, Short.MAX_VALUE)
+                        .addComponent(yesButton, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(noButton, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(dataSourceCountLabel)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(queryLabel)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(yesButton)
+                    .addComponent(noButton))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+        );
+
+        pack();
+    }// </editor-fold>//GEN-END:initComponents
+
+    private void yesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_yesButtonActionPerformed
+        shouldGroupByDataSource = true;
+        dispose();
+    }//GEN-LAST:event_yesButtonActionPerformed
+
+    private void noButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_noButtonActionPerformed
+        shouldGroupByDataSource = false;
+        dispose();
+    }//GEN-LAST:event_noButtonActionPerformed
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JLabel dataSourceCountLabel;
+    private javax.swing.JButton noButton;
+    private javax.swing.JLabel queryLabel;
+    private javax.swing.JButton yesButton;
+    // End of variables declaration//GEN-END:variables
+}

Core/src/org/sleuthkit/autopsy/directorytree/HashSearchAction.java

@@ -1,52 +0,0 @@
-/*
- * Autopsy Forensic Browser
- * 
- * Copyright 2011 Basis Technology Corp.
- * Contact: carrier <at> sleuthkit <dot> org
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.sleuthkit.autopsy.directorytree;
-
-import java.awt.event.ActionEvent;
-import javax.annotation.concurrent.Immutable;
-import javax.swing.AbstractAction;
-import org.openide.nodes.Node;
-import org.sleuthkit.autopsy.modules.hashdatabase.HashDbSearchAction;
-
-/**
- * Action to lookup the interface and call the real action in HashDatabase. The
- * real action, HashDbSearchAction, implements HashSearchProvider, and should be
- * the only instance of it.
- *
- * //TODO: HashDBSearchAction needs a public constructor and a service
- * registration annotation for the lookup technique to work
- */
-@Immutable
-public class HashSearchAction extends AbstractAction {
-
-    private final Node contentNode;
-
-    public HashSearchAction(String title, Node contentNode) {
-        super(title);
-        this.contentNode = contentNode;
-    }
-
-    @Override
-    public void actionPerformed(ActionEvent e) {
-        //HashSearchProvider searcher = Lookup.getDefault().lookup(HashSearchProvider.class);
-        //TODO: HashDBSearchAction needs a public constructor and a service registration annotation for the above technique to work
-        HashDbSearchAction searcher = HashDbSearchAction.getDefault();
-        searcher.search(contentNode);
-    }
-}

Core/src/org/sleuthkit/autopsy/filesearch/DataSourcePanel.java

@@ -18,8 +18,6 @@
  */
 package org.sleuthkit.autopsy.filesearch;
 
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,7 +27,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
-import javax.swing.JList;
 import javax.swing.event.ListSelectionEvent;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@@ -47,38 +44,28 @@ public class DataSourcePanel extends javax.swing.JPanel {
     private static final Logger logger = Logger.getLogger(DataSourcePanel.class.getName());
     private static final long serialVersionUID = 1L;
     private final Map<Long, String> dataSourceMap = new HashMap<>();
-    private final List<String> toolTipList = new ArrayList<>();
 
     /**
      * Creates new form DataSourcePanel
      */
     public DataSourcePanel() {
         initComponents();
-        this.dataSourceList.addListSelectionListener((ListSelectionEvent evt) -> {
-            firePropertyChange(FileSearchPanel.EVENT.CHECKED.toString(), null, null);
-        });
-        this.dataSourceList.addMouseMotionListener(new MouseMotionListener() {
-
-            @Override
-            public void mouseDragged(MouseEvent evt) {
-                //Unused by now
-            }
-
-            @Override
-            public void mouseMoved(MouseEvent evt) {
-                if (evt.getSource() instanceof JList<?>) {
-                    JList<?> dsList = (JList<?>) evt.getSource();
-                    int index = dsList.locationToIndex(evt.getPoint());
-                    if (index > -1) {
-                        dsList.setToolTipText(toolTipList.get(index));
-                    }
-                }
-            }
-    });
+        if (this.dataSourceList.getModel().getSize() > 1) {
+            this.dataSourceList.addListSelectionListener((ListSelectionEvent evt) -> {
+                firePropertyChange(FileSearchPanel.EVENT.CHECKED.toString(), null, null);
+            });
+        } else {
+            /*
+             * Disable data source filtering since there aren't multiple data
+             * sources to choose from.
+             */
+            this.dataSourceCheckBox.setEnabled(false);
+            this.dataSourceList.setEnabled(false);
+        }
     }
 
     /**
-     * Get dataSourceMap with object id and data source display name. Add the data source full name to toolTipList
+     * Get dataSourceMap with object id and data source display name.
      *
      * @return The list of data source name
      */
@@ -93,8 +80,7 @@ public class DataSourcePanel extends javax.swing.JPanel {
                 String dsName = ds.getName();
                 File dataSourceFullName = new File(dsName);
                 String displayName = dataSourceFullName.getName();
-                dataSourceMap.put(ds.getId(), displayName);  
-                toolTipList.add(dsName);
+                dataSourceMap.put(ds.getId(), displayName);
                 dsList.add(displayName);
             }
         } catch (NoCurrentCaseException ex) {
@@ -107,7 +93,8 @@ public class DataSourcePanel extends javax.swing.JPanel {
 
     /**
      * Get a set of data source object ids that are selected.
-     * @return A set of selected object ids. 
+     *
+     * @return A set of selected object ids.
      */
     Set<Long> getDataSourcesSelected() {
         Set<Long> dataSourceObjIdSet = new HashSet<>();
@@ -124,6 +111,7 @@ public class DataSourcePanel extends javax.swing.JPanel {
 
     /**
      * Is dataSourceCheckBox selected
+     *
      * @return true if the dataSoureCheckBox is selected
      */
     boolean isSelected() {
@@ -131,7 +119,8 @@ public class DataSourcePanel extends javax.swing.JPanel {
     }
 
     /**
-     * Enable the dsList and dataSourceNoteLable if the dataSourceCheckBox is checked.
+     * Enable the dsList and dataSourceNoteLable if the dataSourceCheckBox is
+     * checked.
      */
     final void setComponentsEnabled() {
         boolean enabled = this.isSelected();

Core/src/org/sleuthkit/autopsy/imagewriter/ImageWriter.java

@@ -134,7 +134,7 @@ class ImageWriter implements PropertyChangeListener{
     
     @Messages({
         "# {0} - data source name", 
-        "ImageWriter.progressBar.message=Finishing acquisition of {0}"
+        "ImageWriter.progressBar.message=Finishing acquisition of {0} (unplug device to cancel)"
     })
     private void startFinishImage(String dataSourceName){
       

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

@@ -556,17 +556,29 @@ class ReportHTML implements TableReportModule {
     }
 
     /**
-     * Add a row to the current table.
+     * Add a row to the current table, escaping the text to be contained in the
+     * row.
      *
      * @param row values for each cell in the row
      */
     @Override
     public void addRow(List<String> row) {
+        addRow(row, true);
+    }
+
+    /**
+     * Add a row to the current table.
+     *
+     * @param row        values for each cell in the row
+     * @param escapeText whether or not the text of the row should be escaped,
+     *                   true for escaped, false for not escaped
+     */
+    private void addRow(List<String> row, boolean escapeText) {
         StringBuilder builder = new StringBuilder();
         builder.append("\t<tr>\n"); //NON-NLS
         for (String cell : row) {
-            String escapeHTMLCell = EscapeUtil.escapeHtml(cell);
-            builder.append("\t\t<td>").append(escapeHTMLCell).append("</td>\n"); //NON-NLS
+            String cellText = escapeText ? EscapeUtil.escapeHtml(cell) : cell;
+            builder.append("\t\t<td>").append(cellText).append("</td>\n"); //NON-NLS
         }
         builder.append("\t</tr>\n"); //NON-NLS
         rowCount++;
@@ -593,7 +605,7 @@ class ReportHTML implements TableReportModule {
     public void addRowWithTaggedContentHyperlink(List<String> row, ContentTag contentTag) {
         Content content = contentTag.getContent();
         if (content instanceof AbstractFile == false) {
-            addRow(row);
+            addRow(row, true);
             return;
         }
         AbstractFile file = (AbstractFile) content;
@@ -647,7 +659,7 @@ class ReportHTML implements TableReportModule {
         int pages = 1;
         for (Content content : images) {
             if (currentRow.size() == THUMBNAIL_COLUMNS) {
-                addRow(currentRow);
+                addRow(currentRow, false);
                 currentRow.clear();
             }
 
@@ -727,7 +739,7 @@ class ReportHTML implements TableReportModule {
                 // Finish out the row.
                 currentRow.add("");
             }
-            addRow(currentRow);
+            addRow(currentRow, false);
         }
 
         // manually set rowCount to be the total number of images.
@@ -1094,8 +1106,8 @@ class ReportHTML implements TableReportModule {
             summary.append("<div class=\"title\">\n"); //NON-NLS
             summary.append(writeSummaryCaseDetails());
             summary.append(writeSummaryImageInfo());
-            summary.append(writeSummarySoftwareInfo(skCase,ingestJobs));
-            summary.append(writeSummaryIngestHistoryInfo(skCase,ingestJobs));
+            summary.append(writeSummarySoftwareInfo(skCase, ingestJobs));
+            summary.append(writeSummaryIngestHistoryInfo(skCase, ingestJobs));
             if (generatorLogoSet) {
                 summary.append("<div class=\"left\">\n"); //NON-NLS
                 summary.append("<img src=\"generator_logo.png\" />\n"); //NON-NLS
@@ -1126,14 +1138,13 @@ class ReportHTML implements TableReportModule {
             }
         }
     }
-    
+
     /**
      * Write the case details section of the summary for this report.
-     * 
+     *
      * @return StringBuilder updated html report with case details
      */
-    
-    private StringBuilder writeSummaryCaseDetails(){
+    private StringBuilder writeSummaryCaseDetails() {
         StringBuilder summary = new StringBuilder();
         String caseName = currentCase.getDisplayName();
         String caseNumber = currentCase.getNumber();
@@ -1146,40 +1157,39 @@ class ReportHTML implements TableReportModule {
             imagecount = 0;
         }
         summary.append("<div class=\"title\">\n"); //NON-NLS
-            if (agencyLogoSet) {
-                summary.append("<div class=\"left\">\n"); //NON-NLS
-                summary.append("<img src=\"");
-                summary.append(Paths.get(reportBranding.getAgencyLogoPath()).getFileName().toString());
-                summary.append("\" />\n"); //NON-NLS
-                summary.append("</div>\n"); //NON-NLS
-            }
-            final String align = agencyLogoSet ? "right" : "left"; //NON-NLS NON-NLS
-            summary.append("<div class=\"").append(align).append("\">\n"); //NON-NLS
-            summary.append("<table>\n"); //NON-NLS
-            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.caseName")) //NON-NLS
-                    .append("</td><td>").append(caseName).append("</td></tr>\n"); //NON-NLS NON-NLS
-            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.caseNum")) //NON-NLS
-                    .append("</td><td>").append(!caseNumber.isEmpty() ? caseNumber : NbBundle //NON-NLS
-                    .getMessage(this.getClass(), "ReportHTML.writeSum.noCaseNum")).append("</td></tr>\n"); //NON-NLS
-            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.examiner")).append("</td><td>") //NON-NLS
-                    .append(!examiner.isEmpty() ? examiner : NbBundle
-                            .getMessage(this.getClass(), "ReportHTML.writeSum.noExaminer"))
-                    .append("</td></tr>\n"); //NON-NLS
-            summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.numImages")) //NON-NLS
-                    .append("</td><td>").append(imagecount).append("</td></tr>\n"); //NON-NLS
-            summary.append("</table>\n"); //NON-NLS
+        if (agencyLogoSet) {
+            summary.append("<div class=\"left\">\n"); //NON-NLS
+            summary.append("<img src=\"");
+            summary.append(Paths.get(reportBranding.getAgencyLogoPath()).getFileName().toString());
+            summary.append("\" />\n"); //NON-NLS
             summary.append("</div>\n"); //NON-NLS
-            summary.append("<div class=\"clear\"></div>\n"); //NON-NLS
-            summary.append("</div>\n"); //NON-NLS
-            return summary;
+        }
+        final String align = agencyLogoSet ? "right" : "left"; //NON-NLS NON-NLS
+        summary.append("<div class=\"").append(align).append("\">\n"); //NON-NLS
+        summary.append("<table>\n"); //NON-NLS
+        summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.caseName")) //NON-NLS
+                .append("</td><td>").append(caseName).append("</td></tr>\n"); //NON-NLS NON-NLS
+        summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.caseNum")) //NON-NLS
+                .append("</td><td>").append(!caseNumber.isEmpty() ? caseNumber : NbBundle //NON-NLS
+                .getMessage(this.getClass(), "ReportHTML.writeSum.noCaseNum")).append("</td></tr>\n"); //NON-NLS
+        summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.examiner")).append("</td><td>") //NON-NLS
+                .append(!examiner.isEmpty() ? examiner : NbBundle
+                        .getMessage(this.getClass(), "ReportHTML.writeSum.noExaminer"))
+                .append("</td></tr>\n"); //NON-NLS
+        summary.append("<tr><td>").append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.numImages")) //NON-NLS
+                .append("</td><td>").append(imagecount).append("</td></tr>\n"); //NON-NLS
+        summary.append("</table>\n"); //NON-NLS
+        summary.append("</div>\n"); //NON-NLS
+        summary.append("<div class=\"clear\"></div>\n"); //NON-NLS
+        summary.append("</div>\n"); //NON-NLS
+        return summary;
     }
-    
+
     /**
      * Write the Image Information section of the summary for this report.
-     * 
+     *
      * @return StringBuilder updated html report with Image Information
      */
-    
     private StringBuilder writeSummaryImageInfo() {
         StringBuilder summary = new StringBuilder();
         summary.append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.imageInfoHeading"));
@@ -1208,13 +1218,12 @@ class ReportHTML implements TableReportModule {
         summary.append("</div>\n"); //NON-NLS
         return summary;
     }
-    
+
     /**
      * Write the software information section of the summary for this report.
-     * 
+     *
      * @return StringBuilder updated html report with software information
      */
-    
     private StringBuilder writeSummarySoftwareInfo(SleuthkitCase skCase, List<IngestJobInfo> ingestJobs) {
         StringBuilder summary = new StringBuilder();
         summary.append(NbBundle.getMessage(this.getClass(), "ReportHTML.writeSum.softwareInfoHeading"));
@@ -1244,13 +1253,12 @@ class ReportHTML implements TableReportModule {
         summary.append("<div class=\"clear\"></div>\n"); //NON-NLS
         return summary;
     }
-    
+
     /**
      * Write the Ingest History section of the summary for this report.
-     * 
+     *
      * @return StringBuilder updated html report with ingest history
      */
-
     private StringBuilder writeSummaryIngestHistoryInfo(SleuthkitCase skCase, List<IngestJobInfo> ingestJobs) {
         StringBuilder summary = new StringBuilder();
         try {
@@ -1304,4 +1312,4 @@ class ReportHTML implements TableReportModule {
                 + thumbFile.getName();
     }
 
-}
+}

Core/src/org/sleuthkit/autopsy/report/ReportVisualPanel2.form

@@ -97,6 +97,9 @@
           <ResourceString bundle="org/sleuthkit/autopsy/report/Bundle.properties" key="ReportVisualPanel2.allResultsRadioButton.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="allResultsRadioButtonActionPerformed"/>
+      </Events>
     </Component>
     <Component class="javax.swing.JLabel" name="dataLabel">
       <Properties>

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

@@ -109,7 +109,7 @@ final class ReportVisualPanel2 extends JPanel {
         }
 
         for (TagName tagName : tagNamesInUse) {
-              String notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
+            String notableString = tagName.getKnownStatus() == TskData.FileKnown.BAD ? TagsManager.getNotableTagLabel() : "";
             tagStates.put(tagName.getDisplayName() + notableString, Boolean.FALSE);
         }
         tags.addAll(tagStates.keySet());
@@ -124,7 +124,9 @@ final class ReportVisualPanel2 extends JPanel {
         tagsList.addMouseListener(new MouseAdapter() {
             @Override
             public void mousePressed(MouseEvent evt) {
-
+                if (!taggedResultsRadioButton.isSelected()) {
+                    return;
+                }
                 int index = tagsList.locationToIndex(evt.getPoint());
                 if (index < tagsModel.getSize() && index >= 0) {
                     String value = tagsModel.getElementAt(index);
@@ -184,16 +186,26 @@ final class ReportVisualPanel2 extends JPanel {
         return tagStates;
     }
 
+    /**
+     * Are any tags selected?
+     *
+     * @return True if any tags are selected; otherwise false.
+     */
     private boolean areTagsSelected() {
         boolean result = false;
         for (Entry<String, Boolean> entry : tagStates.entrySet()) {
             if (entry.getValue()) {
                 result = true;
+                break;
             }
         }
         return result;
     }
 
+    /**
+     * Set the Finish button as either enabled or disabled depending on the UI
+     * component selections.
+     */
     private void updateFinishButton() {
         if (taggedResultsRadioButton.isSelected()) {
             wizPanel.setFinish(areTagsSelected());
@@ -209,6 +221,19 @@ final class ReportVisualPanel2 extends JPanel {
         return taggedResultsRadioButton.isSelected();
     }
 
+    /**
+     * Set all tagged results as either selected or unselected.
+     *
+     * @param selected Should all tagged results be selected?
+     */
+    void setAllTaggedResultsSelected(boolean selected) {
+        for (String tag : tags) {
+            tagStates.put(tag, (selected ? Boolean.TRUE : Boolean.FALSE));
+        }
+        tagsList.repaint();
+        wizPanel.setFinish(selected);
+    }
+
     /**
      * This method is called from within the constructor to initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is always
@@ -234,6 +259,11 @@ final class ReportVisualPanel2 extends JPanel {
 
         optionsButtonGroup.add(allResultsRadioButton);
         org.openide.awt.Mnemonics.setLocalizedText(allResultsRadioButton, org.openide.util.NbBundle.getMessage(ReportVisualPanel2.class, "ReportVisualPanel2.allResultsRadioButton.text")); // NOI18N
+        allResultsRadioButton.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                allResultsRadioButtonActionPerformed(evt);
+            }
+        });
 
         org.openide.awt.Mnemonics.setLocalizedText(dataLabel, org.openide.util.NbBundle.getMessage(ReportVisualPanel2.class, "ReportVisualPanel2.dataLabel.text")); // NOI18N
 
@@ -312,25 +342,21 @@ final class ReportVisualPanel2 extends JPanel {
     }// </editor-fold>//GEN-END:initComponents
 
     private void selectAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_selectAllButtonActionPerformed
-        for (String tag : tags) {
-            tagStates.put(tag, Boolean.TRUE);
-        }
-        tagsList.repaint();
-        wizPanel.setFinish(true);
+        setAllTaggedResultsSelected(true);
     }//GEN-LAST:event_selectAllButtonActionPerformed
 
     private void deselectAllButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deselectAllButtonActionPerformed
-        for (String tag : tags) {
-            tagStates.put(tag, Boolean.FALSE);
-        }
-        tagsList.repaint();
-        wizPanel.setFinish(false);
+        setAllTaggedResultsSelected(false);
     }//GEN-LAST:event_deselectAllButtonActionPerformed
 
     private void advancedButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_advancedButtonActionPerformed
         artifactStates = dialog.display();
     }//GEN-LAST:event_advancedButtonActionPerformed
 
+    private void allResultsRadioButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_allResultsRadioButtonActionPerformed
+        setAllTaggedResultsSelected(false);
+    }//GEN-LAST:event_allResultsRadioButtonActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton advancedButton;
     private javax.swing.JRadioButton allResultsRadioButton;

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

@@ -44,6 +44,7 @@ import org.sleuthkit.autopsy.casemodule.services.TagsManager;
 import org.sleuthkit.autopsy.coreutils.ImageUtils;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.datamodel.ContentUtils;
+import static org.sleuthkit.autopsy.casemodule.services.TagsManager.getNotableTagLabel;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Account;
 import org.sleuthkit.datamodel.BlackboardArtifact;
@@ -53,6 +54,7 @@ import org.sleuthkit.datamodel.BlackboardAttribute.Type;
 import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.SleuthkitCase;
+import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
 import org.sleuthkit.datamodel.TskData;
 
@@ -538,24 +540,93 @@ class TableReportGenerator {
             logger.log(Level.SEVERE, "Exception while getting open case: ", ex); //NON-NLS
             return;
         }
+        
+        // Get a list of all selected tag IDs
+        String tagIDList = "";
+        if( ! tagNamesFilter.isEmpty()) {
+            try {
+                Map<String, TagName> tagNamesMap = Case.getCurrentCaseThrows().getServices().getTagsManager().getDisplayNamesToTagNamesMap();
+                for(String tagDisplayName : tagNamesFilter) {
+                    if(tagNamesMap.containsKey(tagDisplayName)) {
+                        if (! tagIDList.isEmpty()) {
+                            tagIDList += ",";
+                        }
+                        tagIDList += tagNamesMap.get(tagDisplayName).getId();
+                    } else {
+                        // If the tag name ends with "(Notable)", try stripping that off
+                        if(tagDisplayName.endsWith(getNotableTagLabel())) {
+                            String editedDisplayName = tagDisplayName.substring(0, tagDisplayName.length() - getNotableTagLabel().length());
+                            if(tagNamesMap.containsKey(editedDisplayName)) {
+                                if (! tagIDList.isEmpty()) {
+                                    tagIDList += ",";
+                                }
+                                tagIDList += tagNamesMap.get(editedDisplayName).getId();
+                            }
+                        }
+                    }
+                }
+            } catch (NoCurrentCaseException | TskCoreException ex) {
+                logger.log(Level.SEVERE, "Exception while getting tag info - proceeding without tag filter: ", ex); //NON-NLS
+                tagIDList = "";
+            }
+        }
+        
+        // Check if there are any ad-hoc results
+        String adHocCountQuery = "SELECT COUNT(*) FROM " + //NON-NLS
+                "(SELECT art.artifact_id FROM blackboard_artifacts AS art, blackboard_attributes AS att1 ";//NON-NLS
+        if (!tagIDList.isEmpty()) {
+            adHocCountQuery += ", blackboard_artifact_tags as tag "; //NON-NLS
+        }
+        adHocCountQuery += "WHERE (att1.artifact_id = art.artifact_id) AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") "; // NON-NLS
+        if (!tagIDList.isEmpty()) {
+            adHocCountQuery += " AND (art.artifact_id = tag.artifact_id) AND (tag.tag_name_id IN (" + tagIDList + ")) "; //NON-NLS
+        }
+        adHocCountQuery += "EXCEPT " + // NON-NLS
+                "SELECT art.artifact_id FROM blackboard_artifacts AS art, blackboard_attributes AS att1 WHERE (att1.artifact_id = art.artifact_id) AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") AND (att1.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + ")) AS adHocHits"; //NON-NLS
+
+        int adHocCount = 0;
+        try (SleuthkitCase.CaseDbQuery dbQuery = openCase.getSleuthkitCase().executeQuery(adHocCountQuery)) {
+            ResultSet adHocCountResultSet = dbQuery.getResultSet();
+            if (adHocCountResultSet.next()) {
+                adHocCount = adHocCountResultSet.getInt(1); //NON-NLS
+            } else {
+                throw new TskCoreException("Error counting ad hoc keywords");
+            }
+        } catch (TskCoreException | SQLException ex) {
+            errorList.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.errList.failedQueryKWLists"));
+            logger.log(Level.SEVERE, "Failed to count ad hoc searches with query " + adHocCountQuery, ex); //NON-NLS
+            return;
+        }
+        
+        // Create the query to get the keyword list names
         if (openCase.getCaseType() == Case.CaseType.MULTI_USER_CASE) {
-            orderByClause = "ORDER BY convert_to(att.value_text, 'SQL_ASCII') ASC NULLS FIRST"; //NON-NLS
+            orderByClause = "ORDER BY convert_to(list, 'SQL_ASCII') ASC NULLS FIRST"; //NON-NLS
         } else {
             orderByClause = "ORDER BY list ASC"; //NON-NLS
         }
         String keywordListQuery
                 = "SELECT att.value_text AS list "
                 + //NON-NLS
-                "FROM blackboard_attributes AS att, blackboard_artifacts AS art "
-                + //NON-NLS
-                "WHERE att.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + " "
+                "FROM blackboard_attributes AS att, blackboard_artifacts AS art "; // NON-NLS
+        if(! tagIDList.isEmpty()) {
+            keywordListQuery += ", blackboard_artifact_tags as tag "; //NON-NLS
+        }
+        keywordListQuery += "WHERE att.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + " "
                 + //NON-NLS
                 "AND art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + " "
                 + //NON-NLS
-                "AND att.artifact_id = art.artifact_id "
-                + //NON-NLS
-                "GROUP BY list " + orderByClause; //NON-NLS
+                "AND att.artifact_id = art.artifact_id ";
+        if (! tagIDList.isEmpty()) {
+            keywordListQuery += "AND (art.artifact_id = tag.artifact_id) " + //NON-NLS
+                    "AND (tag.tag_name_id IN (" + tagIDList + ")) "; //NON-NLS
+        }
+        if (adHocCount > 0) {
+            keywordListQuery += " UNION SELECT \'\' AS list ";
+        }
+        keywordListQuery = "SELECT * FROM ( " + keywordListQuery + " ) kwListNames ";
+        keywordListQuery += "GROUP BY list " + orderByClause; //NON-NLS
 
+        // Make the table of contents links for each list type
         try (SleuthkitCase.CaseDbQuery dbQuery = openCase.getSleuthkitCase().executeQuery(keywordListQuery)) {
             ResultSet listsRs = dbQuery.getResultSet();
             List<String> lists = new ArrayList<>();
@@ -575,22 +646,24 @@ class TableReportGenerator {
                             BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getDisplayName()));
         } catch (TskCoreException | SQLException ex) {
             errorList.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.errList.failedQueryKWLists"));
-            logger.log(Level.SEVERE, "Failed to query keyword lists: ", ex); //NON-NLS
+            logger.log(Level.SEVERE, "Failed to query keyword lists with query " + keywordListQuery, ex); //NON-NLS
             return;
         }
 
+        // Query for keywords, grouped by list
         if (openCase.getCaseType() == Case.CaseType.MULTI_USER_CASE) {
-            orderByClause = "ORDER BY convert_to(att3.value_text, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
-                    + "convert_to(att1.value_text, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
-                    + "convert_to(f.parent_path, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
-                    + "convert_to(f.name, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
-                    + "convert_to(att2.value_text, 'SQL_ASCII') ASC NULLS FIRST"; //NON-NLS
+            orderByClause = "ORDER BY convert_to(list, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
+                    + "convert_to(keyword, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
+                    + "convert_to(parent_path, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
+                    + "convert_to(name, 'SQL_ASCII') ASC NULLS FIRST, " //NON-NLS
+                    + "convert_to(preview, 'SQL_ASCII') ASC NULLS FIRST"; //NON-NLS
         } else {
             orderByClause = "ORDER BY list ASC, keyword ASC, parent_path ASC, name ASC, preview ASC"; //NON-NLS
         }
-        // Query for keywords, grouped by list
-        String keywordsQuery
-                = "SELECT art.artifact_id, art.obj_id, att1.value_text AS keyword, att2.value_text AS preview, att3.value_text AS list, f.name AS name, f.parent_path AS parent_path "
+        
+        // Query for keywords that are part of a list
+        String keywordListsQuery
+                = "SELECT art.artifact_id AS artifact_id, art.obj_id AS obj_id, att1.value_text AS keyword, att2.value_text AS preview, att3.value_text AS list, f.name AS name, f.parent_path AS parent_path "
                 + //NON-NLS
                 "FROM blackboard_artifacts AS art, blackboard_attributes AS att1, blackboard_attributes AS att2, blackboard_attributes AS att3, tsk_files AS f "
                 + //NON-NLS
@@ -608,9 +681,24 @@ class TableReportGenerator {
                 + //NON-NLS
                 "AND (att3.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + ") "
                 + //NON-NLS
-                "AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") "
-                + //NON-NLS
-                orderByClause; //NON-NLS
+                "AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") ";
+        
+        // Query for keywords that are not part of a list
+        String keywordAdHocQuery =
+                "SELECT art.artifact_id AS artifact_id, art.obj_id AS obj_id, att1.value_text AS keyword, att2.value_text AS preview, \'\' AS list, f.name AS name, f.parent_path AS parent_path " + // NON-NLS
+                "FROM blackboard_artifacts AS art, blackboard_attributes AS att1, blackboard_attributes AS att2, tsk_files AS f " + // NON-NLS
+                "WHERE " + // NON-NLS
+                " (art.artifact_id IN (SELECT art.artifact_id FROM blackboard_artifacts AS art, blackboard_attributes AS att1 WHERE (att1.artifact_id = art.artifact_id) AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") " + // NON-NLS
+                "EXCEPT " + // NON-NLS
+                "SELECT art.artifact_id FROM blackboard_artifacts AS art, blackboard_attributes AS att1 WHERE (att1.artifact_id = art.artifact_id) AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") AND (att1.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID() + "))) " + //NON-NLS
+                "AND (att1.artifact_id = art.artifact_id) " + //NON-NLS
+                "AND (att2.artifact_id = art.artifact_id) " + //NON-NLS
+                "AND (f.obj_id = art.obj_id) " + //NON-NLS 
+                "AND (att1.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD.getTypeID() + ") " +  // NON-NLS
+                "AND (att2.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW.getTypeID() + ") " + // NON-NLS
+                "AND (art.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID() + ") "; // NON-NLS
+        
+        String keywordsQuery = "SELECT * FROM ( " + keywordListsQuery + " UNION " + keywordAdHocQuery + " ) kwHits " + orderByClause;
 
         try (SleuthkitCase.CaseDbQuery dbQuery = openCase.getSleuthkitCase().executeQuery(keywordsQuery)) {
             ResultSet resultSet = dbQuery.getResultSet();
@@ -683,7 +771,7 @@ class TableReportGenerator {
             tableModule.endDataType();
         } catch (TskCoreException | SQLException ex) {
             errorList.add(NbBundle.getMessage(this.getClass(), "ReportGenerator.errList.failedQueryKWs"));
-            logger.log(Level.SEVERE, "Failed to query keywords: ", ex); //NON-NLS
+            logger.log(Level.SEVERE, "Failed to query keywords with query " + keywordsQuery, ex); //NON-NLS
         }
     }
 
@@ -1623,14 +1711,15 @@ class TableReportGenerator {
     private HashSet<String> getUniqueTagNames(long artifactId) throws TskCoreException {
         HashSet<String> uniqueTagNames = new HashSet<>();
 
-        String query = "SELECT display_name, artifact_id FROM tag_names AS tn, blackboard_artifact_tags AS bat "
+        String query = "SELECT display_name, artifact_id, knownStatus FROM tag_names AS tn, blackboard_artifact_tags AS bat "
                 + //NON-NLS 
                 "WHERE tn.tag_name_id = bat.tag_name_id AND bat.artifact_id = " + artifactId; //NON-NLS
 
         try (SleuthkitCase.CaseDbQuery dbQuery = Case.getCurrentCaseThrows().getSleuthkitCase().executeQuery(query)) {
             ResultSet tagNameRows = dbQuery.getResultSet();
             while (tagNameRows.next()) {
-                uniqueTagNames.add(tagNameRows.getString("display_name")); //NON-NLS
+                String notableString = tagNameRows.getInt("knownStatus") == TskData.FileKnown.BAD.ordinal() ? getNotableTagLabel() : "";
+                uniqueTagNames.add(tagNameRows.getString("display_name") + notableString); //NON-NLS
             }
         } catch (TskCoreException | SQLException | NoCurrentCaseException ex) {
             throw new TskCoreException("Error getting tag names for artifact: ", ex);

Core/src/org/sleuthkit/autopsy/timeline/ui/listvew/ListTimeline.java

@@ -567,8 +567,11 @@ class ListTimeline extends BorderPane {
             super.updateItem(item, empty);
             if (empty || item == null) {
                 setText(null);
+                setTooltip(null);
             } else {
-                setText(textSupplier.apply(getEvent()));
+                String text = textSupplier.apply(getEvent());
+                setText(text);
+                setTooltip(new Tooltip(text));
             }
         }
     }

Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/IntraCaseUtils.java

@@ -104,16 +104,36 @@ class IntraCaseUtils {
     }
 
     void setUp() {
-        CaseUtils.createAsCurrentCase(this.caseName);
+        this.createAsCurrentCase();
 
         final ImageDSProcessor imageDSProcessor = new ImageDSProcessor();
 
-        IngestUtils.addDataSource(imageDSProcessor, imagePath1);
-        IngestUtils.addDataSource(imageDSProcessor, imagePath2);
-        IngestUtils.addDataSource(imageDSProcessor, imagePath3);
+        this.addImageOne(imageDSProcessor);
+        this.addImageTwo(imageDSProcessor);
+        this.addImageThree(imageDSProcessor);
+        this.addImageFour(imageDSProcessor);
+    }
+
+    void addImageFour(final ImageDSProcessor imageDSProcessor) {
         IngestUtils.addDataSource(imageDSProcessor, imagePath4);
     }
 
+    void addImageThree(final ImageDSProcessor imageDSProcessor) {
+        IngestUtils.addDataSource(imageDSProcessor, imagePath3);
+    }
+
+    void addImageTwo(final ImageDSProcessor imageDSProcessor) {
+        IngestUtils.addDataSource(imageDSProcessor, imagePath2);
+    }
+
+    void addImageOne(final ImageDSProcessor imageDSProcessor) {
+        IngestUtils.addDataSource(imageDSProcessor, imagePath1);
+    }
+
+    void createAsCurrentCase() {
+        CaseUtils.createAsCurrentCase(this.caseName);
+    }
+
     Map<Long, String> getDataSourceMap() throws NoCurrentCaseException, TskCoreException, SQLException {
         return this.dataSourceLoader.getDataSourceMap();
     }

Core/test/qa-functional/src/org/sleuthkit/autopsy/commonfilessearch/MatchesInAtLeastTwoSources.java

@@ -0,0 +1,128 @@
+/*
+ * 
+ * Autopsy Forensic Browser
+ * 
+ * Copyright 2018 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.commonfilessearch;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import junit.framework.Test;
+import org.netbeans.junit.NbModuleSuite;
+import org.netbeans.junit.NbTestCase;
+import org.openide.util.Exceptions;
+import org.python.icu.impl.Assert;
+import org.sleuthkit.autopsy.casemodule.Case;
+import org.sleuthkit.autopsy.casemodule.ImageDSProcessor;
+import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
+import org.sleuthkit.autopsy.commonfilesearch.AllDataSourcesCommonFilesAlgorithm;
+import org.sleuthkit.autopsy.commonfilesearch.CommonFilesMetadata;
+import org.sleuthkit.autopsy.commonfilesearch.CommonFilesMetadataBuilder;
+import static org.sleuthkit.autopsy.commonfilessearch.IntraCaseUtils.*;
+import org.sleuthkit.autopsy.ingest.IngestJobSettings;
+import org.sleuthkit.autopsy.ingest.IngestModuleTemplate;
+import org.sleuthkit.autopsy.modules.filetypeid.FileTypeIdModuleFactory;
+import org.sleuthkit.autopsy.modules.hashdatabase.HashLookupModuleFactory;
+import org.sleuthkit.autopsy.testutils.IngestUtils;
+import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.TskCoreException;
+
+/**
+ * Ensures that matches only are found for files which appear in at least two
+ * data sources.
+ *
+ * The two datasources used here have no common files. One of the data sources
+ * has two identical files within it. This should not count as a match.
+ *
+ * None of the test files should be found in the results of this test.
+ */
+public class MatchesInAtLeastTwoSources extends NbTestCase {
+
+    public static Test suite() {
+        NbModuleSuite.Configuration conf = NbModuleSuite.createConfiguration(MatchesInAtLeastTwoSources.class).
+                clusters(".*").
+                enableModules(".*");
+        return conf.suite();
+    }
+
+    private final IntraCaseUtils utils;
+
+    public MatchesInAtLeastTwoSources(String name) {
+        super(name);
+
+        this.utils = new IntraCaseUtils(this, "MatchesInAtLeastTwoSources");
+    }
+
+    @Override
+    public void setUp() {
+        this.utils.createAsCurrentCase();
+
+        final ImageDSProcessor imageDSProcessor = new ImageDSProcessor();
+
+        this.utils.addImageOne(imageDSProcessor);
+        this.utils.addImageFour(imageDSProcessor);
+
+        IngestModuleTemplate hashLookupTemplate = IngestUtils.getIngestModuleTemplate(new HashLookupModuleFactory());
+        IngestModuleTemplate mimeTypeLookupTemplate = IngestUtils.getIngestModuleTemplate(new FileTypeIdModuleFactory());
+
+        ArrayList<IngestModuleTemplate> templates = new ArrayList<>();
+        templates.add(hashLookupTemplate);
+        templates.add(mimeTypeLookupTemplate);
+
+        IngestJobSettings ingestJobSettings = new IngestJobSettings(IngestedWithHashAndFileType.class.getCanonicalName(), IngestJobSettings.IngestType.FILES_ONLY, templates);
+
+        try {
+            IngestUtils.runIngestJob(Case.getCurrentCaseThrows().getDataSources(), ingestJobSettings);
+        } catch (NoCurrentCaseException | TskCoreException ex) {
+            Exceptions.printStackTrace(ex);
+            Assert.fail(ex);
+        }
+    }
+
+    @Override
+    public void tearDown() {
+        this.utils.tearDown();
+    }
+
+    public void testOne() {
+        try {
+            Map<Long, String> dataSources = this.utils.getDataSourceMap();
+
+            CommonFilesMetadataBuilder allSourcesBuilder = new AllDataSourcesCommonFilesAlgorithm(dataSources, false, false);
+            CommonFilesMetadata metadata = allSourcesBuilder.findCommonFiles();
+
+            Map<Long, String> objectIdToDataSource = IntraCaseUtils.mapFileInstancesToDataSources(metadata);
+
+            List<AbstractFile> files = IntraCaseUtils.getFiles(objectIdToDataSource.keySet());
+
+            assertTrue(IntraCaseUtils.verifyFileExistanceAndCount(files, dataSources, IMG, SET1, 0));
+            assertTrue(IntraCaseUtils.verifyFileExistanceAndCount(files, dataSources, IMG, SET4, 0));
+
+            assertTrue(IntraCaseUtils.verifyFileExistanceAndCount(files, dataSources, DOC, SET1, 0));
+            assertTrue(IntraCaseUtils.verifyFileExistanceAndCount(files, dataSources, DOC, SET4, 0));
+
+            assertTrue(IntraCaseUtils.verifyFileExistanceAndCount(files, dataSources, EMPTY, SET1, 0));
+            assertTrue(IntraCaseUtils.verifyFileExistanceAndCount(files, dataSources, EMPTY, SET4, 0));
+
+        } catch (NoCurrentCaseException | TskCoreException | SQLException ex) {
+            Exceptions.printStackTrace(ex);
+            Assert.fail(ex);
+        }
+    }
+}

CoreLibs/manifest.mf

@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.corelibs/3
-OpenIDE-Module-Implementation-Version: 4
+OpenIDE-Module-Implementation-Version: 5
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/corelibs/Bundle.properties
-OpenIDE-Module-Specification-Version: 1.1
+OpenIDE-Module-Specification-Version: 1.2
 AutoUpdate-Show-In-Client: true
 AutoUpdate-Essential-Module: true
 

Experimental/nbproject/project.xml

@@ -135,7 +135,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>10</release-version>
-                        <specification-version>10.11</specification-version>
+                        <specification-version>10.12</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -144,7 +144,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AddArchiveTask.java

@@ -33,7 +33,6 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.openide.util.Lookup;
 import org.sleuthkit.autopsy.casemodule.Case;
-import org.sleuthkit.autopsy.casemodule.LocalDiskDSProcessor;
 import org.sleuthkit.autopsy.casemodule.LocalFilesDSProcessor;
 import org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback;
 import static org.sleuthkit.autopsy.corecomponentinterfaces.DataSourceProcessorCallback.DataSourceProcessorResult.CRITICAL_ERRORS;

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AinStatusPanel.java

@@ -125,18 +125,6 @@ final class AinStatusPanel extends javax.swing.JPanel implements ExplorerManager
         setLayout(new java.awt.BorderLayout());
     }// </editor-fold>//GEN-END:initComponents
 
-    /**
-     * Get the AutoIngestJob for the currently selected node of this panel.
-     *
-     * @return AutoIngestJob which is currently selected in this panel
-     */
-    AutoIngestJob getSelectedAutoIngestJob() {
-        Node[] selectedRows = explorerManager.getSelectedNodes();
-        if (selectedRows.length == 1) {
-            return ((JobNode) selectedRows[0]).getAutoIngestJob();
-        }
-        return null;
-    }
     // Variables declaration - do not modify//GEN-BEGIN:variables
     // End of variables declaration//GEN-END:variables
 

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestAdminActions.java

@@ -338,7 +338,7 @@ final class AutoIngestAdminActions {
                         dashboard.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
                         AutoIngestManager.CaseDeletionResult result = dashboard.getMonitor().deleteCase(job);
 
-                        dashboard.getCompletedJobsPanel().refresh(new AutoIngestNodeRefreshEvents.RefreshChildrenEvent(dashboard.getMonitor().getJobsSnapshot()));
+                        dashboard.getCompletedJobsPanel().refresh(new AutoIngestNodeRefreshEvents.RefreshChildrenEvent(dashboard.getMonitor()));
                         dashboard.setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
                         if (AutoIngestManager.CaseDeletionResult.FAILED == result) {
                             JOptionPane.showMessageDialog(dashboard,

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestDashboard.java

@@ -38,7 +38,6 @@ import org.openide.util.NbBundle;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.core.ServicesMonitor;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMonitor.JobsSnapshot;
 import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestNodeRefreshEvents.RefreshChildrenEvent;
 
 /**
@@ -257,7 +256,7 @@ final class AutoIngestDashboard extends JPanel implements Observer {
 
     @Override
     public void update(Observable observable, Object arg) {
-        if (arg instanceof JobsSnapshot) {
+        if (arg == null ) {
             EventQueue.invokeLater(() -> {
                 refreshTables();
             });
@@ -271,9 +270,9 @@ final class AutoIngestDashboard extends JPanel implements Observer {
      * @param nodeStateSnapshot The jobs snapshot.
      */
     void refreshTables() {
-        pendingJobsPanel.refresh(new RefreshChildrenEvent(autoIngestMonitor.getJobsSnapshot()));
-        runningJobsPanel.refresh(new RefreshChildrenEvent(autoIngestMonitor.getJobsSnapshot()));
-        completedJobsPanel.refresh(new RefreshChildrenEvent(autoIngestMonitor.getJobsSnapshot()));
+        pendingJobsPanel.refresh(new RefreshChildrenEvent(autoIngestMonitor));
+        runningJobsPanel.refresh(new RefreshChildrenEvent(autoIngestMonitor));
+        completedJobsPanel.refresh(new RefreshChildrenEvent(autoIngestMonitor));
     }
 
     /**

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobsNode.java

@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import org.openide.nodes.AbstractNode;
 import org.openide.nodes.ChildFactory;
 import org.openide.nodes.Children;
@@ -33,9 +34,10 @@ import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.datamodel.NodeProperty;
-import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMonitor.JobsSnapshot;
+import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestJob.Stage;
 import org.sleuthkit.autopsy.guiutils.DurationCellRenderer;
 import org.sleuthkit.autopsy.guiutils.StatusIconCellRenderer;
+import org.sleuthkit.autopsy.ingest.DataSourceIngestJob;
 
 /**
  * A node which represents all AutoIngestJobs of a given AutoIngestJobStatus.
@@ -61,13 +63,13 @@ final class AutoIngestJobsNode extends AbstractNode {
     /**
      * Construct a new AutoIngestJobsNode.
      *
-     * @param snapshot the snapshot which contains the AutoIngestJobs
+     * @param monitor  the monitor which gives access to the AutoIngestJobs
      * @param status   the status of the jobs being displayed
      * @param eventBus the event bus which will be used to send and receive
      *                 refresh events
      */
-    AutoIngestJobsNode(JobsSnapshot jobsSnapshot, AutoIngestJobStatus status, EventBus eventBus) {
-        super(Children.create(new AutoIngestNodeChildren(jobsSnapshot, status, eventBus), false));
+    AutoIngestJobsNode(AutoIngestMonitor monitor, AutoIngestJobStatus status, EventBus eventBus) {
+        super(Children.create(new AutoIngestNodeChildren(monitor, status, eventBus), false));
         refreshChildrenEventBus = eventBus;
     }
 
@@ -78,13 +80,106 @@ final class AutoIngestJobsNode extends AbstractNode {
         refreshChildrenEventBus.post(refreshEvent);
     }
 
+    /**
+     * The AutoIngestJob class considers auto ingest jobs to be equal if they
+     * have the same manifest path. This is not sufficient for the purposes of
+     * determining when the state of a job has changed. This class is used to
+     * distinguish between different auto ingest jobs based on the manifest
+     * path, the processing stage, the job snapshot and priority.
+     */
+    private static final class AutoIngestJobWrapper implements Comparable<AutoIngestJobWrapper> {
+
+        private final AutoIngestJob autoIngestJob;
+
+        /**
+         * We keep our own references to the following job attributes because
+         * they can be changed by events in other threads which
+         */
+        private final Stage jobStage;
+        private final List<DataSourceIngestJob.Snapshot> jobSnapshot;
+        private final Integer jobPriority;
+
+        AutoIngestJobWrapper(AutoIngestJob job) {
+            autoIngestJob = job;
+            jobStage = job.getProcessingStage();
+            jobSnapshot = job.getIngestJobSnapshots();
+            jobPriority = job.getPriority();
+        }
+
+        AutoIngestJob getJob() {
+            return autoIngestJob;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof AutoIngestJobWrapper)) {
+                return false;
+            }
+
+            if (this == other) {
+                return true;
+            }
+
+            AutoIngestJob thisJob = this.autoIngestJob;
+            AutoIngestJob otherJob = ((AutoIngestJobWrapper) other).autoIngestJob;
+
+            // Only equal if the manifest paths and processing stage details are the same.
+            return thisJob.getManifest().getFilePath().equals(otherJob.getManifest().getFilePath())
+                    && jobStage.equals(((AutoIngestJobWrapper) other).jobStage)
+                    && jobSnapshot.equals(((AutoIngestJobWrapper) other).jobSnapshot)
+                    && jobPriority.equals(((AutoIngestJobWrapper) other).jobPriority);
+        }
+
+        @Override
+        public int hashCode() {
+            int hash = 7;
+            hash = 23 * hash + Objects.hashCode(this.autoIngestJob.getManifest().getFilePath());
+            hash = 23 * hash + Objects.hashCode(this.jobStage);
+            hash = 23 * hash + Objects.hashCode(this.jobSnapshot);
+            hash = 23 * hash + Objects.hashCode(this.jobPriority);
+            return hash;
+        }
+
+        @Override
+        public int compareTo(AutoIngestJobWrapper o) {
+            return autoIngestJob.compareTo(o.autoIngestJob);
+        }
+
+        /**
+         * The remaining methods simply delegate to the wrapped job.
+         */
+        Manifest getManifest() {
+            return autoIngestJob.getManifest();
+        }
+
+        boolean getErrorsOccurred() {
+            return autoIngestJob.getErrorsOccurred();
+        }
+
+        Date getCompletedDate() {
+            return autoIngestJob.getCompletedDate();
+        }
+
+        AutoIngestJob.StageDetails getProcessingStageDetails() {
+            return autoIngestJob.getProcessingStageDetails();
+        }
+
+        String getProcessingHostName() {
+            return autoIngestJob.getProcessingHostName();
+        }
+
+        Integer getPriority() {
+            return autoIngestJob.getPriority();
+        }
+    }
+
     /**
      * A ChildFactory for generating JobNodes.
      */
-    static final class AutoIngestNodeChildren extends ChildFactory<AutoIngestJob> {
+    static final class AutoIngestNodeChildren extends ChildFactory<AutoIngestJobWrapper> {
 
         private final AutoIngestJobStatus autoIngestJobStatus;
-        private JobsSnapshot jobsSnapshot;
+        private AutoIngestMonitor monitor;
         private final RefreshChildrenSubscriber refreshChildrenSubscriber = new RefreshChildrenSubscriber();
         private final EventBus refreshEventBus;
 
@@ -92,43 +187,45 @@ final class AutoIngestJobsNode extends AbstractNode {
          * Create children nodes for the AutoIngestJobsNode which will each
          * represent a single AutoIngestJob
          *
-         * @param snapshot the snapshot which contains the AutoIngestJobs
+         * @param monitor  the monitor which gives access to the AutoIngestJobs
          * @param status   the status of the jobs being displayed
          * @param eventBus the event bus which the class registers to for
          *                 refresh events
          */
-        AutoIngestNodeChildren(JobsSnapshot snapshot, AutoIngestJobStatus status, EventBus eventBus) {
-            jobsSnapshot = snapshot;
+        AutoIngestNodeChildren(AutoIngestMonitor monitor, AutoIngestJobStatus status, EventBus eventBus) {
+            this.monitor = monitor;
             autoIngestJobStatus = status;
             refreshEventBus = eventBus;
             refreshChildrenSubscriber.register(refreshEventBus);
         }
 
         @Override
-        protected boolean createKeys(List<AutoIngestJob> list) {
+        protected boolean createKeys(List<AutoIngestJobWrapper> list) {
             List<AutoIngestJob> jobs;
             switch (autoIngestJobStatus) {
                 case PENDING_JOB:
-                    jobs = jobsSnapshot.getPendingJobs();
+                    jobs = monitor.getPendingJobs();
                     Collections.sort(jobs);
                     break;
                 case RUNNING_JOB:
-                    jobs = jobsSnapshot.getRunningJobs();
+                    jobs = monitor.getRunningJobs();
                     break;
                 case COMPLETED_JOB:
-                    jobs = jobsSnapshot.getCompletedJobs();
+                    jobs = monitor.getCompletedJobs();
                     break;
                 default:
                     jobs = new ArrayList<>();
             }
             if (jobs != null && jobs.size() > 0) {
-                list.addAll(jobs);
+                jobs.forEach(j -> {
+                    list.add(new AutoIngestJobWrapper(j));
+                });
             }
             return true;
         }
 
         @Override
-        protected Node createNodeForKey(AutoIngestJob key) {
+        protected Node createNodeForKey(AutoIngestJobWrapper key) {
             return new JobNode(key, autoIngestJobStatus, refreshEventBus);
         }
 
@@ -167,7 +264,7 @@ final class AutoIngestJobsNode extends AbstractNode {
                 //Ignore netbeans suggesting this isn't being used, it is used behind the scenes by the EventBus
                 //RefreshChildrenEvents can change which children are present however
                 //RefreshJobEvents and RefreshCaseEvents can still change the order we want to display them in
-                jobsSnapshot = refreshEvent.getJobsSnapshot();
+                monitor = refreshEvent.getMonitor();
                 refresh(true);
             }
 
@@ -180,7 +277,7 @@ final class AutoIngestJobsNode extends AbstractNode {
      */
     static final class JobNode extends AbstractNode {
 
-        private final AutoIngestJob autoIngestJob;
+        private final AutoIngestJobWrapper jobWrapper;
         private final AutoIngestJobStatus jobStatus;
         private final RefreshNodeSubscriber refreshNodeSubscriber = new RefreshNodeSubscriber();
 
@@ -191,12 +288,12 @@ final class AutoIngestJobsNode extends AbstractNode {
          * @param status - the current status of the AutoIngestJob being
          *               represented
          */
-        JobNode(AutoIngestJob job, AutoIngestJobStatus status, EventBus eventBus) {
+        JobNode(AutoIngestJobWrapper job, AutoIngestJobStatus status, EventBus eventBus) {
             super(Children.LEAF);
             jobStatus = status;
-            autoIngestJob = job;
-            setName(autoIngestJob.toString());  //alows job to be uniquely found by name since it will involve a hash of the AutoIngestJob
-            setDisplayName(autoIngestJob.getManifest().getCaseName()); //displays user friendly case name as name
+            jobWrapper = job;
+            setName(jobWrapper.toString());  //alows job to be uniquely found by name since it will involve a hash of the AutoIngestJob
+            setDisplayName(jobWrapper.getManifest().getCaseName()); //displays user friendly case name as name
             refreshNodeSubscriber.register(eventBus);
         }
 
@@ -206,7 +303,7 @@ final class AutoIngestJobsNode extends AbstractNode {
          * @return autoIngestJob
          */
         AutoIngestJob getAutoIngestJob() {
-            return autoIngestJob;
+            return jobWrapper.getJob();
         }
 
         @Override
@@ -221,20 +318,20 @@ final class AutoIngestJobsNode extends AbstractNode {
                 s.put(ss);
             }
             ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_caseName_text(), Bundle.AutoIngestJobsNode_caseName_text(), Bundle.AutoIngestJobsNode_caseName_text(),
-                    autoIngestJob.getManifest().getCaseName()));
+                    jobWrapper.getManifest().getCaseName()));
             ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_dataSource_text(), Bundle.AutoIngestJobsNode_dataSource_text(), Bundle.AutoIngestJobsNode_dataSource_text(),
-                    autoIngestJob.getManifest().getDataSourcePath().getFileName().toString()));
+                    jobWrapper.getManifest().getDataSourcePath().getFileName().toString()));
             switch (jobStatus) {
                 case PENDING_JOB:
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_jobCreated_text(), Bundle.AutoIngestJobsNode_jobCreated_text(), Bundle.AutoIngestJobsNode_jobCreated_text(),
-                            autoIngestJob.getManifest().getDateFileCreated()));
+                            jobWrapper.getManifest().getDateFileCreated()));
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_priority_text(), Bundle.AutoIngestJobsNode_priority_text(), Bundle.AutoIngestJobsNode_priority_text(),
-                            autoIngestJob.getPriority() > 0 ? Bundle.AutoIngestJobsNode_prioritized_true() : Bundle.AutoIngestJobsNode_prioritized_false()));
+                            jobWrapper.getPriority() > 0 ? Bundle.AutoIngestJobsNode_prioritized_true() : Bundle.AutoIngestJobsNode_prioritized_false()));
                     break;
                 case RUNNING_JOB:
-                    AutoIngestJob.StageDetails status = autoIngestJob.getProcessingStageDetails();
+                    AutoIngestJob.StageDetails status = jobWrapper.getProcessingStageDetails();
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_hostName_text(), Bundle.AutoIngestJobsNode_hostName_text(), Bundle.AutoIngestJobsNode_hostName_text(),
-                            autoIngestJob.getProcessingHostName()));
+                            jobWrapper.getProcessingHostName()));
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_stage_text(), Bundle.AutoIngestJobsNode_stage_text(), Bundle.AutoIngestJobsNode_stage_text(),
                             status.getDescription()));
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_stageTime_text(), Bundle.AutoIngestJobsNode_stageTime_text(), Bundle.AutoIngestJobsNode_stageTime_text(),
@@ -242,11 +339,11 @@ final class AutoIngestJobsNode extends AbstractNode {
                     break;
                 case COMPLETED_JOB:
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_jobCreated_text(), Bundle.AutoIngestJobsNode_jobCreated_text(), Bundle.AutoIngestJobsNode_jobCreated_text(),
-                            autoIngestJob.getManifest().getDateFileCreated()));
+                            jobWrapper.getManifest().getDateFileCreated()));
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_jobCompleted_text(), Bundle.AutoIngestJobsNode_jobCompleted_text(), Bundle.AutoIngestJobsNode_jobCompleted_text(),
-                            autoIngestJob.getCompletedDate()));
+                            jobWrapper.getCompletedDate()));
                     ss.put(new NodeProperty<>(Bundle.AutoIngestJobsNode_status_text(), Bundle.AutoIngestJobsNode_status_text(), Bundle.AutoIngestJobsNode_status_text(),
-                            autoIngestJob.getErrorsOccurred() ? StatusIconCellRenderer.Status.WARNING : StatusIconCellRenderer.Status.OK));
+                            jobWrapper.getErrorsOccurred() ? StatusIconCellRenderer.Status.WARNING : StatusIconCellRenderer.Status.OK));
                     break;
                 default:
             }
@@ -259,24 +356,24 @@ final class AutoIngestJobsNode extends AbstractNode {
             if (AutoIngestDashboard.isAdminAutoIngestDashboard()) {
                 switch (jobStatus) {
                     case PENDING_JOB:
-                        actions.add(new PrioritizationAction.PrioritizeJobAction(autoIngestJob));
-                        actions.add(new PrioritizationAction.PrioritizeCaseAction(autoIngestJob));
-                        PrioritizationAction.DeprioritizeJobAction deprioritizeJobAction = new PrioritizationAction.DeprioritizeJobAction(autoIngestJob);
-                        deprioritizeJobAction.setEnabled(autoIngestJob.getPriority() > 0);
+                        actions.add(new PrioritizationAction.PrioritizeJobAction(jobWrapper.getJob()));
+                        actions.add(new PrioritizationAction.PrioritizeCaseAction(jobWrapper.getJob()));
+                        PrioritizationAction.DeprioritizeJobAction deprioritizeJobAction = new PrioritizationAction.DeprioritizeJobAction(jobWrapper.getJob());
+                        deprioritizeJobAction.setEnabled(jobWrapper.getPriority() > 0);
                         actions.add(deprioritizeJobAction);
-                        PrioritizationAction.DeprioritizeCaseAction deprioritizeCaseAction = new PrioritizationAction.DeprioritizeCaseAction(autoIngestJob);
-                        deprioritizeCaseAction.setEnabled(autoIngestJob.getPriority() > 0);
+                        PrioritizationAction.DeprioritizeCaseAction deprioritizeCaseAction = new PrioritizationAction.DeprioritizeCaseAction(jobWrapper.getJob());
+                        deprioritizeCaseAction.setEnabled(jobWrapper.getPriority() > 0);
                         actions.add(deprioritizeCaseAction);
                         break;
                     case RUNNING_JOB:
-                        actions.add(new AutoIngestAdminActions.ProgressDialogAction(autoIngestJob));
-                        actions.add(new AutoIngestAdminActions.CancelJobAction(autoIngestJob));
+                        actions.add(new AutoIngestAdminActions.ProgressDialogAction(jobWrapper.getJob()));
+                        actions.add(new AutoIngestAdminActions.CancelJobAction(jobWrapper.getJob()));
 //                        actions.add(new AutoIngestAdminActions.CancelModuleAction());
                         break;
                     case COMPLETED_JOB:
-                        actions.add(new AutoIngestAdminActions.ReprocessJobAction(autoIngestJob));
-                        actions.add(new AutoIngestAdminActions.DeleteCaseAction(autoIngestJob));
-                        actions.add(new AutoIngestAdminActions.ShowCaseLogAction(autoIngestJob));
+                        actions.add(new AutoIngestAdminActions.ReprocessJobAction(jobWrapper.getJob()));
+                        actions.add(new AutoIngestAdminActions.DeleteCaseAction(jobWrapper.getJob()));
+                        actions.add(new AutoIngestAdminActions.ShowCaseLogAction(jobWrapper.getJob()));
                         break;
                     default:
                 }

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestJobsPanel.java

@@ -171,7 +171,7 @@ final class AutoIngestJobsPanel extends javax.swing.JPanel implements ExplorerMa
                 ((AutoIngestJobsNode) explorerManager.getRootContext()).refresh(refreshEvent);
             } else {
                 //Make a new AutoIngestJobsNode with it's own EventBus and set it as the root context
-                explorerManager.setRootContext(new AutoIngestJobsNode(refreshEvent.getJobsSnapshot(), status, new EventBus("AutoIngestJobsNodeEventBus")));
+                explorerManager.setRootContext(new AutoIngestJobsNode(refreshEvent.getMonitor(), status, new EventBus("AutoIngestJobsNodeEventBus")));
             }
             outline.setRowSelectionAllowed(true);
             outline.setFocusable(true);

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java

@@ -490,6 +490,14 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen
                     break;
                 case RESUME:
                     resume();
+
+                    /**
+                     * Kick off an immediate scan so that the next pending job
+                     * will be picked up sooner than having to wait for the
+                     * InputDirScannerTask to run again.
+                     */
+                    scanInputDirsNow();
+
                     break;
                 case SHUTDOWN:
                     shutDown();
@@ -1840,13 +1848,13 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen
                      */
                     setChanged();
                     notifyObservers(Event.RESUMED);
-
-                    /**
-                     * Publish an event to let remote listeners know that the
-                     * node has been resumed.
-                     */
-                    eventPublisher.publishRemotely(lastPublishedStateEvent = new AutoIngestNodeStateEvent(Event.RESUMED, AutoIngestManager.LOCAL_HOST_NAME));
                 }
+                /**
+                 * Publish an event to let remote listeners know that the node
+                 * has been resumed.
+                 */
+                eventPublisher.publishRemotely(lastPublishedStateEvent = new AutoIngestNodeStateEvent(Event.RESUMED, AutoIngestManager.LOCAL_HOST_NAME));
+
                 pauseLock.notifyAll();
             }
         }
@@ -2790,6 +2798,7 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen
                             sysLogger.log(Level.INFO, "Finished ingest modules analysis for {0} ", manifestPath);
                             IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot();
                             for (IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot : jobSnapshot.getDataSourceSnapshots()) {
+                                AutoIngestJobLogger nestedJobLogger = new AutoIngestJobLogger(manifestPath, snapshot.getDataSource(), caseDirectoryPath);
                                 if (!snapshot.isCancelled()) {
                                     List<String> cancelledModules = snapshot.getCancelledDataSourceIngestModules();
                                     if (!cancelledModules.isEmpty()) {
@@ -2798,15 +2807,15 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen
                                         setCaseNodeDataErrorsOccurred(caseDirectoryPath);
                                         for (String module : snapshot.getCancelledDataSourceIngestModules()) {
                                             sysLogger.log(Level.WARNING, String.format("%s ingest module cancelled for %s", module, manifestPath));
-                                            jobLogger.logIngestModuleCancelled(module);
+                                            nestedJobLogger.logIngestModuleCancelled(module);
                                         }
                                     }
-                                    jobLogger.logAnalysisCompleted();
+                                    nestedJobLogger.logAnalysisCompleted();
                                 } else {
                                     currentJob.setProcessingStage(AutoIngestJob.Stage.CANCELLING, Date.from(Instant.now()));
                                     currentJob.setErrorsOccurred(true);
                                     setCaseNodeDataErrorsOccurred(caseDirectoryPath);
-                                    jobLogger.logAnalysisCancelled();
+                                    nestedJobLogger.logAnalysisCancelled();
                                     CancellationReason cancellationReason = snapshot.getCancellationReason();
                                     if (CancellationReason.NOT_CANCELLED != cancellationReason && CancellationReason.USER_CANCELLED != cancellationReason) {
                                         throw new AnalysisStartupException(String.format("Analysis cancelled due to %s for %s", cancellationReason.getDisplayName(), manifestPath));

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestMonitor.java

@@ -22,6 +22,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.nio.file.Path;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -116,11 +117,10 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
         } catch (AutopsyEventException ex) {
             throw new AutoIngestMonitorException("Failed to open auto ingest event channel", ex); //NON-NLS
         }
-        coordSvcQueryExecutor.scheduleWithFixedDelay(new CoordinationServiceQueryTask(), 0, CORRD_SVC_QUERY_INERVAL_MINS, TimeUnit.MINUTES);
+        coordSvcQueryExecutor.scheduleWithFixedDelay(new StateRefreshTask(), 0, CORRD_SVC_QUERY_INERVAL_MINS, TimeUnit.MINUTES);
         eventPublisher.addSubscriber(EVENT_LIST, this);
 
-        // Publish an event that asks running nodes to send their state.
-        eventPublisher.publishRemotely(new AutoIngestRequestNodeStateEvent(AutoIngestManager.Event.REPORT_STATE));
+        refreshNodeState();
     }
 
     /**
@@ -172,7 +172,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
             jobsSnapshot.removePendingJob(event.getJob());
             jobsSnapshot.addOrReplaceRunningJob(event.getJob());
             setChanged();
-            notifyObservers(jobsSnapshot);
+            notifyObservers();
         }
     }
 
@@ -190,7 +190,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
             jobsSnapshot.removePendingJob(job);
 
             // Update the state of the existing job in the running jobs table
-            for (AutoIngestJob runningJob : jobsSnapshot.getRunningJobs()) {
+            for (AutoIngestJob runningJob : getRunningJobs()) {
                 if (runningJob.equals(job)) {
                     runningJob.setIngestJobsSnapshot(job.getIngestJobSnapshots());
                     runningJob.setIngestThreadSnapshot(job.getIngestThreadActivitySnapshots());
@@ -200,7 +200,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
                 }
             }
             setChanged();
-            notifyObservers(jobsSnapshot);
+            notifyObservers();
         }
     }
 
@@ -216,7 +216,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
             jobsSnapshot.removeRunningJob(job);
             jobsSnapshot.addOrReplaceCompletedJob(job);
             setChanged();
-            notifyObservers(jobsSnapshot);
+            notifyObservers();
         }
     }
 
@@ -226,7 +226,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @param event A job/case prioritization event.
      */
     private void handleCasePrioritizationEvent(AutoIngestCasePrioritizedEvent event) {
-        coordSvcQueryExecutor.submit(new CoordinationServiceQueryTask());
+        coordSvcQueryExecutor.submit(new StateRefreshTask());
     }
 
     /**
@@ -235,7 +235,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @param event A job/case deletion event.
      */
     private void handleCaseDeletedEvent(AutoIngestCaseDeletedEvent event) {
-        coordSvcQueryExecutor.submit(new CoordinationServiceQueryTask());
+        coordSvcQueryExecutor.submit(new StateRefreshTask());
     }
 
     /**
@@ -259,15 +259,35 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
     }
 
     /**
-     * Gets the auto ingest monitor's current snapshot of the pending jobs
-     * queue, running jobs list, and completed jobs list for an auto ingest
-     * cluster.
+     * Gets the snapshot of the pending jobs queue for an auto ingest cluster.
      *
-     * @return The snapshot.
+     * @return The pending jobs queue.
      */
-    JobsSnapshot getJobsSnapshot() {
+    List<AutoIngestJob> getPendingJobs() {
         synchronized (jobsLock) {
-            return jobsSnapshot;
+            return new ArrayList<>(jobsSnapshot.pendingJobs);
+        }
+    }
+
+    /**
+     * Gets the snapshot of the running jobs list for an auto ingest cluster.
+     *
+     * @return The running jobs list.
+     */
+    List<AutoIngestJob> getRunningJobs() {
+        synchronized (jobsLock) {
+            return new ArrayList<>(jobsSnapshot.runningJobs);
+        }
+    }
+
+    /**
+     * Gets the snapshot of the completed jobs list for an auto ingest cluster.
+     *
+     * @return The completed jobs list.
+     */
+    List<AutoIngestJob> getCompletedJobs() {
+        synchronized (jobsLock) {
+            return new ArrayList<>(jobsSnapshot.completedJobs);
         }
     }
 
@@ -277,7 +297,12 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @return
      */
     List<AutoIngestNodeState> getNodeStates() {
-        return nodeStates.values().stream().collect(Collectors.toList());
+        // We only report the state for nodes for which we have received
+        // a 'state' event in the last 15 minutes.
+        return nodeStates.values()
+                .stream()
+                .filter(s -> s.getLastSeenTime().isAfter(Instant.now().minus(Duration.ofMinutes(15))))
+                .collect(Collectors.toList());
     }
 
     /**
@@ -287,13 +312,20 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      *
      * @return The refreshed snapshot.
      */
-    JobsSnapshot refreshJobsSnapshot() {
+    void refreshJobsSnapshot() {
         synchronized (jobsLock) {
             jobsSnapshot = queryCoordinationService();
-            return jobsSnapshot;
         }
     }
 
+    /**
+     * Ask running auto ingest nodes to report their state.
+     */
+    private void refreshNodeState() {
+        // Publish an event that asks running nodes to send their state.
+        eventPublisher.publishRemotely(new AutoIngestRequestNodeStateEvent(AutoIngestManager.Event.REPORT_STATE));
+    }
+
     /**
      * Gets a new snapshot of the pending jobs queue, running jobs list, and
      * completed jobs list for an auto ingest cluster.
@@ -358,13 +390,12 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @throws AutoIngestMonitorException If there is an error removing the
      *                                    priority of the jobs for the case.
      *
-     * @return The latest jobs snapshot.
      */
-    JobsSnapshot deprioritizeCase(final String caseName) throws AutoIngestMonitorException {
+    void deprioritizeCase(final String caseName) throws AutoIngestMonitorException {
         List<AutoIngestJob> jobsToDeprioritize = new ArrayList<>();
 
         synchronized (jobsLock) {
-            for (AutoIngestJob pendingJob : jobsSnapshot.getPendingJobs()) {
+            for (AutoIngestJob pendingJob : getPendingJobs()) {
                 if (pendingJob.getManifest().getCaseName().equals(caseName)) {
                     jobsToDeprioritize.add(pendingJob);
                 }
@@ -392,10 +423,9 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
                  */
                 new Thread(() -> {
                     eventPublisher.publishRemotely(new AutoIngestCasePrioritizedEvent(LOCAL_HOST_NAME, caseName,
-                        AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.CASE_DEPRIORITIZED, ""));
+                            AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.CASE_DEPRIORITIZED, ""));
                 }).start();
             }
-            return jobsSnapshot;
         }
     }
 
@@ -407,13 +437,12 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @throws AutoIngestMonitorException If there is an error bumping the
      *                                    priority of the jobs for the case.
      *
-     * @return The latest jobs snapshot.
      */
-    JobsSnapshot prioritizeCase(final String caseName) throws AutoIngestMonitorException {
+    void prioritizeCase(final String caseName) throws AutoIngestMonitorException {
         List<AutoIngestJob> jobsToPrioritize = new ArrayList<>();
         int highestPriority = 0;
         synchronized (jobsLock) {
-            for (AutoIngestJob pendingJob : jobsSnapshot.getPendingJobs()) {
+            for (AutoIngestJob pendingJob : getPendingJobs()) {
                 if (pendingJob.getPriority() > highestPriority) {
                     highestPriority = pendingJob.getPriority();
                 }
@@ -445,10 +474,9 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
                  */
                 new Thread(() -> {
                     eventPublisher.publishRemotely(new AutoIngestCasePrioritizedEvent(LOCAL_HOST_NAME, caseName,
-                        AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.CASE_PRIORITIZED, ""));
+                            AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.CASE_PRIORITIZED, ""));
                 }).start();
             }
-            return jobsSnapshot;
         }
     }
 
@@ -460,15 +488,14 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @throws AutoIngestMonitorException If there is an error removing the
      *                                    priority of the job.
      *
-     * @return The latest jobs snapshot.
      */
-    JobsSnapshot deprioritizeJob(AutoIngestJob job) throws AutoIngestMonitorException {
+    void deprioritizeJob(AutoIngestJob job) throws AutoIngestMonitorException {
         synchronized (jobsLock) {
             AutoIngestJob jobToDeprioritize = null;
             /*
              * Make sure the job is still in the pending jobs queue.
              */
-            for (AutoIngestJob pendingJob : jobsSnapshot.getPendingJobs()) {
+            for (AutoIngestJob pendingJob : getPendingJobs()) {
                 if (pendingJob.equals(job)) {
                     jobToDeprioritize = job;
                     break;
@@ -502,11 +529,10 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
                 final String dataSourceName = jobToDeprioritize.getManifest().getDataSourceFileName();
                 new Thread(() -> {
                     eventPublisher.publishRemotely(new AutoIngestCasePrioritizedEvent(LOCAL_HOST_NAME, caseName,
-                        AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.JOB_DEPRIORITIZED, dataSourceName));
+                            AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.JOB_DEPRIORITIZED, dataSourceName));
                 }).start();
 
             }
-            return jobsSnapshot;
         }
     }
 
@@ -518,9 +544,8 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * @throws AutoIngestMonitorException If there is an error bumping the
      *                                    priority of the job.
      *
-     * @return The latest jobs snapshot.
      */
-    JobsSnapshot prioritizeJob(AutoIngestJob job) throws AutoIngestMonitorException {
+    void prioritizeJob(AutoIngestJob job) throws AutoIngestMonitorException {
         synchronized (jobsLock) {
             int highestPriority = 0;
             AutoIngestJob jobToPrioritize = null;
@@ -528,7 +553,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
              * Get the highest known priority and make sure the job is still in
              * the pending jobs queue.
              */
-            for (AutoIngestJob pendingJob : jobsSnapshot.getPendingJobs()) {
+            for (AutoIngestJob pendingJob : getPendingJobs()) {
                 if (pendingJob.getPriority() > highestPriority) {
                     highestPriority = pendingJob.getPriority();
                 }
@@ -565,11 +590,10 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
                 final String dataSourceName = jobToPrioritize.getManifest().getDataSourceFileName();
                 new Thread(() -> {
                     eventPublisher.publishRemotely(new AutoIngestCasePrioritizedEvent(LOCAL_HOST_NAME, caseName,
-                        AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.JOB_PRIORITIZED, dataSourceName));
+                            AutoIngestManager.getSystemUserNameProperty(), AutoIngestCasePrioritizedEvent.EventType.JOB_PRIORITIZED, dataSourceName));
                 }).start();
 
             }
-            return jobsSnapshot;
         }
     }
 
@@ -591,7 +615,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      */
     void reprocessJob(AutoIngestJob job) throws AutoIngestMonitorException {
         synchronized (jobsLock) {
-            if (!jobsSnapshot.getCompletedJobs().contains(job)) {
+            if (!getCompletedJobs().contains(job)) {
                 return;
             }
 
@@ -660,7 +684,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
 
             // Update the state of completed jobs associated with this case to indicate
             // that the case has been deleted
-            for (AutoIngestJob completedJob : jobsSnapshot.getCompletedJobs()) {
+            for (AutoIngestJob completedJob : getCompletedJobs()) {
                 if (caseName.equals(completedJob.getManifest().getCaseName())) {
                     try {
                         completedJob.setProcessingStatus(DELETED);
@@ -674,8 +698,8 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
             }
 
             // Remove jobs associated with this case from the completed jobs collection.
-            jobsSnapshot.completedJobs.removeIf((AutoIngestJob completedJob) -> 
-                completedJob.getManifest().getCaseName().equals(caseName));
+            jobsSnapshot.completedJobs.removeIf((AutoIngestJob completedJob)
+                    -> completedJob.getManifest().getCaseName().equals(caseName));
 
             // Publish a message to update auto ingest nodes.
             eventPublisher.publishRemotely(new AutoIngestCaseDeletedEvent(caseName, LOCAL_HOST_NAME, AutoIngestManager.getSystemUserNameProperty()));
@@ -724,25 +748,25 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
     }
 
     /**
-     * A task that queries the coordination service for auto ingest manifest
-     * node data and converts it to auto ingest jobs for publication top its
-     * observers.
+     * A task that updates the state maintained by the monitor. At present this
+     * includes auto ingest job and auto ingest node data. The job data is
+     * refreshed by querying the coordination service for auto ingest manifest
+     * nodes. The auto ingest node data is refreshed by publishing a message
+     * asking all nodes to report their state.
      */
-    private final class CoordinationServiceQueryTask implements Runnable {
+    private final class StateRefreshTask implements Runnable {
 
-        /**
-         * Queries the coordination service for auto ingest manifest node data
-         * and converts it to auto ingest jobs for publication top its
-         * observers.
-         */
         @Override
         public void run() {
             if (!Thread.currentThread().isInterrupted()) {
-                synchronized (jobsLock) {
-                    jobsSnapshot = queryCoordinationService();
-                    setChanged();
-                    notifyObservers(jobsSnapshot);
-                }
+                // Query coordination service for jobs data.
+                refreshJobsSnapshot();
+
+                // Ask running auto ingest nodes to report their status.
+                refreshNodeState();
+
+                setChanged();
+                notifyObservers();
             }
         }
 
@@ -752,42 +776,12 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
      * A snapshot of the pending jobs queue, running jobs list and completed
      * jobs list for an auto ingest cluster.
      */
-    static final class JobsSnapshot {
+    private static final class JobsSnapshot {
 
         private final Set<AutoIngestJob> pendingJobs = new HashSet<>();
         private final Set<AutoIngestJob> runningJobs = new HashSet<>();
         private final Set<AutoIngestJob> completedJobs = new HashSet<>();
 
-        /**
-         * Gets the snapshot of the pending jobs queue for an auto ingest
-         * cluster.
-         *
-         * @return The pending jobs queue.
-         */
-        List<AutoIngestJob> getPendingJobs() {
-            return new ArrayList<>(this.pendingJobs);
-        }
-
-        /**
-         * Gets the snapshot of the running jobs list for an auto ingest
-         * cluster.
-         *
-         * @return The running jobs list.
-         */
-        List<AutoIngestJob> getRunningJobs() {
-            return new ArrayList<>(this.runningJobs);
-        }
-
-        /**
-         * Gets the snapshot of the completed jobs list for an auto ingest
-         * cluster.
-         *
-         * @return The completed jobs list.
-         */
-        List<AutoIngestJob> getCompletedJobs() {
-            return new ArrayList<>(this.completedJobs);
-        }
-
         /**
          * Adds an auto job to the snapshot of the pending jobs queue for an
          * auto ingest cluster. If an equivalent job already exists, it is
@@ -886,6 +880,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
 
         private final String nodeName;
         private final State nodeState;
+        private final Instant lastSeenTime;
 
         AutoIngestNodeState(String name, Event event) {
             nodeName = name;
@@ -915,6 +910,7 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
                     nodeState = State.UNKNOWN;
                     break;
             }
+            lastSeenTime = Instant.now();
         }
 
         String getName() {
@@ -924,6 +920,10 @@ final class AutoIngestMonitor extends Observable implements PropertyChangeListen
         State getState() {
             return nodeState;
         }
+
+        Instant getLastSeenTime() {
+            return lastSeenTime;
+        }
     }
 
     /**

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestNodeRefreshEvents.java

@@ -18,8 +18,6 @@
  */
 package org.sleuthkit.autopsy.experimental.autoingest;
 
-import org.sleuthkit.autopsy.experimental.autoingest.AutoIngestMonitor.JobsSnapshot;
-
 /**
  * Class which contains events to identify what should be refreshed in the
  * AutoIngestJobsNode
@@ -31,19 +29,20 @@ class AutoIngestNodeRefreshEvents {
      */
     static class AutoIngestRefreshEvent {
 
-        private final JobsSnapshot jobsSnapshot;
+        private final AutoIngestMonitor monitor;
 
-        AutoIngestRefreshEvent(JobsSnapshot jobs) {
-            this.jobsSnapshot = jobs;
+        AutoIngestRefreshEvent(AutoIngestMonitor monitor) {
+            this.monitor = monitor;
         }
 
         /**
-         * Get the state of the jobs lists when the event was fired.
+         * Get the monitor which will provide access to the state of
+         * the jobs.
          *
          * @return
          */
-        JobsSnapshot getJobsSnapshot() {
-            return this.jobsSnapshot;
+        AutoIngestMonitor getMonitor() {
+            return this.monitor;
         }
     }
 
@@ -56,8 +55,8 @@ class AutoIngestNodeRefreshEvents {
         /**
          * Constructs a RefreshChildrenEvent.
          */
-        RefreshChildrenEvent(JobsSnapshot jobs) {
-            super(jobs);
+        RefreshChildrenEvent(AutoIngestMonitor monitor) {
+            super(monitor);
         }
     }
 
@@ -72,11 +71,11 @@ class AutoIngestNodeRefreshEvents {
         /**
          * Contructs a RefreshCaseEvent
          *
-         * @param jobs The current state of the jobs lists.
+         * @param monitor The monitor that will provide access to the current state of the jobs lists.
          * @param name The name of the case whose nodes should be refreshed.
          */
-        RefreshCaseEvent(JobsSnapshot jobs, String name) {
-            super(jobs);
+        RefreshCaseEvent(AutoIngestMonitor monitor, String name) {
+            super(monitor);
             caseName = name;
         }
 
@@ -103,11 +102,11 @@ class AutoIngestNodeRefreshEvents {
         /**
          * Constructs a RefreshJobEvent.
          *
-         * @param jobs The curent state of the jobs lists.
+         * @param monitor The monitor which will provide access to the current state of the jobs lists.
          * @param job  The job which should be refreshed.
          */
-        RefreshJobEvent(JobsSnapshot jobs, AutoIngestJob job) {
-            super(jobs);
+        RefreshJobEvent(AutoIngestMonitor monitor, AutoIngestJob job) {
+            super(monitor);
             autoIngestJob = job;
         }
 

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/PrioritizationAction.java

@@ -145,7 +145,7 @@ abstract class PrioritizationAction extends AbstractAction {
 
         @Override
         AutoIngestNodeRefreshEvents.AutoIngestRefreshEvent getRefreshEvent(AutoIngestMonitor monitor) {
-            return new AutoIngestNodeRefreshEvents.RefreshJobEvent(monitor.getJobsSnapshot(), getJob());
+            return new AutoIngestNodeRefreshEvents.RefreshJobEvent(monitor, getJob());
         }
     }
 
@@ -184,7 +184,7 @@ abstract class PrioritizationAction extends AbstractAction {
 
         @Override
         AutoIngestNodeRefreshEvents.AutoIngestRefreshEvent getRefreshEvent(AutoIngestMonitor monitor) {
-            return new AutoIngestNodeRefreshEvents.RefreshJobEvent(monitor.getJobsSnapshot(), getJob());
+            return new AutoIngestNodeRefreshEvents.RefreshJobEvent(monitor, getJob());
         }
     }
 
@@ -225,7 +225,7 @@ abstract class PrioritizationAction extends AbstractAction {
 
         @Override
         AutoIngestNodeRefreshEvents.AutoIngestRefreshEvent getRefreshEvent(AutoIngestMonitor monitor) {
-            return new AutoIngestNodeRefreshEvents.RefreshCaseEvent(monitor.getJobsSnapshot(), getJob().getManifest().getCaseName());
+            return new AutoIngestNodeRefreshEvents.RefreshCaseEvent(monitor, getJob().getManifest().getCaseName());
         }
     }
 
@@ -266,7 +266,7 @@ abstract class PrioritizationAction extends AbstractAction {
 
         @Override
         AutoIngestNodeRefreshEvents.AutoIngestRefreshEvent getRefreshEvent(AutoIngestMonitor monitor) {
-            return new AutoIngestNodeRefreshEvents.RefreshCaseEvent(monitor.getJobsSnapshot(), getJob().getManifest().getCaseName());
+            return new AutoIngestNodeRefreshEvents.RefreshCaseEvent(monitor, getJob().getManifest().getCaseName());
         }
     }
 }

Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java

@@ -19,14 +19,11 @@
 package org.sleuthkit.autopsy.experimental.objectdetection;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Level;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
 import org.opencv.core.CvException;
 import org.opencv.core.Mat;
 import org.opencv.core.MatOfByte;
@@ -52,7 +49,6 @@ import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_OBJECT_DETECTED;
 import org.sleuthkit.datamodel.BlackboardAttribute;
-import org.sleuthkit.datamodel.ReadContentInputStream;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
@@ -61,6 +57,7 @@ import org.sleuthkit.datamodel.TskCoreException;
 public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter {
 
     private final static Logger logger = Logger.getLogger(ObjectDetectectionFileIngestModule.class.getName());
+    private final static int MAX_FILE_SIZE = 100000000;  //Max size of pictures to perform object detection on  
     private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter();
     private long jobId;
     private Map<String, CascadeClassifier> classifiers;
@@ -100,16 +97,36 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
     @Override
     public ProcessResult process(AbstractFile file) {
         if (!classifiers.isEmpty() && ImageUtils.isImageThumbnailSupported(file)) {
-            //Any image we can create a thumbnail for is one we should apply the classifiers to
-            InputStream inputStream = new ReadContentInputStream(file);
-            byte[] imageInMemory;
+            //Any image we can create a thumbnail for is one we should apply the classifiers to 
+
+            if (file.getSize() > MAX_FILE_SIZE) {
+                //prevent it from allocating gigabytes of memory for extremely large files
+                logger.log(Level.INFO, "Encountered file " + file.getParentPath() + file.getName() + " with object id of "
+                        + file.getId() + " which exceeds max file size of " + MAX_FILE_SIZE + " bytes, with a size of " + file.getSize());
+                return IngestModule.ProcessResult.OK;
+            }
+
+            byte[] imageInMemory = new byte[(int) file.getSize()];
+
             try {
-                imageInMemory = IOUtils.toByteArray(inputStream);
-            } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unable to perform object detection on " + file.getName(), ex);
+                file.read(imageInMemory, 0, file.getSize());
+            } catch (TskCoreException ex) {
+                logger.log(Level.WARNING, "Unable to read image to byte array for performing object detection on " + file.getParentPath() + file.getName() + " with object id of " + file.getId(), ex);
+                return IngestModule.ProcessResult.ERROR;
+            }
+
+            Mat originalImage;
+            try {
+                originalImage = Highgui.imdecode(new MatOfByte(imageInMemory), Highgui.IMREAD_GRAYSCALE);
+            } catch (CvException ex) {
+                //The image was something which could not be decoded by OpenCv, our isImageThumbnailSupported(file) check above failed us
+                logger.log(Level.WARNING, "Unable to decode image from byte array to perform object detection on " + file.getParentPath() + file.getName() + " with object id of " + file.getId(), ex); //NON-NLS
+                return IngestModule.ProcessResult.ERROR;
+            } catch (Exception unexpectedException) {
+                //hopefully an unnecessary generic exception catch but currently present to catch any exceptions OpenCv throws which may not be documented
+                logger.log(Level.SEVERE, "Unexpected Exception encountered attempting to use OpenCV to decode picture: " + file.getParentPath() + file.getName() + " with object id of " + file.getId(), unexpectedException);
                 return IngestModule.ProcessResult.ERROR;
             }
-            Mat originalImage = Highgui.imdecode(new MatOfByte(imageInMemory), Highgui.IMREAD_GRAYSCALE);
             MatOfRect detectionRectangles = new MatOfRect(); //the rectangles which reprent the coordinates on the image for where objects were detected
             for (String classifierKey : classifiers.keySet()) {
                 //apply each classifier to the file
@@ -117,7 +134,10 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
                     classifiers.get(classifierKey).detectMultiScale(originalImage, detectionRectangles);
                 } catch (CvException ignored) {
                     //The image was likely an image which we are unable to generate a thumbnail for, and the classifier was likely one where that is not acceptable
-                    logger.log(Level.INFO, String.format("Classifier '%s' could not be applied to file '%s'.", classifierKey, file.getParentPath() + file.getName())); //NON-NLS
+                    continue;
+                } catch (Exception unexpectedException) {
+                    //hopefully an unnecessary generic exception catch but currently present to catch any exceptions OpenCv throws which may not be documented
+                    logger.log(Level.SEVERE, "Unexpected Exception encountered for image " + file.getParentPath() + file.getName() + " with object id of " + file.getId() + " while trying to apply classifier " + classifierKey, unexpectedException);
                     continue;
                 }
 
@@ -148,10 +168,14 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
 
                     } catch (TskCoreException ex) {
                         logger.log(Level.SEVERE, String.format("Failed to create blackboard artifact for '%s'.", file.getParentPath() + file.getName()), ex); //NON-NLS
+                        detectionRectangles.release();
+                        originalImage.release();
                         return IngestModule.ProcessResult.ERROR;
                     }
                 }
             }
+            detectionRectangles.release();
+            originalImage.release();
         }
 
         return IngestModule.ProcessResult.OK;

Experimental/src/org/sleuthkit/autopsy/experimental/volatilityDSP/MemoryDSProcessor.java

@@ -56,7 +56,7 @@ public class MemoryDSProcessor implements DataSourceProcessor {
      *
      * @return A data source type display string for this data source processor.
      */
-    @Messages({"MemoryDSProcessor.dataSourceType=Memory Image File"})
+    @Messages({"MemoryDSProcessor.dataSourceType=Memory Image File (Volatility)"})
     public static String getType() {
         return Bundle.MemoryDSProcessor_dataSourceType();
     }

ImageGallery/nbproject/project.xml

@@ -127,7 +127,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>10</release-version>
-                        <specification-version>10.11</specification-version>
+                        <specification-version>10.12</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -136,7 +136,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/ImageGalleryOptionsPanel.java

@@ -203,17 +203,20 @@ final class ImageGalleryOptionsPanel extends javax.swing.JPanel {
     }
 
     void store() {
-        Case openCase;
-        try {
-            openCase = Case.getCurrentCaseThrows();
-        } catch (NoCurrentCaseException ex) {
-            Logger.getLogger(ImageGalleryOptionsPanel.class.getName()).log(Level.SEVERE, "Exception while getting open case.", ex); //NON-NLS
-            return;
-        }
         ImageGalleryPreferences.setEnabledByDefault(enabledByDefaultBox.isSelected());
         ImageGalleryController.getDefault().setListeningEnabled(enabledForCaseBox.isSelected());
-        new PerCaseProperties(openCase).setConfigSetting(ImageGalleryModule.getModuleName(), PerCaseProperties.ENABLED, Boolean.toString(enabledForCaseBox.isSelected()));
         ImageGalleryPreferences.setGroupCategorizationWarningDisabled(groupCategorizationWarningBox.isSelected());
+
+        // If a case is open, save the per case setting
+        try {
+            Case openCase = Case.getCurrentCaseThrows();
+            new PerCaseProperties(openCase).setConfigSetting(ImageGalleryModule.getModuleName(), PerCaseProperties.ENABLED, Boolean.toString(enabledForCaseBox.isSelected()));
+        } catch (NoCurrentCaseException ex) {
+            // It's not an error if there's no case open
+        }
+        
+        
+        
     }
 
     /**

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/DrawableDB.java

@@ -1179,6 +1179,12 @@ public final class DrawableDB {
      * @return the number of files with Cat-0
      */
     public long getUncategorizedCount(Collection<Long> fileIDs) {
+        
+        // if the fileset is empty, return count as 0
+        if (fileIDs.isEmpty()) {
+            return 0;
+        }
+        
         DrawableTagsManager tagsManager = controller.getTagsManager();
 
         // get a comma seperated list of TagName ids for non zero categories

ImageGallery/src/org/sleuthkit/autopsy/imagegallery/datamodel/grouping/GroupManager.java

@@ -82,6 +82,7 @@ import org.sleuthkit.datamodel.ContentTag;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TagName;
 import org.sleuthkit.datamodel.TskCoreException;
+import org.sleuthkit.datamodel.TskData.DbType;
 
 /**
  * Provides an abstraction layer on top of {@link  DrawableDB} ( and to some
@@ -351,11 +352,22 @@ public class GroupManager {
                 case MIME_TYPE:
                     if (nonNull(db)) {
                         HashSet<String> types = new HashSet<>();
-                        try (SleuthkitCase.CaseDbQuery executeQuery = controller.getSleuthKitCase().executeQuery("select group_concat(obj_id), mime_type from tsk_files group by mime_type "); //NON-NLS
+                        
+                        // Use the group_concat function to get a list of files for each mime type.  
+                        // This has different syntax on Postgres vs SQLite
+                        String groupConcatClause;
+                        if (DbType.POSTGRESQL == controller.getSleuthKitCase().getDatabaseType()) {
+                            groupConcatClause = " array_to_string(array_agg(obj_id), ',') as object_ids";
+                        }
+                        else {
+                            groupConcatClause = " group_concat(obj_id) as object_ids";
+                        }
+                        String query = "select " + groupConcatClause + " , mime_type from tsk_files group by mime_type ";
+                        try (SleuthkitCase.CaseDbQuery executeQuery = controller.getSleuthKitCase().executeQuery(query); //NON-NLS
                                 ResultSet resultSet = executeQuery.getResultSet();) {
                             while (resultSet.next()) {
                                 final String mimeType = resultSet.getString("mime_type"); //NON-NLS
-                                String objIds = resultSet.getString("group_concat(obj_id)"); //NON-NLS
+                                String objIds = resultSet.getString("object_ids"); //NON-NLS
 
                                 Pattern.compile(",").splitAsStream(objIds)
                                         .map(Long::valueOf)

InternalPythonModules/android/browserlocation.py

@@ -105,7 +105,7 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactTypeName(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactTypeName()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index GPS trackpoint artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/cachelocation.py

@@ -138,7 +138,7 @@ class CacheLocationAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index GPS trackpoint artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/calllog.py

@@ -157,7 +157,7 @@ class CallLogAnalyzer(general.AndroidComponentAnalyzer):
                                 blackboard = Case.getCurrentCase().getServices().getBlackboard()
                                 blackboard.indexArtifact(artifact)
                             except Blackboard.BlackboardException as ex:
-                                self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                                self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                                 self._logger.log(Level.SEVERE, traceback.format_exc())
                                 MessageNotifyUtil.Notify.error("Failed to index call log artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/contact.py

@@ -164,7 +164,7 @@ class ContactAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index contact artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/googlemaplocation.py

@@ -115,7 +115,7 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index GPS route artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/tangomessage.py

@@ -116,7 +116,7 @@ class TangoMessageAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index Tango message artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/textmessage.py

@@ -130,7 +130,7 @@ class TextMessageAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index text message artifact for keyword search.", artifact.getDisplayName())
 

InternalPythonModules/android/wwfmessage.py

@@ -125,7 +125,7 @@ class WWFMessageAnalyzer(general.AndroidComponentAnalyzer):
                     blackboard = Case.getCurrentCase().getServices().getBlackboard()
                     blackboard.indexArtifact(artifact)
                 except Blackboard.BlackboardException as ex:
-                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + artifact.getArtifactID(), ex)
+                    self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex)
                     self._logger.log(Level.SEVERE, traceback.format_exc())
                     MessageNotifyUtil.Notify.error("Failed to index WWF message artifact for keyword search.", artifact.getDisplayName())
 

KeywordSearch/manifest.mf

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.sleuthkit.autopsy.keywordsearch/6
-OpenIDE-Module-Implementation-Version: 19
+OpenIDE-Module-Implementation-Version: 20
 OpenIDE-Module-Install: org/sleuthkit/autopsy/keywordsearch/Installer.class
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/keywordsearch/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/keywordsearch/Bundle.properties

KeywordSearch/nbproject/project.xml

@@ -119,7 +119,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>10</release-version>
-                        <specification-version>10.11</specification-version>
+                        <specification-version>10.12</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>
@@ -128,7 +128,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>3</release-version>
-                        <specification-version>1.1</specification-version>
+                        <specification-version>1.2</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AdHocSearchFilterNode.java

@@ -36,7 +36,6 @@ import org.sleuthkit.autopsy.directorytree.ExternalViewerAction;
 import org.sleuthkit.autopsy.directorytree.ExtractAction;
 import org.sleuthkit.autopsy.actions.AddContentTagAction;
 import org.sleuthkit.autopsy.actions.DeleteFileContentTagAction;
-import org.sleuthkit.autopsy.directorytree.HashSearchAction;
 import org.sleuthkit.autopsy.directorytree.NewWindowViewAction;
 import org.sleuthkit.datamodel.AbstractFile;
 import org.sleuthkit.datamodel.Content;
@@ -48,7 +47,6 @@ import org.sleuthkit.datamodel.LayoutFile;
 import org.sleuthkit.datamodel.LocalFile;
 import org.sleuthkit.datamodel.Report;
 import org.sleuthkit.datamodel.SlackFile;
-import org.sleuthkit.datamodel.TskData;
 import org.sleuthkit.datamodel.VirtualDirectory;
 
 /**
@@ -126,50 +124,45 @@ class AdHocSearchFilterNode extends FilterNode {
 
         @Override
         public List<Action> visit(File f) {
-            return getFileActions(true);
+            return getFileActions();
         }
 
         @Override
         public List<Action> visit(DerivedFile f) {
-            return getFileActions(true);
+            return getFileActions();
         }
 
         @Override
         public List<Action> visit(Directory d) {
-            return getFileActions(false);
+            return getFileActions();
         }
 
         @Override
         public List<Action> visit(LayoutFile lf) {
-            //we want hashsearch enabled on carved files but not unallocated blocks
-            boolean enableHashSearch = (lf.getType() == TskData.TSK_DB_FILES_TYPE_ENUM.CARVED);
-            return getFileActions(enableHashSearch);
+            return getFileActions();
         }
 
         @Override
         public List<Action> visit(LocalFile lf) {
-            return getFileActions(true);
+            return getFileActions();
         }
 
         @Override
         public List<Action> visit(SlackFile f) {
-            return getFileActions(false);
+            return getFileActions();
         }
 
         @Override
         public List<Action> visit(VirtualDirectory dir) {
-            return getFileActions(false);
+            return getFileActions();
         }
 
-        private List<Action> getFileActions(boolean enableHashSearch) {
+        private List<Action> getFileActions() {
             List<Action> actionsList = new ArrayList<>();
             actionsList.add(new NewWindowViewAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.viewInNewWinActionLbl"), AdHocSearchFilterNode.this));
             actionsList.add(new ExternalViewerAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.openExternViewActLbl"), getOriginal()));
             actionsList.add(null);
             actionsList.add(ExtractAction.getInstance());
-            Action hashSearchAction = new HashSearchAction(NbBundle.getMessage(this.getClass(), "KeywordSearchFilterNode.getFileActions.searchSameMd5"), getOriginal());
-            hashSearchAction.setEnabled(enableHashSearch);
-            actionsList.add(hashSearchAction);
             actionsList.add(null); // creates a menu separator
             actionsList.add(AddContentTagAction.getInstance());
 
@@ -185,7 +178,7 @@ class AdHocSearchFilterNode extends FilterNode {
 
         @Override
         protected List<Action> defaultVisit(Content c) {
-            return getFileActions(false);
+            return getFileActions();
         }
     }
 }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/AdHocSearchPanel.java

@@ -172,8 +172,7 @@ abstract class AdHocSearchPanel extends javax.swing.JPanel {
     }
 
     /**
-     * Get dataSourceMap with object id and data source display name. Add the
-     * data source full name to toolTipList
+     * Get dataSourceMap with object id and data source display name.
      *
      * @return The list of data source name
      */

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownListSearchPanel.java

@@ -18,11 +18,11 @@
  */
 package org.sleuthkit.autopsy.keywordsearch;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Cursor;
+import java.awt.EventQueue;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
@@ -32,7 +32,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import javax.swing.JCheckBox;
-import javax.swing.JList;
 import javax.swing.JTable;
 import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
@@ -667,11 +666,21 @@ class DropdownListSearchPanel extends AdHocSearchPanel {
      * Set the dataSourceList enabled if the dataSourceCheckBox is selected
      */
     private void setComponentsEnabled() {
-        boolean enabled = this.dataSourceCheckBox.isSelected();
-        this.dataSourceList.setEnabled(enabled);
-        if (enabled) {
-            this.dataSourceList.setSelectionInterval(0, this.dataSourceList.getModel().getSize()-1);
+        
+        if (getDataSourceListModel().size() > 1) {
+            this.dataSourceCheckBox.setEnabled(true);
+            
+            boolean enabled = this.dataSourceCheckBox.isSelected();
+            this.dataSourceList.setEnabled(enabled);
+            if (enabled) {
+                this.dataSourceList.setSelectionInterval(0, this.dataSourceList.getModel().getSize()-1);
+            } else {
+                this.dataSourceList.setSelectedIndices(new int[0]);
+            }
         } else {
+            this.dataSourceCheckBox.setEnabled(false);
+            this.dataSourceCheckBox.setSelected(false);
+            this.dataSourceList.setEnabled(false);
             this.dataSourceList.setSelectedIndices(new int[0]);
         }
     }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/DropdownSingleTermSearchPanel.java

@@ -23,8 +23,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
@@ -32,7 +30,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
-import javax.swing.JList;
 import javax.swing.JMenuItem;
 import javax.swing.event.ListSelectionEvent;
 import org.openide.util.NbBundle;
@@ -374,18 +371,26 @@ public class DropdownSingleTermSearchPanel extends AdHocSearchPanel {
         }
         setComponentsEnabled();
         firePropertyChange(Bundle.DropdownSingleTermSearchPanel_selected(), null, null);
-        
     }
     
     /**
      * Set the dataSourceList enabled if the dataSourceCheckBox is selected
      */
     private void setComponentsEnabled() {
-        boolean enabled = this.dataSourceCheckBox.isSelected();
-        this.dataSourceList.setEnabled(enabled);
-        if (enabled) {
-            this.dataSourceList.setSelectionInterval(0, this.dataSourceList.getModel().getSize()-1);
+        if (getDataSourceListModel().size() > 1) {
+            this.dataSourceCheckBox.setEnabled(true);
+            
+            boolean enabled = this.dataSourceCheckBox.isSelected();
+            this.dataSourceList.setEnabled(enabled);
+            if (enabled) {
+                this.dataSourceList.setSelectionInterval(0, this.dataSourceList.getModel().getSize()-1);
+            } else {
+                this.dataSourceList.setSelectedIndices(new int[0]);
+            }
         } else {
+            this.dataSourceCheckBox.setEnabled(false);
+            this.dataSourceCheckBox.setSelected(false);
+            this.dataSourceList.setEnabled(false);
             this.dataSourceList.setSelectedIndices(new int[0]);
         }
     }

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java

@@ -28,7 +28,6 @@ import org.openide.util.NbBundle;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.casemodule.Case;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
-import org.sleuthkit.autopsy.core.UserPreferences;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.ingest.FileIngestModule;
@@ -92,6 +91,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
     private boolean startedSearching = false;
     private List<ContentTextExtractor> textExtractors;
     private StringsTextExtractor stringExtractor;
+    private TextFileExtractor txtFileExtractor;
     private final KeywordSearchJobSettings settings;
     private boolean initialized = false;
     private long jobId;
@@ -244,6 +244,8 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
         stringExtractor.setScripts(KeywordSearchSettings.getStringExtractScripts());
         stringExtractor.setOptions(KeywordSearchSettings.getStringExtractOptions());
 
+        txtFileExtractor = new TextFileExtractor();
+
         textExtractors = new ArrayList<>();
         //order matters, more specific extractors first
         textExtractors.add(new HtmlTextExtractor());
@@ -343,7 +345,7 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
         textExtractors.clear();
         textExtractors = null;
         stringExtractor = null;
-
+        txtFileExtractor = null;
         initialized = false;
     }
 
@@ -568,6 +570,17 @@ public final class KeywordSearchIngestModule implements FileIngestModule {
                 putIngestStatus(jobId, aFile.getId(), IngestStatus.SKIPPED_ERROR_TEXTEXTRACT);
             }
 
+            if ((wasTextAdded == false) && (aFile.getNameExtension().equalsIgnoreCase("txt"))) {
+                try {
+                    if (Ingester.getDefault().indexText(txtFileExtractor, aFile, context)) {
+                        putIngestStatus(jobId, aFile.getId(), IngestStatus.TEXT_INGESTED);
+                        wasTextAdded = true;
+                    }
+                } catch (IngesterException ex) {
+                    logger.log(Level.WARNING, "Unable to index as unicode", ex);
+                }
+            }
+
             // if it wasn't supported or had an error, default to strings
             if (wasTextAdded == false) {
                 extractStringsAndIndex(aFile);

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TextFileExtractor.java

@@ -0,0 +1,80 @@
+/*
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2018 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sleuthkit.autopsy.keywordsearch;
+
+import java.io.IOException;
+import java.io.Reader;
+import java.util.logging.Level;
+import org.apache.tika.parser.txt.CharsetDetector;
+import org.apache.tika.parser.txt.CharsetMatch;
+import org.sleuthkit.autopsy.coreutils.Logger;
+import org.sleuthkit.datamodel.Content;
+import org.sleuthkit.datamodel.ReadContentInputStream;
+
+/**
+ * Extract text from .txt files
+ */
+final class TextFileExtractor extends ContentTextExtractor {
+
+    //Set a Minimum confidence value to reject matches that may not have a valid text encoding
+    //Values of valid text encodings were generally 100, xml code sometimes had a value around 50, 
+    //and pictures and other files with a .txt extention were showing up with a value of 5 or less in limited testing.
+    //This limited information was used to select the current value as one that would filter out clearly non-text 
+    //files while hopefully working on all files with a valid text encoding
+    static final private int MIN_MATCH_CONFIDENCE = 20;
+    static final private Logger logger = Logger.getLogger(TextFileExtractor.class.getName());
+
+    @Override
+    boolean isContentTypeSpecific() {
+        return true;
+    }
+
+    @Override
+    boolean isSupported(Content file, String detectedFormat) {
+        return true;
+    }
+
+    @Override
+    public Reader getReader(Content source) throws TextExtractorException {
+        CharsetDetector detector = new CharsetDetector();
+        ReadContentInputStream stream = new ReadContentInputStream(source);
+        try {
+            detector.setText(stream);
+        } catch (IOException ex) {
+            throw new TextExtractorException("Unable to get string from detected text in UnicodeTextExtractor", ex);
+        }
+        CharsetMatch match = detector.detect();
+        if (match.getConfidence() < MIN_MATCH_CONFIDENCE) {
+            throw new TextExtractorException("Text does not match any character set with a high enough confidence for UnicodeTextExtractor");
+        }
+
+        return match.getReader();
+    }
+
+    @Override
+    public boolean isDisabled() {
+        return false;
+    }
+
+    @Override
+    public void logWarning(String msg, Exception ex) {
+        logger.log(Level.WARNING, msg, ex);
+    }
+
+}

RecentActivity/manifest.mf

@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 OpenIDE-Module: org.sleuthkit.autopsy.recentactivity/6
-OpenIDE-Module-Implementation-Version: 15
+OpenIDE-Module-Implementation-Version: 16
 OpenIDE-Module-Layer: org/sleuthkit/autopsy/recentactivity/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/sleuthkit/autopsy/recentactivity/Bundle.properties
 OpenIDE-Module-Requires: 

RecentActivity/nbproject/project.xml

@@ -60,7 +60,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>10</release-version>
-                        <specification-version>10.11</specification-version>
+                        <specification-version>10.12</specification-version>
                     </run-dependency>
                 </dependency>
             </module-dependencies>

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java

@@ -1,15 +1,15 @@
 /*
  * Autopsy Forensic Browser
- * 
+ *
  * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -237,8 +237,19 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         try { //try to decode the url
             String decoded = URLDecoder.decode(x, "UTF-8"); //NON-NLS
             return decoded;
-        } catch (UnsupportedEncodingException uee) { //if it fails, return the encoded string
-            logger.log(Level.FINE, "Error during URL decoding ", uee); //NON-NLS
+        } catch (UnsupportedEncodingException exception) { //if it fails, return the encoded string
+            logger.log(Level.FINE, "Error during URL decoding, returning undecoded value:"
+                    + "\n\tURL: " + url
+                    + "\n\tUndecoded value: " + x
+                    + "\n\tEngine name: " + eng.getEngineName()
+                    + "\n\tEngine domain: " + eng.getDomainSubstring(), exception); //NON-NLS
+            return x;
+        } catch (IllegalArgumentException exception) { //if it fails, return the encoded string
+            logger.log(Level.SEVERE, "Illegal argument passed to URL decoding, returning undecoded value:"
+                    + "\n\tURL: " + url
+                    + "\n\tUndecoded value: " + x
+                    + "\n\tEngine name: " + eng.getEngineName()
+                    + "\n\tEngine domain: " + eng.getDomainSubstring(), exception); //NON-NLS)
             return x;
         }
     }

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Util.java

@@ -86,11 +86,12 @@ class Util {
 
     public static String getBaseDomain(String url) {
         String host = null;
+        
         //strip protocol
-        String cleanUrl = url.replaceFirst("/.*:\\/\\//", "");
+        String cleanUrl = url.replaceFirst(".*:\\/\\/", "");
 
         //strip after slashes
-        String dirToks[] = cleanUrl.split("/\\//");
+        String dirToks[] = cleanUrl.split("\\/");
         if (dirToks.length > 0) {
             host = dirToks[0];
         } else {
@@ -141,7 +142,6 @@ class Util {
         if (result == null || result.trim().isEmpty()) {
             return getBaseDomain(value);
         }
-
         return result;
     }
 

TSKVersion.xml

@@ -1,3 +1,3 @@
 <project name="TSK_VERSION">
-    <property name="TSK_VERSION" value="4.6.1"/>
+    <property name="TSK_VERSION" value="4.6.2"/>
 </project>

nbproject/project.properties

@@ -6,8 +6,8 @@ app.name=${branding.token}
 ### if left unset, version will default to today's date
 app.version=4.8.0
 ### build.type must be one of: DEVELOPMENT, RELEASE
-build.type=RELEASE
-#build.type=DEVELOPMENT
+#build.type=RELEASE
+build.type=DEVELOPMENT
 
 project.org.netbeans.progress=org-netbeans-api-progress
 project.org.sleuthkit.autopsy.experimental=Experimental

thunderbirdparser/nbproject/project.xml

@@ -36,7 +36,7 @@
                     <compile-dependency/>
                     <run-dependency>
                         <release-version>10</release-version>
-                        <specification-version>10.11</specification-version>
+                        <specification-version>10.12</specification-version>
                     </run-dependency>
                 </dependency>
                 <dependency>

unix_setup.sh

@@ -2,7 +2,7 @@
 
 # Verifies programs are installed and copies native code into the Autopsy folder structure
 
-TSK_VERSION=4.6.1
+TSK_VERSION=4.6.2
 
 # Verify PhotoRec was installed
 photorec_filepath=/usr/bin/photorec