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

Merge pull request #2884 from narfindustries/global_bad_files

Browse Source 
Eam - properly use and display global files (hash db imported files)
This commit is contained in:
Richard Cordovano 2017-06-22 14:07:26 -04:00 committed by GitHub
commit 9f23fb104f
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCases.java
View File

@ -483,7 +483,7 @@ public class DataContentViewerOtherCases extends javax.swing.JPanel implements D
Collection<EamArtifactInstance> eamArtifactInstances = new ArrayList<>();
try {
EamDb dbManager = EamDb.getInstance();
if (dbManager.getCorrelationArtifactTypeByName("FILES") == eamArtifact.getArtifactType()) {
if (dbManager.getCorrelationArtifactTypeByName("FILES").equals(eamArtifact.getArtifactType())) {
try {
Collection<EamGlobalFileInstance> eamGlobalFileInstances = dbManager.getGlobalFileInstancesByHash(eamArtifact.getArtifactValue());
for (EamGlobalFileInstance eamGlobalFileInstance : eamGlobalFileInstances) {

12
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/contentviewer/DataContentViewerOtherCasesTableModel.java
View File

@ -133,13 +133,19 @@ public class DataContentViewerOtherCasesTableModel extends AbstractTableModel {
switch (colId) {
case CASE_NAME:
value = eamArtifactInstance.getEamCase().getDisplayName();
if (null != eamArtifactInstance.getEamCase()) {
value = eamArtifactInstance.getEamCase().getDisplayName();
}
break;
case DEVICE:
value = eamArtifactInstance.getEamDataSource().getDeviceID();
if (null != eamArtifactInstance.getEamDataSource()) {
value = eamArtifactInstance.getEamDataSource().getDeviceID();
}
break;
case DATA_SOURCE:
value = eamArtifactInstance.getEamDataSource().getName();
if (null != eamArtifactInstance.getEamDataSource()) {
value = eamArtifactInstance.getEamDataSource().getName();
}
break;
case FILE_PATH:
value = eamArtifactInstance.getFilePath();

2
Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/datamodel/AbstractSqlEamDb.java
View File

@ -1204,7 +1204,7 @@ public abstract class AbstractSqlEamDb implements EamDb {
public boolean isArtifactGlobalKnownBad(EamArtifact eamArtifact) throws EamDbException {
// TEMP: Only support file types
if (eamArtifact.getArtifactType() != getCorrelationArtifactTypeByName("FILES")) {
if (!eamArtifact.getArtifactType().equals(getCorrelationArtifactTypeByName("FILES"))) {
return false;
}