From df8f1abc7535b2c781f408d5376d0783e66a17c9 Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Wed, 25 Sep 2013 10:37:23 -0400
Subject: [PATCH] changed image size sanity checks a bit. moved to Image
---
.../AddImageWizardIngestConfigPanel.java | 5 +-
.../sleuthkit/autopsy/casemodule/Case.java | 54 +------------------
2 files changed, 4 insertions(+), 55 deletions(-)
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
index 61e8ba3b80..d3aaf0aaed 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardIngestConfigPanel.java
@@ -564,9 +564,10 @@ private void commitImage(WizardDescriptor settings) throws Exception {
Image newImage = Case.getCurrentCase().addImage(contentPath, imageId, timezone);
newImage.getSsize();
- String verificationErrors = Case.verifyImageSize(newImage);
- if (verificationErrors != null) {
+ String verificationErrors = newImage.verifyImageSize();
+ if (verificationErrors.equals("") == false) {
//data error (non-critical)
+ // @@@ Aren't we potentially overwriting existing errors...
progressPanel.setErrors(verificationErrors, false);
}
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
index f6ce198ffc..29151bc6ea 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/Case.java
@@ -109,60 +109,8 @@ public class Case implements SleuthkitCase.ErrorObserver {
// pcs is initialized in CaseListener constructor
private static final PropertyChangeSupport pcs = new PropertyChangeSupport(Case.class);
- /**
- *
- * @param newImage the value of newImage
- *
- * @throws TskCoreException
- */
- public static String verifyImageSize(Image newImage) {
- Logger logger1 = Logger.getLogger("verifyImageSizes");
- String errorString = "";
- try {
- List<VolumeSystem> volumeSystems = newImage.getVolumeSystems();
-
- logger1.log(Level.INFO, "found volume systems: " + volumeSystems.size());
-
- for (VolumeSystem vs : volumeSystems) {
- List<Volume> volumes = vs.getVolumes();
- logger1.log(Level.INFO, "found volumes: " + volumes.size());
- for (Volume v : volumes) {
- byte[] buf = new byte[100];
- try {
- int readBytes = newImage.read(buf, v.getStart() + v.getLength() - 100, 100);
- if (readBytes < 0) {
- logger1.warning("problem reading volume: Not as much data as expected");
- errorString = "\n problem reading volume: Not as much data as expected";
- }
- } catch (TskCoreException ex) {
- logger1.warning("error reading volume: Not as much data as expected." + ex.getLocalizedMessage());
- errorString = "\n error reading volume: Not as much data as expected.";
- }
- }
- }
- List<FileSystem> fileSystems = newImage.getFileSystems();
- logger1.log(Level.INFO, "found file systems: " + fileSystems.size());
- for (FileSystem fs : fileSystems) {
- long block_size = fs.getBlock_size();
- byte[] buf = new byte[(int) block_size];
- try {
- int readBytes = newImage.read(buf, fs.getImageOffset() + fs.getSize() - block_size, block_size);
- if (readBytes < 0) {
- logger1.warning("problem reading file system: Not as much data as expected.");
- errorString = "\n problem reading file system: Not as much data as expected.";
- }
- } catch (TskCoreException ex) {
- logger1.warning("error reading file system: Not as much data as expected." + ex.getLocalizedMessage());
- errorString = "\n error reading file system: Not as much data as expected.";
- }
- }
- } catch (TskCoreException ex) {
- errorString = "Error reading volume or filesystem. Could not verify image size";
- logger1.warning(errorString + ex);
- }
- return errorString;
- }
+
private String name;
private String number;
private String examiner;
--
GitLab