From e4cc771cdf64aec3cd24505b177c628c15a8769c Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Fri, 19 Sep 2014 16:24:35 -0400 Subject: [PATCH 1/2] Add metadata to HTML report --- .../org/sleuthkit/autopsy/report/Bundle.properties | 8 ++++++++ .../org/sleuthkit/autopsy/report/ReportGenerator.java | 11 ++++++++++- Core/src/org/sleuthkit/autopsy/report/ReportHTML.java | 9 ++++++++- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties index c891f3e19d..5380e0ff5a 100644 --- a/Core/src/org/sleuthkit/autopsy/report/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/report/Bundle.properties @@ -82,6 +82,14 @@ ReportGenerator.tagTable.header.tag=Tag ReportGenerator.tagTable.header.comment=Comment ReportGenerator.tagTable.header.srcFile=Source File ReportGenerator.progress.createdThumb.text=Creating thumbnails... +ReportGenerator.htmlOutput.header.file=File +ReportGenerator.htmlOutput.header.tag=Tag +ReportGenerator.htmlOutput.header.comment=Comment +ReportGenerator.htmlOutput.header.size=Size (Bytes) +ReportGenerator.htmlOutput.header.timeCreated=Time Created +ReportGenerator.htmlOutput.header.timeAccessed=Last Accessed +ReportGenerator.htmlOutput.header.timeModified=Last Modified +ReportGenerator.htmlOutput.header.hash=Hash ReportGenerator.thumbnailTable.name=Thumbnails ReportGenerator.thumbnailTable.desc=Contains thumbnails of images that are associated with tagged files and results. ReportGenerator.writeKwHits.userSrchs=User Searches diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 8f3e3770f1..7dc6298591 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -564,7 +564,16 @@ import org.sleuthkit.datamodel.TskData; tableProgress.get(module).updateStatusLabel( NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName())); - ArrayList columnHeaders = new ArrayList<>(Arrays.asList("File", "Tag", "Comment")); //NON-NLS + ArrayList columnHeaders = new ArrayList<>(Arrays.asList( + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.file", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.tag", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.comment", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.size", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeCreated", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeAccessed", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeModified", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.hash", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()))); + StringBuilder comment = new StringBuilder(); if (!tagNamesFilter.isEmpty()) { comment.append( diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 9e1160c428..a1dafdeb09 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -535,7 +535,14 @@ import org.sleuthkit.datamodel.TskData.TSK_DB_FILES_TYPE_ENUM; row.add(""); return; } - + + // Add metadata about the file to HTML output + row.add(Long.toString(file.getSize())); + row.add(file.getCtimeAsDate()); + row.add(file.getAtimeAsDate()); + row.add(file.getMtimeAsDate()); + row.add(file.getMd5Hash()); + // save it in a folder based on the tag name String localFilePath = saveContent(file, contentTag.getName().getDisplayName()); From e62b03c36f25d1cac7482bcadbce2c4b07171463 Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Mon, 22 Sep 2014 09:27:47 -0400 Subject: [PATCH 2/2] removed variable argument parameters --- .../autopsy/report/ReportGenerator.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java index 7dc6298591..e47e88b0e6 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java @@ -565,14 +565,14 @@ import org.sleuthkit.datamodel.TskData; NbBundle.getMessage(this.getClass(), "ReportGenerator.progress.processing", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName())); ArrayList columnHeaders = new ArrayList<>(Arrays.asList( - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.file", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.tag", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.comment", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.size", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeCreated", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeAccessed", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeModified", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()), - NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.hash", ARTIFACT_TYPE.TSK_TAG_FILE.getDisplayName()))); + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.file"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.tag"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.comment"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.size"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeCreated"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeAccessed"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.timeModified"), + NbBundle.getMessage(this.getClass(), "ReportGenerator.htmlOutput.header.hash"))); StringBuilder comment = new StringBuilder(); if (!tagNamesFilter.isEmpty()) {