mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-13 00:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7328 from APriestman/8055_corrAttrFilePath

Browse Source 
8055 Use data source name in CR file_name column
This commit is contained in:
Ann Priestman 2021-10-05 16:51:56 -04:00 committed by GitHub
commit 486bf1074a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/CorrelationAttributeUtil.java
View File

@ -578,7 +578,7 @@ public class CorrelationAttributeUtil {
value, value,
correlationCase, correlationCase,
CorrelationDataSource.fromTSKDataSource(correlationCase, dataSrc), CorrelationDataSource.fromTSKDataSource(correlationCase, dataSrc),
"", srcContent.getName(),
"", "",
TskData.FileKnown.UNKNOWN, TskData.FileKnown.UNKNOWN,
srcContent.getId()); srcContent.getId());
@ -807,7 +807,7 @@ public class CorrelationAttributeUtil {
accountAddr.get(), accountAddr.get(),
correlationCase, correlationCase,
CorrelationDataSource.fromTSKDataSource(correlationCase, dataSource), CorrelationDataSource.fromTSKDataSource(correlationCase, dataSource),
"", dataSource.getName(),
"", "",
TskData.FileKnown.KNOWN, TskData.FileKnown.KNOWN,
account.getId()); account.getId());

3
Core/src/org/sleuthkit/autopsy/commonpropertiessearch/CentralRepoCommonAttributeInstance.java
View File

@ -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. // Create the parent path. Make sure not to add a separator if there is already one there.
String parentPath = fileFromPath.getParent(); String parentPath = fileFromPath.getParent();
if (parentPath == null) {
return null;
}
if (!parentPath.endsWith(File.separator)) { if (!parentPath.endsWith(File.separator)) {
parentPath += File.separator; parentPath += File.separator;
} }

2
Core/src/org/sleuthkit/autopsy/commonpropertiessearch/InterCasePanel.java
View File

@ -128,7 +128,7 @@ public final class InterCasePanel extends javax.swing.JPanel {
} }
}); });
for (CorrelationAttributeInstance.Type type : types) { 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); correlationTypeFilters.put(type.getDisplayName(), type);
this.correlationTypeComboBox.addItem(type.getDisplayName()); this.correlationTypeComboBox.addItem(type.getDisplayName());
} }