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

5709: Email attachments.

Browse Source 
- address review comments.
This commit is contained in:
Raman Arora 2019-12-11 19:21:50 -05:00
parent 858d50765c
commit a96e7d6859
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/src/org/sleuthkit/autopsy/datamodel/ExtractedContent.java
View File

@ -227,6 +227,7 @@ public class ExtractedContent implements AutopsyVisitableItem {
// maps the artifact type to its child node
private final HashMap<BlackboardArtifact.Type, TypeNode> typeNodeList = new HashMap<>();
@SuppressWarnings("deprecation")
TypeFactory() {
super();

8
Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
View File

@ -259,11 +259,13 @@ public class DataResultFilterNode extends FilterNode {
protected Node[] createNodes(Node key) {
// if displaying the results from the Data Source tree
// filter out artifacts
// unless there are message artifacts with attachments as children
// In older versions of Autopsy, attachments were children of email/message artifacts
// and hence email/messages with attachments are shown in the tree data source tree,
BlackboardArtifact art = key.getLookup().lookup(BlackboardArtifact.class);
if (art != null && filterArtifacts
&& ((DirectoryTreeUtils.showMessagesInDirTree() == false)
|| (DirectoryTreeUtils.showMessagesInDirTree()
&& ((FilterNodeUtils.showMessagesInDatasourceTree() == false)
|| (FilterNodeUtils.showMessagesInDatasourceTree()
&& art.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()
&& art.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()))) {
return new Node[]{};

2
Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeFilterNode.java
View File

@ -132,7 +132,7 @@ class DirectoryTreeFilterNode extends FilterNode {
}
} else if (child instanceof BlackboardArtifact) {
if (DirectoryTreeUtils.showMessagesInDirTree()) {
if (FilterNodeUtils.showMessagesInDatasourceTree()) {
// In older versions of Autopsy, attachments were children of email/message artifacts
// and hence email/messages with attachments are shown in the directory tree.
BlackboardArtifact bba = (BlackboardArtifact) child;

16
Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeUtils.java → Core/src/org/sleuthkit/autopsy/directorytree/FilterNodeUtils.java
View File

@ -26,7 +26,7 @@ import org.sleuthkit.datamodel.CaseDbSchemaVersionNumber;
* Utility class for Directory tree.
*
*/
final class DirectoryTreeUtils {
final class FilterNodeUtils {
private static final int ATTACHMENT_CHILDOF_MSG_MAX_DB_MAJOR_VER = 8;
private static final int ATTACHMENT_CHILDOF_MSG_MAX_DB_MINOR_VER = 4;
@ -34,7 +34,7 @@ final class DirectoryTreeUtils {
/**
* Empty private constructor
*/
private DirectoryTreeUtils() {
private FilterNodeUtils() {
}
@ -43,8 +43,8 @@ final class DirectoryTreeUtils {
* hence messages with any attachment children are shown in the directory
* tree.
*
* At 8.4, attachments are tracked as an attribute, and the message artifact
* don't need to be shown in the directory tree.
* At 8.4 and later, attachments are tracked as an attribute, and the message
* artifacts don't need to be shown in the directory tree.
*
* This method may be used to check the schema version and behave
* accordingly, in order to maintain backward compatibility.
@ -52,15 +52,15 @@ final class DirectoryTreeUtils {
* @return True if messages with attachment children should be shown in
* directory tree.
*/
static boolean showMessagesInDirTree() {
boolean showMessagesInDirTree = true;
static boolean showMessagesInDatasourceTree() {
boolean showMessagesInDatasourceTree = true;
if (Case.isCaseOpen()) {
CaseDbSchemaVersionNumber version = Case.getCurrentCase().getSleuthkitCase().getDBSchemaCreationVersion();
showMessagesInDirTree
showMessagesInDatasourceTree
= ((version.getMajor() < ATTACHMENT_CHILDOF_MSG_MAX_DB_MAJOR_VER)
|| (version.getMajor() == ATTACHMENT_CHILDOF_MSG_MAX_DB_MAJOR_VER && version.getMinor() < ATTACHMENT_CHILDOF_MSG_MAX_DB_MINOR_VER));
}
return showMessagesInDirTree;
return showMessagesInDatasourceTree;
}
}

2
thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
View File

@ -138,7 +138,7 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule {
communicationArtifactsHelper = new CommunicationArtifactsHelper(currentCase.getSleuthkitCase(),
EmailParserModuleFactory.getModuleName(), abstractFile, Account.Type.EMAIL);
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, String.format("Failed to create CommunicationArtifactsHelper for file %s", abstractFile.getName()), ex);
logger.log(Level.SEVERE, String.format("Failed to create CommunicationArtifactsHelper for file with object id = %d", abstractFile.getId()), ex);
return ProcessResult.ERROR;
}