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

2594 viewArtifact navigation now working for regexes

Browse Source
This commit is contained in:
William Schaefer 2017-05-15 15:10:09 -04:00
parent c18d952393
commit 2af9bcd85f
3 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/src/org/sleuthkit/autopsy/datamodel/KeywordHits.java
View File

@ -757,7 +757,7 @@ public class KeywordHits implements AutopsyVisitableItem {
public RegExpInstanceNode(String setName, String keyword, String instance) { public RegExpInstanceNode(String setName, String keyword, String instance) {
super(Children.create(new HitsFactory(setName, keyword, instance), true), Lookups.singleton(keyword)); super(Children.create(new HitsFactory(setName, keyword, instance), true), Lookups.singleton(keyword));
super.setName(keyword); super.setName(instance); //the instance represents the name of the keyword hit at this point as the keyword is the regex
this.setName = setName; this.setName = setName;
this.keyword = keyword; this.keyword = keyword;
this.instance = instance; this.instance = instance;

3
Core/src/org/sleuthkit/autopsy/datamodel/accounts/Accounts.java
View File

@ -725,10 +725,11 @@ final public class Accounts implements AutopsyVisitableItem {
} }
} }
@NbBundle.Messages("Accounts.ByBINNode.name=By BIN")
private ByBINNode() { private ByBINNode() {
super(Children.LEAF); super(Children.LEAF);
setChildren(Children.createLazy(BINFactory::new)); setChildren(Children.createLazy(BINFactory::new));
setName("By BIN"); //NON-NLS setName(Bundle.Accounts_ByBINNode_name()); //NON-NLS
updateDisplayName(); updateDisplayName();
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/bank.png"); //NON-NLS this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/bank.png"); //NON-NLS
reviewStatusBus.register(this); reviewStatusBus.register(this);

38
Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
View File

@ -63,10 +63,12 @@ import org.sleuthkit.autopsy.datamodel.CreditCards;
import org.sleuthkit.autopsy.datamodel.DataSources; import org.sleuthkit.autopsy.datamodel.DataSources;
import org.sleuthkit.autopsy.datamodel.DataSourcesNode; import org.sleuthkit.autopsy.datamodel.DataSourcesNode;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode; import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
import org.sleuthkit.autopsy.datamodel.EmailExtracted;
import org.sleuthkit.autopsy.datamodel.EmptyNode; import org.sleuthkit.autopsy.datamodel.EmptyNode;
import org.sleuthkit.autopsy.datamodel.ExtractedContent; import org.sleuthkit.autopsy.datamodel.ExtractedContent;
import org.sleuthkit.autopsy.datamodel.FileTypesByMimeType; import org.sleuthkit.autopsy.datamodel.FileTypesByMimeType;
import org.sleuthkit.autopsy.datamodel.InterestingHits; import org.sleuthkit.autopsy.datamodel.InterestingHits;
import org.sleuthkit.autopsy.datamodel.KeywordHits;
import org.sleuthkit.autopsy.datamodel.Reports; import org.sleuthkit.autopsy.datamodel.Reports;
import org.sleuthkit.autopsy.datamodel.Results; import org.sleuthkit.autopsy.datamodel.Results;
import org.sleuthkit.autopsy.datamodel.ResultsNode; import org.sleuthkit.autopsy.datamodel.ResultsNode;
@ -910,6 +912,13 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
regex = att.getValueString(); regex = att.getValueString();
} }
} }
if (listName == null) {
if (regex == null) { //using same labels used for creation
listName = NbBundle.getMessage(KeywordHits.class, "KeywordHits.simpleLiteralSearch.text");
} else {
listName = NbBundle.getMessage(KeywordHits.class, "KeywordHits.singleRegexSearch.text");
}
}
Node listNode = keywordRootChilds.findChild(listName); Node listNode = keywordRootChilds.findChild(listName);
if (listNode == null) { if (listNode == null) {
return; return;
@ -918,19 +927,17 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
if (listChildren == null) { if (listChildren == null) {
return; return;
} }
if (regex != null) { //For support of URLs, IPs, Phone Numbers, and Email Addrs as they are down another level if (regex != null) { //For support of regex nodes such as URLs, IPs, Phone Numbers, and Email Addrs as they are down another level
Node regexNode = listChildren.findChild(regex); Node regexNode = listChildren.findChild(regex);
if (regexNode == null) { if (regexNode == null) {
return; return;
} }
Children regexChildren = regexNode.getChildren(); listChildren = regexNode.getChildren();
if (regexChildren == null) { if (listChildren == null) {
return; return;
} }
treeNode = regexChildren.findChild(null); //WJS-TODO what is the name of the node!? it isn't the keywordName at this point
} else {
treeNode = listChildren.findChild(keywordName);
} }
treeNode = listChildren.findChild(keywordName);
} catch (TskException ex) { } catch (TskException ex) {
LOGGER.log(Level.WARNING, "Error retrieving attributes", ex); //NON-NLS LOGGER.log(Level.WARNING, "Error retrieving attributes", ex); //NON-NLS
@ -963,16 +970,27 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
} else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) { } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()) {
Node emailMsgRootNode = resultsChilds.findChild(typeName); Node emailMsgRootNode = resultsChilds.findChild(typeName);
Children emailMsgRootChilds = emailMsgRootNode.getChildren(); Children emailMsgRootChilds = emailMsgRootNode.getChildren();
Node defaultNode = emailMsgRootChilds.findChild("Default"); //WJS-TODO what about non-default folders try {
List<BlackboardAttribute> attributes = art.getAttributes();
for (BlackboardAttribute att : attributes) {
int typeId = att.getAttributeType().getTypeID();
if (typeId == BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID()) {
String setName = att.getValueString();
}
}
} catch (TskException ex) {
LOGGER.log(Level.WARNING, "Error retrieving attributes", ex); //NON-NLS
}
Node defaultNode = emailMsgRootChilds.findChild(NbBundle.getMessage(EmailExtracted.class, "EmailExtracted.defaultAcct.text")); //WJS-TODO what about non-default folders
Children defaultChildren = defaultNode.getChildren(); Children defaultChildren = defaultNode.getChildren();
treeNode = defaultChildren.findChild("Default"); treeNode = defaultChildren.findChild(NbBundle.getMessage(EmailExtracted.class, "EmailExtracted.defaultFolder.text"));
} else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_ACCOUNT.getTypeID()) { } else if (typeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_ACCOUNT.getTypeID()) {
Node accountRootNode = resultsChilds.findChild(art.getDisplayName()); Node accountRootNode = resultsChilds.findChild(art.getDisplayName());
Children accountRootChilds = accountRootNode.getChildren(); Children accountRootChilds = accountRootNode.getChildren();
Node ccNode = accountRootChilds.findChild(Account.Type.CREDIT_CARD.getDisplayName()); //or Credit Cards or Default Node ccNode = accountRootChilds.findChild(Account.Type.CREDIT_CARD.getDisplayName()); //or Credit Cards or Default
Children ccChildren = ccNode.getChildren(); Children ccChildren = ccNode.getChildren();
Node binNode = ccChildren.findChild("By BIN"); //WJS-TODO get this string from somewhere Node binNode = ccChildren.findChild(NbBundle.getMessage(Accounts.class, "Accounts.ByBINNode.name"));
Children binChildren = binNode.getChildren(); Children binChildren = binNode.getChildren();
String accountNumberName = null; String accountNumberName = null;
List<BlackboardAttribute> attributes; List<BlackboardAttribute> attributes;
@ -1045,7 +1063,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
public void viewArtifactContent(BlackboardArtifact art public void viewArtifactContent(BlackboardArtifact art
) { ) {
new ViewContextAction( new ViewContextAction(
NbBundle.getMessage(this.getClass(), "DirectoryTreeTopComponent.action.viewArtContent.text"), NbBundle.getMessage(this.getClass(), "torytoryTreeTopComponent.action.viewArtContent.text"),
new BlackboardArtifactNode(art)).actionPerformed(null); new BlackboardArtifactNode(art)).actionPerformed(null);
} }