From 7a8215779dadd49a179887e831d9d2af6c78ad17 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dgrove" Date: Mon, 13 Aug 2018 14:07:30 -0400 Subject: [PATCH] Accounting for associated artifact. --- .../org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java | 7 +++---- .../org/sleuthkit/autopsy/keywordsearch/RegexQuery.java | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java index b3065dcad6..5d68430ea0 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/LuceneQuery.java @@ -232,6 +232,9 @@ class LuceneQuery implements KeywordSearchQuery { if (StringUtils.isNotBlank(listName)) { attributesList.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, listName)); } + hit.getArtifactID().ifPresent(artifactID + -> attributesList.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT, MODULE_NAME, artifactID)) + ); try { SleuthkitCase tskCase = Case.getCurrentCaseThrows().getSleuthkitCase(); @@ -257,10 +260,6 @@ class LuceneQuery implements KeywordSearchQuery { attributesList.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW, MODULE_NAME, snippet)); } - hit.getArtifactID().ifPresent(artifactID - -> attributesList.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT, MODULE_NAME, artifactID)) - ); - try { bba.addAttributes(attributesList); //write out to bb return bba; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java index 102682c4fe..694cfb7903 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/RegexQuery.java @@ -466,6 +466,9 @@ final class RegexQuery implements KeywordSearchQuery { if (StringUtils.isNotBlank(listName)) { attributesList.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_SET_NAME, MODULE_NAME, listName)); } + hit.getArtifactID().ifPresent(artifactID + -> attributesList.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT, MODULE_NAME, artifactID)) + ); try { SleuthkitCase tskCase = Case.getCurrentCaseThrows().getSleuthkitCase(); @@ -496,10 +499,6 @@ final class RegexQuery implements KeywordSearchQuery { attributesList.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_KEYWORD_PREVIEW, MODULE_NAME, snippet)); } - hit.getArtifactID().ifPresent(artifactID - -> attributesList.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT, MODULE_NAME, artifactID)) - ); - try { newArtifact.addAttributes(attributesList); return newArtifact;