From 7d43a3dced7c7bccc934f5aed323b6fc88e61d29 Mon Sep 17 00:00:00 2001 From: apriestman Date: Tue, 5 Oct 2021 08:39:08 -0400 Subject: [PATCH] Use data source name in CR file_name column --- .../centralrepository/datamodel/CorrelationAttributeUtil.java | 4 ++-- .../CentralRepoCommonAttributeInstance.java | 3 +++ .../autopsy/commonpropertiessearch/InterCasePanel.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java index 8831988543..4243a36b51 100755 --- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java +++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java @@ -578,7 +578,7 @@ public class CorrelationAttributeUtil { value, correlationCase, CorrelationDataSource.fromTSKDataSource(correlationCase, dataSrc), - "", + srcContent.getName(), "", TskData.FileKnown.UNKNOWN, srcContent.getId()); @@ -807,7 +807,7 @@ public class CorrelationAttributeUtil { accountAddr.get(), correlationCase, CorrelationDataSource.fromTSKDataSource(correlationCase, dataSource), - "", + dataSource.getName(), "", TskData.FileKnown.KNOWN, account.getId()); diff --git a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CentralRepoCommonAttributeInstance.java b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CentralRepoCommonAttributeInstance.java index a913c85964..290456e44a 100644 --- a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CentralRepoCommonAttributeInstance.java +++ b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CentralRepoCommonAttributeInstance.java @@ -117,6 +117,9 @@ final public class CentralRepoCommonAttributeInstance extends AbstractCommonAttr // Create the parent path. Make sure not to add a separator if there is already one there. String parentPath = fileFromPath.getParent(); + if (parentPath == null) { + return null; + } if (!parentPath.endsWith(File.separator)) { parentPath += File.separator; } diff --git a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCasePanel.java b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCasePanel.java index 923e2195f2..0838002857 100644 --- a/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCasePanel.java +++ b/Core/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCasePanel.java @@ -128,7 +128,7 @@ public final class InterCasePanel extends javax.swing.JPanel { } }); for (CorrelationAttributeInstance.Type type : types) { - if (! type.getDbTableName().contains("os_account") && ! type.getDbTableName().contains("installed_program")) { + if (! type.getDbTableName().contains("os_account")) { correlationTypeFilters.put(type.getDisplayName(), type); this.correlationTypeComboBox.addItem(type.getDisplayName()); }