From 5938e68afb695b0eff2463d9d532b624b5ad826b Mon Sep 17 00:00:00 2001 From: "eugene.livis" Date: Tue, 7 Jun 2022 13:13:30 -0400 Subject: [PATCH 1/5] Initialization bug fix --- Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java index 071c6bb489..421a3d0675 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestMonitor.java @@ -109,6 +109,9 @@ public final class IngestMonitor { * @return Free space in bytes or -1 if free sapce could not be determined. */ long getFreeSpace() { + if (timerAction == null) { + timerAction = new MonitorTimerAction(); + } try { return timerAction.getFreeSpace(); } catch (SecurityException e) { From d73e46ff80d465404d03ed1bdbb8d7a95d85cdd8 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 13 Jun 2022 20:12:52 -0400 Subject: [PATCH 2/5] wait for ingest to complete before proceeding to report --- .../autopsy/commandlineingest/CommandLineIngestManager.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java index 7b9686e1c4..6823e8f9f2 100755 --- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java @@ -515,7 +515,10 @@ public class CommandLineIngestManager extends CommandLineManager { * listener or until interrupted because auto ingest * is shutting down. */ - ingestLock.wait(); + do { + ingestLock.wait(); + } while (IngestManager.getInstance().isIngestRunning()); + LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath()); IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot(); From bc86a6a671f4f7bd53d7ffbf5159e9d741849b0a Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Tue, 14 Jun 2022 16:19:21 -0400 Subject: [PATCH 3/5] wait timeout --- .../CommandLineIngestManager.java | 16 +++++++++------- .../autoingest/AutoIngestManager.java | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java index 6823e8f9f2..650baf9053 100755 --- a/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/commandlineingest/CommandLineIngestManager.java @@ -509,15 +509,17 @@ public class CommandLineIngestManager extends CommandLineManager { if (settingsWarnings.isEmpty()) { IngestJobStartResult ingestJobStartResult = IngestManager.getInstance().beginIngestJob(dataSource.getContent(), ingestJobSettings); IngestJob ingestJob = ingestJobStartResult.getJob(); - if (null != ingestJob) { + if (null != ingestJob) { /* - * Block until notified by the ingest job event - * listener or until interrupted because auto ingest - * is shutting down. + * Block until notified by the ingest job event listener + * or until interrupted because auto ingest is shutting + * down. For very small jobs, it is possible that ingest has + * completed by the time we get here, so check periodically + * in case the event was missed. */ - do { - ingestLock.wait(); - } while (IngestManager.getInstance().isIngestRunning()); + while (IngestManager.getInstance().isIngestRunning()) { + ingestLock.wait(60000); // Check every minute + } LOGGER.log(Level.INFO, "Finished ingest modules analysis for {0} ", dataSource.getPath()); IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java index d4f789a861..787be9cc30 100644 --- a/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java +++ b/Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/AutoIngestManager.java @@ -2819,7 +2819,7 @@ final class AutoIngestManager extends Observable implements PropertyChangeListen * in case the event was missed. */ while (IngestManager.getInstance().isIngestRunning()) { - ingestLock.wait(300000); // Check every five minutes + ingestLock.wait(60000); // Check every minute } IngestJob.ProgressSnapshot jobSnapshot = ingestJob.getSnapshot(); IngestJob.ProgressSnapshot.DataSourceProcessingSnapshot snapshot = jobSnapshot.getDataSourceProcessingSnapshot(); From aa32b62958a846bd25648fb871f4038ac3ef9a8a Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 27 Jun 2022 08:16:47 -0400 Subject: [PATCH 4/5] fixes for jna 5.12.0 --- CoreLibs/ivy.xml | 2 +- CoreLibs/nbproject/project.properties | 4 ++-- CoreLibs/nbproject/project.xml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CoreLibs/ivy.xml b/CoreLibs/ivy.xml index de8be46b71..ef0cef5c3a 100644 --- a/CoreLibs/ivy.xml +++ b/CoreLibs/ivy.xml @@ -14,7 +14,7 @@ - + diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index 0ee54ddc28..fbc803863a 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -88,8 +88,8 @@ file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar -file.reference.jna-5.11.0.jar=release/modules/ext/jna-5.11.0.jar -file.reference.jna-platform-5.11.0.jar=release/modules/ext/jna-platform-5.11.0.jar +file.reference.jna-5.12.0.jar=release/modules/ext/jna-5.12.0.jar +file.reference.jna-platform-5.12.0.jar=release/modules/ext/jna-platform-5.12.0.jar file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar file.reference.LGoodDatePicker-11.2.1.jar=release/modules/ext/LGoodDatePicker-11.2.1.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 453062b612..07f35c16f4 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -821,12 +821,12 @@ release/modules/ext/jfxtras-fxml-8.0-r4.jar - ext/jna-5.11.0.jar - release/modules/ext/jna-5.11.0.jar + ext/jna-5.12.0.jar + release/modules/ext/jna-5.12.0.jar - ext/jna-platform-5.11.0.jar - release/modules/ext/jna-platform-5.11.0.jar + ext/jna-platform-5.12.0.jar + release/modules/ext/jna-platform-5.12.0.jar ext/joda-time-2.10.14.jar From 181c242dd380d2251f3f584d5bb641e781de8b30 Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 30 Jun 2022 17:20:16 -0400 Subject: [PATCH 5/5] Updated jna version --- CoreLibs/nbproject/project.properties | 2 +- CoreLibs/nbproject/project.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CoreLibs/nbproject/project.properties b/CoreLibs/nbproject/project.properties index fbc803863a..8494f159e0 100644 --- a/CoreLibs/nbproject/project.properties +++ b/CoreLibs/nbproject/project.properties @@ -88,7 +88,7 @@ file.reference.jericho-html-3.4.jar=release/modules/ext/jericho-html-3.4.jar file.reference.jfxtras-common-8.0-r4.jar=release/modules/ext/jfxtras-common-8.0-r4.jar file.reference.jfxtras-controls-8.0-r4.jar=release/modules/ext/jfxtras-controls-8.0-r4.jar file.reference.jfxtras-fxml-8.0-r4.jar=release/modules/ext/jfxtras-fxml-8.0-r4.jar -file.reference.jna-5.12.0.jar=release/modules/ext/jna-5.12.0.jar +file.reference.jna-5.12.1.jar=release/modules/ext/jna-5.12.1.jar file.reference.jna-platform-5.12.0.jar=release/modules/ext/jna-platform-5.12.0.jar file.reference.joda-time-2.10.14.jar=release/modules/ext/joda-time-2.10.14.jar file.reference.jsr305-3.0.2.jar=release/modules/ext/jsr305-3.0.2.jar diff --git a/CoreLibs/nbproject/project.xml b/CoreLibs/nbproject/project.xml index 07f35c16f4..95b9d07017 100644 --- a/CoreLibs/nbproject/project.xml +++ b/CoreLibs/nbproject/project.xml @@ -821,8 +821,8 @@ release/modules/ext/jfxtras-fxml-8.0-r4.jar - ext/jna-5.12.0.jar - release/modules/ext/jna-5.12.0.jar + ext/jna-5.12.1.jar + release/modules/ext/jna-5.12.1.jar ext/jna-platform-5.12.0.jar