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

Added error checking for psort

Browse Source
This commit is contained in:
Kelly Kelly 2019-07-17 11:09:11 -04:00
parent 87f84ae6be
commit 6169c08bd1
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java
View File

@ -135,7 +135,8 @@ public class PlasoIngestModule implements DataSourceIngestModule {
"PlasoIngestModule.psort.cancelled=psort run was canceled", "PlasoIngestModule.psort.cancelled=psort run was canceled",
"PlasoIngestModule.bad.imageFile=Cannot find image file name and path", "PlasoIngestModule.bad.imageFile=Cannot find image file name and path",
"PlasoIngestModule.completed=Plaso Processing Completed", "PlasoIngestModule.completed=Plaso Processing Completed",
"PlasoIngestModule.has.run=Plaso Plugin has been run."}) "PlasoIngestModule.has.run=Plaso Plugin has been run.",
"PlasoIngestModule.psort.fail=Plaso error running psort. psort error code: {0}"})
@Override @Override
public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper) { public ProcessResult process(Content dataSource, DataSourceIngestModuleProgress statusHelper) {
assert dataSource.equals(image); assert dataSource.equals(image);
@ -178,10 +179,12 @@ public class PlasoIngestModule implements DataSourceIngestModule {
// sort the output // sort the output
statusHelper.progress(Bundle.PlasoIngestModule_running_psort(), 33); statusHelper.progress(Bundle.PlasoIngestModule_running_psort(), 33);
ProcessBuilder psortCommand = buildPsortCommand(moduleOutputPath); ProcessBuilder psortCommand = buildPsortCommand(moduleOutputPath);
int returnVal = ExecUtil.execute(psortCommand, new DataSourceIngestModuleProcessTerminator(context)); int result = ExecUtil.execute(psortCommand, new DataSourceIngestModuleProcessTerminator(context));
if (result != 0) {
// For debugging purposes, logging the psort return value. logger.log(Level.SEVERE, String.format("Error running Psort, error code returned %d", result)); //NON-NLS
logger.log(Level.INFO, String.format("PlasoIngestModule - psort ran with a return value of %d", returnVal)); MessageNotifyUtil.Notify.error(MODULE_NAME, Bundle.PlasoIngestModule_psort_fail(result));
return ProcessResult.ERROR;
}
if (context.dataSourceIngestIsCancelled()) { if (context.dataSourceIngestIsCancelled()) {
logger.log(Level.INFO, "psort run was canceled"); //NON-NLS logger.log(Level.INFO, "psort run was canceled"); //NON-NLS
@ -271,7 +274,7 @@ public class PlasoIngestModule implements DataSourceIngestModule {
"PlasoIngestModule.create.artifacts.cancelled=Cancelled Plaso Artifact Creation ", "PlasoIngestModule.create.artifacts.cancelled=Cancelled Plaso Artifact Creation ",
"# {0} - file that events are from", "# {0} - file that events are from",
"PlasoIngestModule.artifact.progress=Adding events to case: {0}", "PlasoIngestModule.artifact.progress=Adding events to case: {0}",
"PlasoIngestModule.error.empty.database=Error occured while running plaso, plaso database is empty.", "PlasoIngestModule.info.empty.database=Plaso database was empty.",
}) })
private void createPlasoArtifacts(String plasoDb, DataSourceIngestModuleProgress statusHelper) { private void createPlasoArtifacts(String plasoDb, DataSourceIngestModuleProgress statusHelper) {
Blackboard blackboard = currentCase.getSleuthkitCase().getBlackboard(); Blackboard blackboard = currentCase.getSleuthkitCase().getBlackboard();
@ -293,8 +296,8 @@ public class PlasoIngestModule implements DataSourceIngestModule {
// Check if there is data the db // Check if there is data the db
if( !resultSet.first() ) { if( !resultSet.first() ) {
logger.log(Level.WARNING, String.format("PlasoDB was empty: %s", plasoDb)); logger.log(Level.INFO, String.format("PlasoDB was empty: %s", plasoDb));
MessageNotifyUtil.Notify.error(MODULE_NAME, Bundle.PlasoIngestModule_error_empty_database()); MessageNotifyUtil.Notify.info(MODULE_NAME, Bundle.PlasoIngestModule_info_empty_database());
return; return;
} else { } else {
// There is data, reset the pointer to the correct place for // There is data, reset the pointer to the correct place for