Skip to content

Fix export CSV for emails run program artifacts #7964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Fix export CSV for emails run program artifacts #7964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99af850
Update ThunderbirdMboxFileIngestModule.java
markmckinnon Apr 24, 2025
f548292
Update RAImageIngestModule.java
markmckinnon Apr 24, 2025
4e6493e
Update ExportCSVAction.java
markmckinnon Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Core/src/org/sleuthkit/autopsy/directorytree/ExportCSVAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
import java.awt.Component;
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.lang.reflect.InvocationTargetException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
Expand Down Expand Up @@ -319,7 +322,8 @@ public boolean cancel() {

CsvMapper mapper = new CsvMapper();
ObjectWriter writer = mapper.writerFor(Map.class).with(schema);
try (SequenceWriter seqWriter = writer.writeValues(outputFile)) {
try (OutputStreamWriter outWriter = new OutputStreamWriter(new FileOutputStream(outputFile), StandardCharsets.UTF_8);
SequenceWriter seqWriter = writer.writeValues(outWriter)) {
// Write each line
Iterator<?> nodeIterator = nodesToExport.iterator();
while (nodeIterator.hasNext()) {
Expand Down
4 changes: 2 additions & 2 deletions RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ public void startUp(IngestJobContext context) throws IngestModuleException {
extractors.add(recycleBin);
extractors.add(jumpList);
extractors.add(recentDocuments);
extractors.add(sru);
extractors.add(prefetch);
extractors.add(registry); // needs to run before the DataSourceUsageAnalyzer
extractors.add(osExtract); // this needs to run before the DataSourceUsageAnalyzer
extractors.add(dataSourceAnalyzer); //this needs to run after ExtractRegistry and ExtractOs
Expand All @@ -96,8 +98,6 @@ public void startUp(IngestJobContext context) throws IngestModuleException {
extractors.add(SEUQA); // this needs to run after the web browser modules
extractors.add(webAccountType); // this needs to run after the web browser modules
extractors.add(zoneInfo); // this needs to run after the web browser modules
extractors.add(sru);
extractors.add(prefetch);
extractors.add(messageDomainType);

browserExtractors.add(chrome);
Expand Down
10 changes: 8 additions & 2 deletions ...rdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,9 +770,15 @@ private BlackboardArtifact addEmailArtifact(EmailMessage email, AbstractFile abs
ATTRIBUTE_TYPE.TSK_MSG_ID, bbattributes);

try {
addArtifactAttribute((email.hasAttachment() ? "Yes" : ""),
blackboard.getOrAddAttributeType("EMAIL_HAS_ATTACHMENT", BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, "Has Attachments"),
if (email.hasAttachment()) {
addArtifactAttribute("Yes",
blackboard.getOrAddAttributeType("EMAIL_HAS_ATTACHMENT", BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, "Has Attachment"),
bbattributes);
} else {
addArtifactAttribute("No",
blackboard.getOrAddAttributeType("EMAIL_HAS_ATTACHMENT", BlackboardAttribute.TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING, "Has Attachment"),
bbattributes);
}
} catch (Blackboard.BlackboardException ex) {
logger.log(Level.SEVERE, "Unable to create EMAIL_HAS_ATTACHMENT attribute" , ex); //NON-NLS
}
Expand Down