From 0fc98a74873045e7a113092a61a46c87c57bcc59 Mon Sep 17 00:00:00 2001 From: Ann Priestman Date: Fri, 9 Nov 2018 07:39:31 -0500 Subject: [PATCH] Adjusting UI text --- .../modules/e01verify/Bundle.properties | 4 +-- .../e01verify/E01VerifyIngestModule.java | 35 ++++++++++++++----- 2 files changed, 29 insertions(+), 10 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle.properties b/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle.properties index 445bbc0461..3323e64dec 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle.properties @@ -1,5 +1,5 @@ OpenIDE-Module-Name=ewfVerify -EwfVerifyIngestModule.moduleName.text=E01 Verifier +EwfVerifyIngestModule.moduleName.text=Image Integrity EwfVerifyIngestModule.moduleDesc.text=Validates the integrity of E01 files. EwfVerifyIngestModule.process.errProcImg=Error processing {0} EwfVerifyIngestModule.process.skipNonEwf=Skipping non-E01 image {0} @@ -9,7 +9,7 @@ EwfVerifyIngestModule.process.errGetSizeOfImg=Error getting size of {0}. Image w EwfVerifyIngestModule.process.errReadImgAtChunk=Error reading {0} at chunk {1} EwfVerifyIngestModule.shutDown.verified=\ verified EwfVerifyIngestModule.shutDown.notVerified=\ not verified -EwfVerifyIngestModule.shutDown.verifyResultsHeader=

EWF Verification Results for {0}

+EwfVerifyIngestModule.shutDown.verifyResultsHeader=

Image Verification Results for {0}

EwfVerifyIngestModule.shutDown.resultLi=
  • Result\:{0}
  • EwfVerifyIngestModule.shutDown.calcHashLi=
  • Calculated hash\: {0}
  • EwfVerifyIngestModule.shutDown.storedHashLi=
  • Stored hash\: {0}
  • diff --git a/Core/src/org/sleuthkit/autopsy/modules/e01verify/E01VerifyIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/e01verify/E01VerifyIngestModule.java index ae6b64ff51..a41b4f4992 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/e01verify/E01VerifyIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/e01verify/E01VerifyIngestModule.java @@ -110,12 +110,17 @@ public class E01VerifyIngestModule implements DataSourceIngestModule { "# {0} - hashName", "E01VerifyIngestModule.process.hashAlgorithmError=Error creating message digest for {0} algorithm", "# {0} - hashName", - "# {1} - hashValue", - "E01VerifyIngestModule.process.hashMatch={0} hash verified: {1} ", + "E01VerifyIngestModule.process.hashMatch=
  • {0} hash verified
  • ", "# {0} - hashName", - "# {1} - calculatedHashValue", - "# {2} - storedHashValue", - "E01VerifyIngestModule.process.hashNonMatch={0} hash not verified - calculated hash: {1} stored hash: {2}", + "E01VerifyIngestModule.process.hashNonMatch=
  • {0} hash not verified
  • ", + "# {0} - calculatedHashValue", + "E01VerifyIngestModule.process.calculatedHash=
  • Calculated hash: {0}
  • ", + "# {0} - storedHashValue", + "E01VerifyIngestModule.process.storedHash=
  • Stored hash: {0}
  • ", + "E01VerifyIngestModule.process.listTest=
  • Level 1
  • Level 1 again
  • ", + "# {0} - calculatedHashValue", + "# {1} - storedHashValue", + "E01VerifyIngestModule.process.hashList=", }) @Override public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper) { @@ -216,6 +221,16 @@ public class E01VerifyIngestModule implements DataSourceIngestModule { int totalChunks = (int) Math.ceil((double) size / (double) chunkSize); logger.log(Level.INFO, "Total chunks = {0}", totalChunks); //NON-NLS + if (mode.equals(Mode.VERIFY)) { + logger.log(Level.INFO, "Starting hash verification of {0}", img.getName()); //NON-NLS + } else { + logger.log(Level.INFO, "Starting hash calculation for {0}", img.getName()); //NON-NLS + } + services.postMessage(IngestMessage.createMessage(MessageType.INFO, E01VerifierModuleFactory.getModuleName(), + NbBundle.getMessage(this.getClass(), + "EwfVerifyIngestModule.process.startingImg", + imgName))); + // Set up the progress bar statusHelper.switchToDeterminate(totalChunks); @@ -265,12 +280,16 @@ public class E01VerifyIngestModule implements DataSourceIngestModule { for (HashStruct struct:hashInfo) { if (struct.storedHash.equals(struct.calculatedHash)) { - hashResults += Bundle.E01VerifyIngestModule_process_hashMatch(struct.type.name, struct.storedHash); + hashResults += Bundle.E01VerifyIngestModule_process_hashMatch(struct.type.name); } else { verified = false; - hashResults += Bundle.E01VerifyIngestModule_process_hashNonMatch(struct.type.name, struct.calculatedHash, struct.storedHash); + hashResults += Bundle.E01VerifyIngestModule_process_hashNonMatch(struct.type.name); } - + hashResults += Bundle.E01VerifyIngestModule_process_hashList(struct.calculatedHash, struct.storedHash); + //hashResults += Bundle.E01VerifyIngestModule_process_hashList(struct.calculatedHash, struct.storedHash); + //hashResults += Bundle.E01VerifyIngestModule_process_calculatedHash(struct.calculatedHash); + //hashResults += Bundle.E01VerifyIngestModule_process_storedHash(struct.storedHash); + //hashResults += Bundle.E01VerifyIngestModule_process_listTest(); } String verificationResultStr;