From ae82cda3ef4ec007fa5e7b5b669f885a93b097bf Mon Sep 17 00:00:00 2001 From: Mark McKinnon Date: Mon, 24 Nov 2025 21:38:30 -0500 Subject: [PATCH 1/2] Update ImageDSProcessor.java remove check if a mac to not add virtual machine extensions. --- .../org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java index fb0c529a4ea..7dc410c2b90 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java @@ -91,10 +91,8 @@ public class ImageDSProcessor implements DataSourceProcessor, AutoIngestDataSour filtersList.add(encaseFilter); allExt.addAll(GeneralFilter.RAW_IMAGE_EXTS); allExt.addAll(GeneralFilter.ENCASE_IMAGE_EXTS); - if (!System.getProperty("os.name").toLowerCase().contains("mac")) { - filtersList.add(virtualMachineFilter); - allExt.addAll(GeneralFilter.VIRTUAL_MACHINE_EXTS); - } + filtersList.add(virtualMachineFilter); + allExt.addAll(GeneralFilter.VIRTUAL_MACHINE_EXTS); } /** From 85eb7a42ed0628d2d035c1bcdad596f76f403fc0 Mon Sep 17 00:00:00 2001 From: Mark McKinnon Date: Mon, 24 Nov 2025 22:02:03 -0500 Subject: [PATCH 2/2] Update ImageDSProcessor.java Change deprecated methods to supported methods --- .../sleuthkit/autopsy/casemodule/ImageDSProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java index 7dc410c2b90..6cecc1cba97 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.logging.Level; import java.util.UUID; +import java.util.Objects; import javax.swing.filechooser.FileFilter; -import org.apache.commons.lang3.StringUtils; import org.openide.util.NbBundle; import org.openide.util.lookup.ServiceProvider; import org.openide.util.lookup.ServiceProviders; @@ -212,7 +212,7 @@ public void run(String password, Host host, DataSourceProcessorProgressMonitor p ingestStream = new DefaultIngestStream(); readConfigSettings(); this.host = host; - this.password = StringUtils.defaultString(password, this.password); + this.password = Objects.toString(password, this.password); try { image = SleuthkitJNI.addImageToDatabase(Case.getCurrentCase().getSleuthkitCase(), new String[]{imagePath}, sectorSize, timeZone, md5, sha1, sha256, deviceId, this.password, this.host); @@ -322,7 +322,7 @@ public void runWithIngestStream(String password, Host host, IngestJobSettings se // Read the settings from the wizard readConfigSettings(); this.host = host; - this.password = StringUtils.defaultString(password, this.password); + this.password = Objects.toString(password, this.password); // Set up the data source before creating the ingest stream try { @@ -545,7 +545,7 @@ public void process(String deviceId, Path dataSourcePath, String password, Host this.imagePath = dataSourcePath.toString(); this.sectorSize = 0; this.timeZone = Calendar.getInstance().getTimeZone().getID(); - this.password = StringUtils.defaultString(password, this.password); + this.password = Objects.toString(password, this.password); this.host = host; this.ignoreFatOrphanFiles = false;