mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 17:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adjusting UI text

Browse Source
This commit is contained in:
Ann Priestman 2018-11-09 07:39:31 -05:00
parent 6b3fb0ec29
commit 0fc98a7487
2 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/src/org/sleuthkit/autopsy/modules/e01verify/Bundle.properties
View File

@ -1,5 +1,5 @@
OpenIDE-Module-Name=ewfVerify OpenIDE-Module-Name=ewfVerify
EwfVerifyIngestModule.moduleName.text=E01 Verifier EwfVerifyIngestModule.moduleName.text=Image Integrity
EwfVerifyIngestModule.moduleDesc.text=Validates the integrity of E01 files. EwfVerifyIngestModule.moduleDesc.text=Validates the integrity of E01 files.
EwfVerifyIngestModule.process.errProcImg=Error processing {0} EwfVerifyIngestModule.process.errProcImg=Error processing {0}
EwfVerifyIngestModule.process.skipNonEwf=Skipping non-E01 image {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.process.errReadImgAtChunk=Error reading {0} at chunk {1}
EwfVerifyIngestModule.shutDown.verified=\ verified EwfVerifyIngestModule.shutDown.verified=\ verified
EwfVerifyIngestModule.shutDown.notVerified=\ not verified EwfVerifyIngestModule.shutDown.notVerified=\ not verified
EwfVerifyIngestModule.shutDown.verifyResultsHeader=<p>EWF Verification Results for {0}</p> EwfVerifyIngestModule.shutDown.verifyResultsHeader=<p>Image Verification Results for {0}</p>
EwfVerifyIngestModule.shutDown.resultLi=<li>Result\:{0}</li> EwfVerifyIngestModule.shutDown.resultLi=<li>Result\:{0}</li>
EwfVerifyIngestModule.shutDown.calcHashLi=<li>Calculated hash\: {0}</li> EwfVerifyIngestModule.shutDown.calcHashLi=<li>Calculated hash\: {0}</li>
EwfVerifyIngestModule.shutDown.storedHashLi=<li>Stored hash\: {0}</li> EwfVerifyIngestModule.shutDown.storedHashLi=<li>Stored hash\: {0}</li>

35
Core/src/org/sleuthkit/autopsy/modules/e01verify/E01VerifyIngestModule.java
View File

@ -110,12 +110,17 @@ public class E01VerifyIngestModule implements DataSourceIngestModule {
"# {0} - hashName", "# {0} - hashName",
"E01VerifyIngestModule.process.hashAlgorithmError=Error creating message digest for {0} algorithm", "E01VerifyIngestModule.process.hashAlgorithmError=Error creating message digest for {0} algorithm",
"# {0} - hashName", "# {0} - hashName",
"# {1} - hashValue", "E01VerifyIngestModule.process.hashMatch=<li>{0} hash verified</li>",
"E01VerifyIngestModule.process.hashMatch={0} hash verified: {1} ",
"# {0} - hashName", "# {0} - hashName",
"# {1} - calculatedHashValue", "E01VerifyIngestModule.process.hashNonMatch=<li>{0} hash not verified</li>",
"# {2} - storedHashValue", "# {0} - calculatedHashValue",
"E01VerifyIngestModule.process.hashNonMatch={0} hash not verified - calculated hash: {1} stored hash: {2}", "E01VerifyIngestModule.process.calculatedHash=<li> Calculated hash: {0}</li>",
"# {0} - storedHashValue",
"E01VerifyIngestModule.process.storedHash=<li> Stored hash: {0}</li>",
"E01VerifyIngestModule.process.listTest=<li>Level 1</li><ul><li>Level 2 a</li><li>Level 2b</li></ul><li> Level 1 again</li>",
"# {0} - calculatedHashValue",
"# {1} - storedHashValue",
"E01VerifyIngestModule.process.hashList=<ul><li>Calculated hash: {0}</li><li>Stored hash: {1}</li></ul>",
}) })
@Override @Override
public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper) { 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); int totalChunks = (int) Math.ceil((double) size / (double) chunkSize);
logger.log(Level.INFO, "Total chunks = {0}", totalChunks); //NON-NLS 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 // Set up the progress bar
statusHelper.switchToDeterminate(totalChunks); statusHelper.switchToDeterminate(totalChunks);
@ -265,12 +280,16 @@ public class E01VerifyIngestModule implements DataSourceIngestModule {
for (HashStruct struct:hashInfo) { for (HashStruct struct:hashInfo) {
if (struct.storedHash.equals(struct.calculatedHash)) { 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 { } else {
verified = false; 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; String verificationResultStr;