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

update for proper loading

Browse Source
This commit is contained in:
Greg DiCristofaro 2025-01-09 14:14:18 -05:00
parent 14cb87e4fb
commit 53126638c9
No known key found for this signature in database
1 changed files with 160 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

245
Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
View File

@ -25,6 +25,8 @@ import java.util.List;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Supplier;
import java.util.logging.Level; import java.util.logging.Level;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
@ -64,10 +66,12 @@ public class ImageFilePanel extends JPanel {
private final String contextName; private final String contextName;
private final List<FileFilter> fileChooserFilters; private final List<FileFilter> fileChooserFilters;
private static int VALIDATE_TIMEOUT_MILLIS = 1200; private static int VALIDATE_TIMEOUT_MILLIS = 1000;
static ScheduledThreadPoolExecutor delayedValidationService = new ScheduledThreadPoolExecutor(1, new ThreadFactoryBuilder().setNameFormat("ImageFilePanel delayed validation").build()); static ScheduledThreadPoolExecutor delayedValidationService = new ScheduledThreadPoolExecutor(1, new ThreadFactoryBuilder().setNameFormat("ImageFilePanel delayed validation").build());
private final Object validateActionLock = new Object(); private final ReentrantLock validationWaitingLock = new ReentrantLock();
private final ReentrantLock validationLock = new ReentrantLock();
private Runnable validateAction = null; private Runnable validateAction = null;
private Future<?> validateFuture = null; private Future<?> validateFuture = null;
@ -598,6 +602,23 @@ public class ImageFilePanel extends JPanel {
this.passwordTextField.setText(null); this.passwordTextField.setText(null);
} }
/**
* Sets UI enabled state.
*
* @param enabled True
*/
private void setUIEnabled(boolean enabled, boolean validNonE01) {
this.browseButton.setEnabled(enabled);
this.noFatOrphansCheckbox.setEnabled(enabled);
this.passwordTextField.setEnabled(enabled);
this.pathTextField.setEnabled(enabled);
this.sectorSizeComboBox.setEnabled(enabled);
this.md5HashTextField.setEnabled(enabled && validNonE01);
this.sha1HashTextField.setEnabled(enabled && validNonE01);
this.sha256HashTextField.setEnabled(enabled && validNonE01);
this.timeZoneComboBox.setEnabled(enabled);
}
/** /**
* Should we enable the next button of the wizard? * Should we enable the next button of the wizard?
* *
@ -614,49 +635,66 @@ public class ImageFilePanel extends JPanel {
"ImageFilePanel_validatePanel_unknownError=<html><body><p>An unknown error occurred while attempting to validate the image</p></body></html>" "ImageFilePanel_validatePanel_unknownError=<html><body><p>An unknown error occurred while attempting to validate the image</p></body></html>"
}) })
public boolean validatePanel() { public boolean validatePanel() {
String path = getContentPaths(); return runWithLock(this.validationLock, () -> {
if (!isImagePathValid()) { boolean validNonE01 = true;
showError(null); try {
return false;
}
if (!StringUtils.isBlank(getMd5()) && !HashUtility.isValidMd5Hash(getMd5())) { // acquire field values at the beginning to minimize chance of changing while validating.
showError(Bundle.ImageFilePanel_validatePanel_invalidMD5()); String path = getContentPaths();
return false;
}
if (!StringUtils.isBlank(getSha1()) && !HashUtility.isValidSha1Hash(getSha1())) { validNonE01 = isValidNonE01(path);
showError(Bundle.ImageFilePanel_validatePanel_invalidSHA1()); setUIEnabled(false, validNonE01);
return false;
}
if (!StringUtils.isBlank(getSha256()) && !HashUtility.isValidSha256Hash(getSha256())) { String md5 = getMd5();
showError(Bundle.ImageFilePanel_validatePanel_invalidSHA256()); String sha1 = getSha1();
return false; String sha256 = getSha256();
} String password = getPassword();
try { if (!isImagePathValid(path)) {
String password = this.getPassword(); showError(null);
TestOpenImageResult testResult = SleuthkitJNI.testOpenImage(path, password); return false;
if (!testResult.wasSuccessful()) { }
showError(Bundle.ImageFilePanel_validatePanel_imageOpenError(
StringUtils.defaultIfBlank( if (!StringUtils.isBlank(md5) && !HashUtility.isValidMd5Hash(md5)) {
testResult.getMessage(), showError(Bundle.ImageFilePanel_validatePanel_invalidMD5());
Bundle.ImageFilePanel_validatePanel_unknownErrorMsg()))); return false;
return false; }
if (!StringUtils.isBlank(sha1) && !HashUtility.isValidSha1Hash(sha1)) {
showError(Bundle.ImageFilePanel_validatePanel_invalidSHA1());
return false;
}
if (!StringUtils.isBlank(sha256) && !HashUtility.isValidSha256Hash(sha256)) {
showError(Bundle.ImageFilePanel_validatePanel_invalidSHA256());
return false;
}
try {
TestOpenImageResult testResult = SleuthkitJNI.testOpenImage(path, password);
if (!testResult.wasSuccessful()) {
showError(Bundle.ImageFilePanel_validatePanel_imageOpenError(
StringUtils.defaultIfBlank(
testResult.getMessage(),
Bundle.ImageFilePanel_validatePanel_unknownErrorMsg())));
return false;
}
} catch (Throwable t) {
logger.log(Level.SEVERE, "An unknown error occurred test opening image: " + path, t);
showError(Bundle.ImageFilePanel_validatePanel_unknownError());
return false;
}
if (!PathValidator.isValidForCaseType(path, Case.getCurrentCase().getCaseType())) {
showError(Bundle.ImageFilePanel_validatePanel_dataSourceOnCDriveError());
} else {
showError(null);
}
return true;
} finally {
setUIEnabled(true, validNonE01);
} }
} catch (Throwable t) { });
logger.log(Level.SEVERE, "An unknown error occurred test opening image: " + path, t);
showError(Bundle.ImageFilePanel_validatePanel_unknownError());
return false;
}
if (!PathValidator.isValidForCaseType(path, Case.getCurrentCase().getCaseType())) {
showError(Bundle.ImageFilePanel_validatePanel_dataSourceOnCDriveError());
} else {
showError(null);
}
return true;
} }
/** /**
@ -675,25 +713,28 @@ public class ImageFilePanel extends JPanel {
errorLabel.setText(""); errorLabel.setText("");
} }
} }
private boolean isImagePathValid() { /**
String path = getContentPaths(); * Returns true if path is valid for processing.
*
* @param path The path.
* @return True if valid for processing.
*/
private boolean isImagePathValid(String path) {
if (StringUtils.isBlank(path) || (!(new File(path).isFile() || DriveUtils.isPhysicalDrive(path) || DriveUtils.isPartition(path)))) { if (StringUtils.isBlank(path) || (!(new File(path).isFile() || DriveUtils.isPhysicalDrive(path) || DriveUtils.isPartition(path)))) {
return false; return false;
} }
return true; return true;
} }
/** /**
* @return True if the panel is on a delay for validating (i.e. typing a * Returns true if the path is a valid image that is not an E01.
* password for bitlocker). * @param path The path.
* @return True if valid image and not E01.
*/ */
public boolean isValidationLoading() { private boolean isValidNonE01(String path) {
synchronized (this.validateActionLock) { return StringUtils.isNotBlank(path) && isImagePathValid(path) && !path.toLowerCase().endsWith(".e01");
return this.validateAction != null;
}
} }
public void storeSettings() { public void storeSettings() {
@ -721,12 +762,13 @@ public class ImageFilePanel extends JPanel {
"ImageFilePanel.moduleErr.msg=A module caused an error listening to ImageFilePanel updates." "ImageFilePanel.moduleErr.msg=A module caused an error listening to ImageFilePanel updates."
+ " See log to determine which module. Some data could be incomplete.\n"}) + " See log to determine which module. Some data could be incomplete.\n"})
private void updateHelper() { private void updateHelper() {
if (isImagePathValid() && !getContentPaths().toLowerCase().endsWith(".e01")) { String path = getContentPaths();
if (isValidNonE01(path)) {
setHashValuesComponentsEnabled(true); setHashValuesComponentsEnabled(true);
} else { } else {
setHashValuesComponentsEnabled(false); setHashValuesComponentsEnabled(false);
} }
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true); firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
} }
@ -737,6 +779,34 @@ public class ImageFilePanel extends JPanel {
pathTextField.requestFocusInWindow(); pathTextField.requestFocusInWindow();
} }
/**
* Runs the supplier action with the reentrant lock or blocks until
* acquired.
*
* @param <T>
* @param lock The reentrant lock.
* @param action The action to run.
* @return The value of the supplier.
*/
private <T> T runWithLock(ReentrantLock lock, Supplier<T> action) {
try {
lock.lock();
return action.get();
} finally {
lock.unlock();
}
}
/**
* @return True if the panel is on a delay for validating (i.e. typing a
* password for bitlocker).
*/
public boolean isValidationLoading() {
return runWithLock(this.validationWaitingLock, () -> this.validateFuture != null
&& !this.validateFuture.isCancelled()
&& !this.validateFuture.isDone());
}
/** /**
* This class validates on a delay canceling any tasks previously scheduled * This class validates on a delay canceling any tasks previously scheduled
* so that password validation doesn't lock up the system. * so that password validation doesn't lock up the system.
@ -763,34 +833,34 @@ public class ImageFilePanel extends JPanel {
* while typing. * while typing.
*/ */
private void delayValidate() { private void delayValidate() {
boolean triggerUpdate = false;
synchronized (ImageFilePanel.this.validateActionLock) {
if (ImageFilePanel.this.validateFuture != null &&
!ImageFilePanel.this.validateFuture.isCancelled() &&
!ImageFilePanel.this.validateFuture.isDone()) {
ImageFilePanel.this.validateFuture.cancel(true);
triggerUpdate = true;
}
ImageFilePanel.this.validateAction = new ValidationRunnable();
ImageFilePanel.this.validateFuture = ImageFilePanel.this.delayedValidationService.schedule( boolean triggerUpdate = runWithLock(validationWaitingLock, () -> {
ImageFilePanel.this.validateAction,
boolean toRetTriggerUpdate = false;
if (isValidationLoading()) {
validateFuture.cancel(true);
toRetTriggerUpdate = true;
}
validateAction = new ValidationRunnable();
validateFuture = delayedValidationService.schedule(
validateAction,
VALIDATE_TIMEOUT_MILLIS, VALIDATE_TIMEOUT_MILLIS,
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
}
return toRetTriggerUpdate;
});
errorLabel.setVisible(false);
loadingLabel.setVisible(true);
// trigger invalidation after setting up new runnable if not already triggered // trigger invalidation after setting up new runnable if not already triggered
if (triggerUpdate) { if (triggerUpdate) {
firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true); firePropertyChange(DataSourceProcessor.DSP_PANEL_EVENT.UPDATE_UI.toString(), false, true);
} }
errorLabel.setVisible(false);
if (!ImageFilePanel.this.loadingLabel.isVisible()) {
ImageFilePanel.this.loadingLabel.setVisible(true);
}
} }
/** /**
* Runnable to run the updateHelper if the validation action remains * Runnable to run the updateHelper if the validation action remains
* this runnable. * this runnable.
@ -799,23 +869,28 @@ public class ImageFilePanel extends JPanel {
@Override @Override
public void run() { public void run() {
if (Thread.interrupted()) {
return; boolean isRunningAction = runWithLock(validationWaitingLock, () -> {
} if (validateAction != this) {
return false;
synchronized (ImageFilePanel.this.validateActionLock) {
if (ImageFilePanel.this.validateAction != this) {
return;
} }
// set the validation action to null to indicate that this is done running and can be validated. // set the validation action to null to indicate that this is done running and can be validated.
ImageFilePanel.this.validateAction = null; validateAction = null;
ImageFilePanel.this.validateFuture = null; validateFuture = null;
return true;
});
if (!isRunningAction) {
return;
} else if (Thread.interrupted()) {
return;
} }
ImageFilePanel.this.updateHelper(); ImageFilePanel.this.updateHelper();
} }
} }
} }
} }