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

Fix case coord svc node deletion bug

Browse Source
This commit is contained in:
Richard Cordovano 2019-02-24 10:58:28 -05:00
parent 7ec7eabf70
commit bc36a5a31b
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
Core/src/org/sleuthkit/autopsy/casemodule/Case.java
View File

@ -762,11 +762,11 @@ public class Case {
logger.log(Level.INFO, String.format("Used %d s to fail to acquire case directory coordination service lock for %s (%s) in %s", stopWatch.getElapsedTimeSecs(), metadata.getCaseDisplayName(), metadata.getCaseName(), metadata.getCaseDirectory())); logger.log(Level.INFO, String.format("Used %d s to fail to acquire case directory coordination service lock for %s (%s) in %s", stopWatch.getElapsedTimeSecs(), metadata.getCaseDisplayName(), metadata.getCaseName(), metadata.getCaseDirectory()));
throw new CaseActionException(Bundle.Case_exceptionMessage_failedToDeleteCoordinationServiceNodes(), ex); throw new CaseActionException(Bundle.Case_exceptionMessage_failedToDeleteCoordinationServiceNodes(), ex);
} }
} try {
try { deleteCoordinationServiceNodes(metadata, progressIndicator);
deleteCoordinationServiceNodes(metadata, progressIndicator); } catch (CoordinationServiceException ex) {
} catch (CoordinationServiceException ex) { throw new CaseActionException(Bundle.Case_creationException_couldNotAcquireDirLock(), ex);
throw new CaseActionException(Bundle.Case_creationException_couldNotAcquireDirLock(), ex); }
} }
} finally { } finally {
progressIndicator.finish(); progressIndicator.finish();
@ -1091,19 +1091,18 @@ public class Case {
* *
* @param caseDir The full path of the case directory. * @param caseDir The full path of the case directory.
* *
* @return The lock. * @return The lock or null if the lock could not be acquired.
* *
* @throws CaseActionException with a user-friendly message if the lock * @throws CaseActionException with a user-friendly message if the lock
* cannot be acquired. * cannot be acquired due to an exception.
*/ */
@Messages({"Case.creationException.couldNotAcquireResourcesLock=Failed to get lock on case resources"}) @Messages({
"Case.creationException.couldNotAcquireResourcesLock=Failed to get lock on case resources"
})
private static CoordinationService.Lock acquireExclusiveCaseResourcesLock(String caseDir) throws CaseActionException { private static CoordinationService.Lock acquireExclusiveCaseResourcesLock(String caseDir) throws CaseActionException {
try { try {
String resourcesNodeName = caseDir + "_resources"; String resourcesNodeName = caseDir + "_resources";
Lock lock = CoordinationService.getInstance().tryGetExclusiveLock(CategoryNode.CASES, resourcesNodeName, RESOURCES_LOCK_TIMOUT_HOURS, TimeUnit.HOURS); Lock lock = CoordinationService.getInstance().tryGetExclusiveLock(CategoryNode.CASES, resourcesNodeName, RESOURCES_LOCK_TIMOUT_HOURS, TimeUnit.HOURS);
if (null == lock) {
throw new CaseActionException(Bundle.Case_creationException_couldNotAcquireResourcesLock());
}
return lock; return lock;
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
throw new CaseActionCancelledException(Bundle.Case_exceptionMessage_cancelledByUser()); throw new CaseActionCancelledException(Bundle.Case_exceptionMessage_cancelledByUser());
@ -1910,7 +1909,9 @@ public class Case {
progressIndicator.progress(Bundle.Case_progressMessage_preparingToOpenCaseResources()); progressIndicator.progress(Bundle.Case_progressMessage_preparingToOpenCaseResources());
acquireSharedCaseDirLock(metadata.getCaseDirectory()); acquireSharedCaseDirLock(metadata.getCaseDirectory());
try (CoordinationService.Lock resourcesLock = acquireExclusiveCaseResourcesLock(metadata.getCaseDirectory())) { try (CoordinationService.Lock resourcesLock = acquireExclusiveCaseResourcesLock(metadata.getCaseDirectory())) {
assert (resourcesLock != null); // Use reference to avoid compile time warning. if (null == resourcesLock) {
throw new CaseActionException(Bundle.Case_creationException_couldNotAcquireResourcesLock());
}
open(isNewCase, progressIndicator); open(isNewCase, progressIndicator);
} catch (CaseActionException ex) { } catch (CaseActionException ex) {
releaseSharedCaseDirLock(getMetadata().getCaseDirectory()); releaseSharedCaseDirLock(getMetadata().getCaseDirectory());
@ -2027,43 +2028,43 @@ public class Case {
throw ex; throw ex;
} }
} }
/** /**
* Create an empty portable case from the current case * Create an empty portable case from the current case
* *
* @param caseName Case name * @param caseName Case name
* @param portableCaseFolder Case folder - must not exist * @param portableCaseFolder Case folder - must not exist
* *
* @return The portable case database * @return The portable case database
* *
* @throws TskCoreException * @throws TskCoreException
*/ */
public SleuthkitCase createPortableCase(String caseName, File portableCaseFolder) throws TskCoreException { public SleuthkitCase createPortableCase(String caseName, File portableCaseFolder) throws TskCoreException {
if (portableCaseFolder.exists()) { if (portableCaseFolder.exists()) {
throw new TskCoreException("Portable case folder " + portableCaseFolder.toString() + " already exists"); throw new TskCoreException("Portable case folder " + portableCaseFolder.toString() + " already exists");
} }
if (! portableCaseFolder.mkdirs()) { if (!portableCaseFolder.mkdirs()) {
throw new TskCoreException("Error creating portable case folder " + portableCaseFolder.toString()); throw new TskCoreException("Error creating portable case folder " + portableCaseFolder.toString());
} }
CaseDetails details = new CaseDetails(caseName, getNumber(), getExaminer(), CaseDetails details = new CaseDetails(caseName, getNumber(), getExaminer(),
getExaminerPhone(), getExaminerEmail(), getCaseNotes()); getExaminerPhone(), getExaminerEmail(), getCaseNotes());
try { try {
CaseMetadata portableCaseMetadata = new CaseMetadata(Case.CaseType.SINGLE_USER_CASE, portableCaseFolder.toString(), CaseMetadata portableCaseMetadata = new CaseMetadata(Case.CaseType.SINGLE_USER_CASE, portableCaseFolder.toString(),
caseName, details, metadata); caseName, details, metadata);
portableCaseMetadata.setCaseDatabaseName(SINGLE_USER_CASE_DB_NAME); portableCaseMetadata.setCaseDatabaseName(SINGLE_USER_CASE_DB_NAME);
} catch (CaseMetadataException ex) { } catch (CaseMetadataException ex) {
throw new TskCoreException("Error creating case metadata", ex); throw new TskCoreException("Error creating case metadata", ex);
} }
// Create the Sleuthkit case // Create the Sleuthkit case
SleuthkitCase portableSleuthkitCase; SleuthkitCase portableSleuthkitCase;
String dbFilePath = Paths.get(portableCaseFolder.toString(), SINGLE_USER_CASE_DB_NAME).toString(); String dbFilePath = Paths.get(portableCaseFolder.toString(), SINGLE_USER_CASE_DB_NAME).toString();
portableSleuthkitCase = SleuthkitCase.newCase(dbFilePath); portableSleuthkitCase = SleuthkitCase.newCase(dbFilePath);
return portableSleuthkitCase; return portableSleuthkitCase;
} }
/** /**
* Checks current thread for an interrupt. Usage: checking for user * Checks current thread for an interrupt. Usage: checking for user
@ -2492,7 +2493,9 @@ public class Case {
*/ */
progressIndicator.progress(Bundle.Case_progressMessage_preparing()); progressIndicator.progress(Bundle.Case_progressMessage_preparing());
try (CoordinationService.Lock resourcesLock = acquireExclusiveCaseResourcesLock(metadata.getCaseDirectory())) { try (CoordinationService.Lock resourcesLock = acquireExclusiveCaseResourcesLock(metadata.getCaseDirectory())) {
assert (null != resourcesLock); if (null == resourcesLock) {
throw new CaseActionException(Bundle.Case_creationException_couldNotAcquireResourcesLock());
}
close(progressIndicator); close(progressIndicator);
} finally { } finally {
/* /*