Skip to content

Allow macos to have vhd/x as a supported file type #7990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Allow macos to have vhd/x as a supported file type #7990

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae82cda
Update ImageDSProcessor.java
markmckinnon Nov 25, 2025
85eb7a4
Update ImageDSProcessor.java
markmckinnon Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions Core/src/org/sleuthkit/autopsy/casemodule/ImageDSProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -214,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);
Expand Down Expand Up @@ -324,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 {
Expand Down Expand Up @@ -547,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;

Expand Down