From cdd12745e583f9c517f3ff29a225707c40b47605 Mon Sep 17 00:00:00 2001 From: millmanorama Date: Wed, 27 Mar 2019 14:10:06 +0100 Subject: [PATCH] pass image into buildLog2TimeLineCommand rather than derived bits of information --- .../autopsy/modules/plaso/PlasoIngestModule.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java index da1e5a1828..704548a5dc 100644 --- a/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java +++ b/Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java @@ -144,8 +144,8 @@ public class PlasoIngestModule implements DataSourceIngestModule { directory.mkdirs(); } - String[] imgFile = image.getPaths(); - ProcessBuilder log2TimeLineCommand = buildLog2TimeLineCommand(moduleOutputPath, imgFile[0], image.getTimeZone()); + + ProcessBuilder log2TimeLineCommand = buildLog2TimeLineCommand(moduleOutputPath, image); log2TimeLineCommand.redirectError(new File(moduleOutputPath + File.separator + "log2timeline_err.txt")); //NON-NLS logger.log(Level.INFO, Bundle.PlasoIngestModule_startUp_message()); @@ -220,17 +220,16 @@ public class PlasoIngestModule implements DataSourceIngestModule { return processBuilder; } - private ProcessBuilder buildLog2TimeLineCommand(String moduleOutputPath, String imageName, String timeZone) { - return buildProcessWithRunAsInvoker( - "\"" + log2TimeLineExecutable + "\"", //NON-NLS + private ProcessBuilder buildLog2TimeLineCommand(String moduleOutputPath, Image image ) { + return buildProcessWithRunAsInvoker("\"" + log2TimeLineExecutable + "\"", //NON-NLS "--vss-stores", "all", //NON-NLS - "-z", timeZone, //NON-NLS + "-z", image.getTimeZone(), //NON-NLS "--partitions", "all", //NON-NLS "--hasher_file_size_limit", "1", //NON-NLS "--hashers", "none", //NON-NLS "--no_dependencies_check", //NON-NLS moduleOutputPath + File.separator + PLASO, - imageName + image.getPaths()[0] ); }