Merge branch 'develop' of https://github.com/markmckinnon/autopsy into develop

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

@@ -107,6 +107,9 @@ Case.servicesException.notificationTitle={0} Error
 Case.servicesException.serviceResourcesCloseError=Could not close case resources for {0} service: {1}
 Case_caseType_multiUser=Multi-user case
 Case_caseType_singleUser=Single-user case
+Case_checkImagePaths_exceptionOccurred=An exception occurred while checking if image paths are present
+# {0} - paths
+Case_checkImagePaths_noPaths=The following images had no associated paths: {0}
 CaseDetailsPanel.casePanel.border.title=Case
 CaseDetailsPanel.examinerLabel.text=Name:
 CaseDetailsPanel.examinerPanel.border.title=Examiner

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

@@ -41,6 +41,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
@@ -64,6 +65,7 @@ import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
@@ -194,8 +196,6 @@ public class Case {
     private final SleuthkitEventListener sleuthkitEventListener;
     private CollaborationMonitor collaborationMonitor;
     private Services caseServices;
-    // matches something like '\\.\PHYSICALDRIVE0'
-    private static final String PLACEHOLDER_DS_PATH_REGEX = "^\\s*\\\\\\\\\\.\\\\PHYSICALDRIVE\\d*\\s*$";
 
     private volatile boolean hasDataSource = false;
     private volatile boolean hasData = false;
@@ -1307,13 +1307,6 @@ public class Case {
             String path = entry.getValue();
             boolean fileExists = (new File(path).exists()|| DriveUtils.driveExists(path));
             if (!fileExists) {
-                // CT-7336: ignore relocating datasources if file provider is present and placeholder path is used.
-                if (newCurrentCase.getMetadata() != null
-                        && !StringUtils.isBlank(newCurrentCase.getMetadata().getContentProviderName())
-                        && (path == null || path.matches(PLACEHOLDER_DS_PATH_REGEX))) {
-                    continue;
-                }
-                
                 try {
                     DataSource ds = newCurrentCase.getSleuthkitCase().getDataSource(obj_id);
                     String hostName = StringUtils.defaultString(ds.getHost() == null ? "" : ds.getHost().getName());
@@ -2293,6 +2286,8 @@ public class Case {
             checkForCancellation();
             openCommunicationChannels(progressIndicator);
             checkForCancellation();
+            checkImagePaths();
+            checkForCancellation();
             openFileSystemsInBackground();
             return null;
 
@@ -2312,6 +2307,40 @@ public class Case {
         }
     }
     
+    /**
+     * Check if content provider is present, all images have paths, or throw an error.
+     * @throws CaseActionException 
+     */
+    @Messages({
+        "# {0} - paths",
+        "Case_checkImagePaths_noPaths=The following images had no associated paths: {0}",
+        "Case_checkImagePaths_exceptionOccurred=An exception occurred while checking if image paths are present"
+    })
+    private void checkImagePaths() throws CaseActionException {
+        // if there is a content provider, images don't necessarily need paths
+        if (StringUtils.isNotBlank(this.metadata.getContentProviderName())) {
+            return;
+        }
+        
+        // identify images without paths
+        try {
+            List<Image> noPathImages = new ArrayList<>();
+            List<Image> images = this.caseDb.getImages();
+            for (Image img: images) {
+                if (ArrayUtils.isEmpty(img.getPaths())) {
+                    noPathImages.add(img);
+                }
+            }
+            
+            if (!noPathImages.isEmpty()) {
+                String imageListStr = noPathImages.stream().map(Image::getName).collect(Collectors.joining(", "));
+                throw new CaseActionException(Bundle.Case_checkImagePaths_noPaths(imageListStr));
+            }
+        } catch (TskCoreException ex) {
+            throw new CaseActionException(Bundle.Case_checkImagePaths_exceptionOccurred(), ex);
+        }
+    }
+
     /**
      * Starts a background task that reads a sector from each file system of
      * each image of a case to do an eager open of the filesystems in the case.

Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/AnalysisResultsViewModel.java

@@ -175,7 +175,8 @@ public class AnalysisResultsViewModel {
         "AnalysisResultsViewModel_displayAttributes_score=Score",
         "AnalysisResultsViewModel_displayAttributes_type=Type",
         "AnalysisResultsViewModel_displayAttributes_configuration=Configuration",
-        "AnalysisResultsViewModel_displayAttributes_conclusion=Conclusion"
+        "AnalysisResultsViewModel_displayAttributes_conclusion=Conclusion",
+        "AnalysisResultsViewModel_displayAttributes_justification=Justification"
     })
     private ResultDisplayAttributes getDisplayAttributes(AnalysisResult analysisResult) {
         // The type of BlackboardArtifact.Type of the analysis result.
@@ -195,7 +196,9 @@ public class AnalysisResultsViewModel {
                 Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_configuration(),
                         normalizeAttr(analysisResult.getConfiguration())),
                 Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_conclusion(),
-                        normalizeAttr(analysisResult.getConclusion()))
+                        normalizeAttr(analysisResult.getConclusion())),
+                Pair.of(Bundle.AnalysisResultsViewModel_displayAttributes_justification(),
+                        normalizeAttr(analysisResult.getJustification()))
         );
 
         // The BlackboardAttributes sorted by type display name.

Core/src/org/sleuthkit/autopsy/contentviewers/analysisresults/Bundle.properties-MERGED

@@ -8,5 +8,6 @@ AnalysisResultsContentViewer_title=Analysis Results
 AnalysisResultsContentViewer_tooltip=Viewer for Analysis Results related to the selected node.
 AnalysisResultsViewModel_displayAttributes_conclusion=Conclusion
 AnalysisResultsViewModel_displayAttributes_configuration=Configuration
+AnalysisResultsViewModel_displayAttributes_justification=Justification
 AnalysisResultsViewModel_displayAttributes_score=Score
 AnalysisResultsViewModel_displayAttributes_type=Type