From fc0c6af1d37b8e99e8da0642451fd32a2421fe51 Mon Sep 17 00:00:00 2001 From: Karl Mortensen Date: Tue, 23 Jun 2015 12:36:03 -0400 Subject: [PATCH] watch out for unknown (-1) --- .../photoreccarver/PhotoRecCarverFileIngestModule.java | 3 ++- .../org/sleuthkit/autopsy/thunderbirdparser/PstParser.java | 4 +++- .../thunderbirdparser/ThunderbirdMboxFileIngestModule.java | 7 +++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java index a6f946a447..309420d77d 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java @@ -56,6 +56,7 @@ import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.ingest.ProcTerminationCode; import org.sleuthkit.autopsy.ingest.FileIngestModuleProcessTerminator; +import org.sleuthkit.autopsy.ingest.IngestMonitor; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.ModuleContentEvent; @@ -150,7 +151,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule { // Some network drives always return -1 for free disk space. // In this case, expect enough space and move on. long freeDiskSpace = IngestServices.getInstance().getFreeDiskSpace(); - if ((freeDiskSpace != -1) && ((file.getSize() * 1.2) > freeDiskSpace)) { + if ((freeDiskSpace != IngestMonitor.DISK_FREE_SPACE_UNKNOWN) && ((file.getSize() * 1.2) > freeDiskSpace)) { logger.log(Level.SEVERE, "PhotoRec error processing {0} with {1} Not enough space on primary disk to save unallocated space.", // NON-NLS new Object[]{file.getName(), PhotoRecCarverIngestModuleFactory.getModuleName()}); // NON-NLS MessageNotifyUtil.Notify.error(NbBundle.getMessage(this.getClass(), "PhotoRecIngestModule.UnableToCarve", file.getName()), diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java index ad474060e7..b68c206059 100755 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import org.openide.util.NbBundle; +import org.sleuthkit.autopsy.ingest.IngestMonitor; import org.sleuthkit.autopsy.ingest.IngestServices; import static org.sleuthkit.autopsy.thunderbirdparser.ThunderbirdMboxFileIngestModule.getRelModuleOutputPath; import org.sleuthkit.datamodel.AbstractFile; @@ -202,7 +203,8 @@ class PstParser { try { PSTAttachment attach = msg.getAttachment(x); long size = attach.getAttachSize(); - if (size >= services.getFreeDiskSpace()) { + long freeSpace = services.getFreeDiskSpace(); + if ((freeSpace != IngestMonitor.DISK_FREE_SPACE_UNKNOWN) && (size >= freeSpace)) { continue; } // both long and short filenames can be used for attachments diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java index aea6a8356a..95de8cc53d 100644 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java @@ -32,6 +32,7 @@ import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.IngestJobContext; import org.sleuthkit.autopsy.ingest.IngestMessage; import org.sleuthkit.autopsy.ingest.IngestModule.ProcessResult; +import org.sleuthkit.autopsy.ingest.IngestMonitor; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.ModuleContentEvent; import org.sleuthkit.autopsy.ingest.ModuleDataEvent; @@ -118,7 +119,8 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule { + "-" + String.valueOf(abstractFile.getId()); File file = new File(fileName); - if (abstractFile.getSize() >= services.getFreeDiskSpace()) { + long freeSpace = services.getFreeDiskSpace(); + if ((freeSpace != IngestMonitor.DISK_FREE_SPACE_UNKNOWN) && (abstractFile.getSize() >= freeSpace)) { logger.log(Level.WARNING, "Not enough disk space to write file to disk."); //NON-NLS IngestMessage msg = IngestMessage.createErrorMessage(EmailParserModuleFactory.getModuleName(), EmailParserModuleFactory.getModuleName(), NbBundle.getMessage(this.getClass(), @@ -200,7 +202,8 @@ public final class ThunderbirdMboxFileIngestModule implements FileIngestModule { + "-" + String.valueOf(abstractFile.getId()); File file = new File(fileName); - if (abstractFile.getSize() >= services.getFreeDiskSpace()) { + long freeSpace = services.getFreeDiskSpace(); + if ((freeSpace != IngestMonitor.DISK_FREE_SPACE_UNKNOWN) && (abstractFile.getSize() >= freeSpace)) { logger.log(Level.WARNING, "Not enough disk space to write file to disk."); //NON-NLS postErrorMessage( NbBundle.getMessage(this.getClass(), "ThunderbirdMboxFileIngestModule.processMBox.errProcFile.msg",