From 5ed3809ab8c7805e642103f2707a36a5d6e0dbb9 Mon Sep 17 00:00:00 2001 From: sidheshenator Date: Fri, 21 Aug 2015 17:41:37 -0400 Subject: [PATCH 1/2] tagged unallocated space reported --- .../sleuthkit/autopsy/report/ReportHTML.java | 23 ++++++++----------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java index 63e7ecb5fa..d8e47ff701 100644 --- a/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java +++ b/Core/src/org/sleuthkit/autopsy/report/ReportHTML.java @@ -562,13 +562,6 @@ class ReportHTML implements TableReportModule { return; } AbstractFile file = (AbstractFile) content; - // Don't make a local copy of the file if it is a directory or unallocated space. - if (file.isDir() - || file.getType() == TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS - || file.getType() == TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS) { - row.add(""); - return; - } // Add metadata about the file to HTML output row.add(file.getMtimeAsDate()); @@ -578,14 +571,18 @@ class ReportHTML implements TableReportModule { row.add(Long.toString(file.getSize())); row.add(file.getMd5Hash()); - // save it in a folder based on the tag name - String localFilePath = saveContent(file, contentTag.getName().getDisplayName()); - // Add the hyperlink to the row. A column header for it was created in startTable(). StringBuilder localFileLink = new StringBuilder(); - localFileLink.append(""); + // Don't make a local copy of the file if it is a directory or unallocated space. + if (!(file.isDir() + || file.getType() == TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS + || file.getType() == TSK_DB_FILES_TYPE_ENUM.UNUSED_BLOCKS)) { + localFileLink.append(""); + } StringBuilder builder = new StringBuilder(); builder.append("\t\n"); //NON-NLS From 94431e06fa0a91042e2b330b064b081317a8d4b0 Mon Sep 17 00:00:00 2001 From: Sidhesh Mhatre Date: Mon, 24 Aug 2015 09:39:42 -0400 Subject: [PATCH 2/2] Update ExifParserFileIngestModule.java Added the missed type param. --- .../autopsy/modules/exif/ExifParserFileIngestModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java index 4eaf6d1f2c..7c186e93b4 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/exif/ExifParserFileIngestModule.java @@ -66,7 +66,7 @@ public final class ExifParserFileIngestModule implements FileIngestModule { private long jobId; private static final IngestModuleReferenceCounter refCounter = new IngestModuleReferenceCounter(); private FileTypeDetector fileTypeDetector; - private final HashSet supportedMimeTypes = new HashSet(); + private final HashSet supportedMimeTypes = new HashSet<>(); ExifParserFileIngestModule() { supportedMimeTypes.add("audio/x-wav");