mirror of
https://github.com/overcuriousity/autopsy-flatpak.git
synced 2025-07-12 07:56:16 +00:00
Merge pull request #6675 from kellykelly3/cleanup-recent-activity-cancel
6736 - Add more cancellation to RA
This commit is contained in:
commit
79256fd853
@ -32,11 +32,15 @@ import com.google.gson.JsonSyntaxException;
|
||||
import org.openide.util.NbBundle;
|
||||
import org.sleuthkit.autopsy.datamodel.ContentUtils;
|
||||
import java.util.logging.Level;
|
||||
import java.util.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileReader;
|
||||
import java.io.IOException;
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.ArrayList;
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.openide.util.NbBundle.Messages;
|
||||
import org.sleuthkit.autopsy.casemodule.Case;
|
||||
@ -268,7 +272,7 @@ class Chromium extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -410,7 +414,10 @@ class Chromium extends Extract {
|
||||
this.getName(), bookmarkFile.getName()));
|
||||
}
|
||||
}
|
||||
postArtifacts(bbartifacts);
|
||||
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
bbartifacts.clear();
|
||||
dbFile.delete();
|
||||
}
|
||||
@ -506,7 +513,7 @@ class Chromium extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -628,7 +635,7 @@ class Chromium extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -729,7 +736,7 @@ class Chromium extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -807,7 +814,7 @@ class Chromium extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
@ -66,17 +66,27 @@ class DataSourceUsageAnalyzer extends Extract {
|
||||
this.dataSource = dataSource;
|
||||
try {
|
||||
progressBar.progress(Bundle.Progress_Message_Analyze_Usage());
|
||||
createDataSourceUsageArtifacts();
|
||||
createDataSourceUsageArtifacts(context);
|
||||
} catch (TskCoreException ex) {
|
||||
logger.log(Level.WARNING, "Failed to check if datasource contained a volume with operating system specific files", ex);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void createDataSourceUsageArtifacts() throws TskCoreException {
|
||||
private void createDataSourceUsageArtifacts(IngestJobContext context) throws TskCoreException {
|
||||
|
||||
createOSInfoDataSourceUsageArtifacts();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
createAndroidMediaCardArtifacts();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
createDJIDroneDATArtitifacts();
|
||||
}
|
||||
|
||||
|
@ -148,6 +148,10 @@ final class ExtractEdge extends Extract {
|
||||
LOG.log(Level.SEVERE, "Error fetching 'WebCacheV01.dat' files for Microsoft Edge", ex); //NON-NLS
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
spartanFiles = fetchSpartanDBFiles(); // For later use with bookmarks
|
||||
} catch (TskCoreException ex) {
|
||||
@ -167,6 +171,10 @@ final class ExtractEdge extends Extract {
|
||||
return;
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
final String esedumper = getPathForESEDumper();
|
||||
if (esedumper == null) {
|
||||
LOG.log(Level.SEVERE, "Error finding ESEDatabaseViewer program"); //NON-NLS
|
||||
@ -353,7 +361,7 @@ final class ExtractEdge extends Extract {
|
||||
fileScanner.close();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -399,7 +407,7 @@ final class ExtractEdge extends Extract {
|
||||
fileScanner.close();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -455,7 +463,7 @@ final class ExtractEdge extends Extract {
|
||||
fileScanner.close();
|
||||
}
|
||||
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -517,7 +525,9 @@ final class ExtractEdge extends Extract {
|
||||
fileScanner.close();
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -98,9 +98,17 @@ class ExtractIE extends Extract {
|
||||
progressBar.progress(Bundle.Progress_Message_IE_Bookmarks());
|
||||
this.getBookmark();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_IE_Cookies());
|
||||
this.getCookie();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_IE_History());
|
||||
this.getHistory();
|
||||
}
|
||||
@ -166,7 +174,9 @@ class ExtractIE extends Extract {
|
||||
}
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
private String getURLFromIEBookmarkFile(AbstractFile fav) {
|
||||
@ -276,7 +286,9 @@ class ExtractIE extends Extract {
|
||||
}
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -376,7 +388,9 @@ class ExtractIE extends Extract {
|
||||
}
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -71,6 +71,10 @@ class ExtractOs extends Extract {
|
||||
try {
|
||||
progressBar.progress(Bundle.ExtractOS_progressMessage());
|
||||
for (OS_TYPE value : OS_TYPE.values()) {
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
checkForOSFiles(value);
|
||||
}
|
||||
} catch (TskCoreException ex) {
|
||||
|
@ -36,7 +36,6 @@ import java.util.logging.Level;
|
||||
import org.openide.modules.InstalledFileLocator;
|
||||
import org.openide.util.NbBundle.Messages;
|
||||
import org.sleuthkit.autopsy.casemodule.Case;
|
||||
import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
|
||||
import org.sleuthkit.autopsy.casemodule.services.FileManager;
|
||||
import org.sleuthkit.autopsy.coreutils.ExecUtil;
|
||||
import org.sleuthkit.autopsy.coreutils.Logger;
|
||||
@ -306,12 +305,8 @@ final class ExtractPrefetch extends Extract {
|
||||
logger.log(Level.SEVERE, "Error while trying to read into a sqlite db.", ex);//NON-NLS
|
||||
}
|
||||
|
||||
if (!blkBrdArtList.isEmpty()) {
|
||||
try {
|
||||
blackboard.postArtifacts(blkBrdArtList, MODULE_NAME);
|
||||
} catch (Blackboard.BlackboardException ex) {
|
||||
logger.log(Level.SEVERE, "Error Posting Artifact.", ex);//NON-NLS
|
||||
}
|
||||
if (!blkBrdArtList.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(blkBrdArtList);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -58,7 +58,6 @@ import org.sleuthkit.datamodel.FsContent;
|
||||
import org.sleuthkit.datamodel.SleuthkitCase;
|
||||
import org.sleuthkit.datamodel.TskCoreException;
|
||||
import org.sleuthkit.datamodel.TskData;
|
||||
import org.sleuthkit.datamodel.TskDataException;
|
||||
|
||||
/**
|
||||
* This module is based on the RecycleBin python module from Mark McKinnon.
|
||||
|
@ -292,6 +292,10 @@ class ExtractRegistry extends Extract {
|
||||
}
|
||||
|
||||
for (AbstractFile regFile : allRegistryFiles) {
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
String regFileName = regFile.getName();
|
||||
long regFileId = regFile.getId();
|
||||
String regFileNameLocal = RAImageIngestModule.getRATempPath(currentCase, "reg") + File.separator + regFileName;
|
||||
@ -340,6 +344,10 @@ class ExtractRegistry extends Extract {
|
||||
this.getName(), regFileName));
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
// create a report for the full output
|
||||
if (!regOutputFiles.fullPlugins.isEmpty()) {
|
||||
//parse the full regripper output from SAM hive files
|
||||
@ -360,6 +368,11 @@ class ExtractRegistry extends Extract {
|
||||
NbBundle.getMessage(this.getClass(), "ExtractRegistry.analyzeRegFiles.failedParsingResults",
|
||||
this.getName(), regFileName));
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
Report report = currentCase.addReport(regOutputFiles.fullPlugins,
|
||||
NbBundle.getMessage(this.getClass(), "ExtractRegistry.parentModuleName.noSpace"),
|
||||
@ -949,7 +962,9 @@ class ExtractRegistry extends Extract {
|
||||
} catch (IOException ex) {
|
||||
}
|
||||
|
||||
postArtifacts(newArtifacts);
|
||||
if (!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(newArtifacts);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -1031,7 +1046,8 @@ class ExtractRegistry extends Extract {
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1144,7 +1160,9 @@ class ExtractRegistry extends Extract {
|
||||
} catch (TskCoreException ex) {
|
||||
logger.log(Level.WARNING, "Error updating TSK_OS_ACCOUNT artifacts to include newly parsed data.", ex); //NON-NLS
|
||||
} finally {
|
||||
postArtifacts(newArtifacts);
|
||||
if (!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(newArtifacts);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
@ -1448,8 +1466,8 @@ class ExtractRegistry extends Extract {
|
||||
}
|
||||
line = reader.readLine();
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
postArtifacts(bbartifacts);
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1517,7 +1535,7 @@ class ExtractRegistry extends Extract {
|
||||
line = line.trim();
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1568,7 +1586,7 @@ class ExtractRegistry extends Extract {
|
||||
line = line.trim();
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty()&& !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1616,7 +1634,7 @@ class ExtractRegistry extends Extract {
|
||||
line = line.trim();
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1665,7 +1683,7 @@ class ExtractRegistry extends Extract {
|
||||
line = line.trim();
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1706,7 +1724,7 @@ class ExtractRegistry extends Extract {
|
||||
line = line.trim();
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1755,7 +1773,7 @@ class ExtractRegistry extends Extract {
|
||||
line = reader.readLine();
|
||||
line = line.trim();
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1818,7 +1836,7 @@ class ExtractRegistry extends Extract {
|
||||
line = line.trim();
|
||||
}
|
||||
}
|
||||
if (!bbartifacts.isEmpty()) {
|
||||
if (!bbartifacts.isEmpty() && !context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
@ -1950,7 +1968,9 @@ class ExtractRegistry extends Extract {
|
||||
artifacts.add(artifact);
|
||||
}
|
||||
} finally {
|
||||
postArtifacts(artifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(artifacts);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -46,7 +46,6 @@ import org.sleuthkit.autopsy.datamodel.ContentUtils;
|
||||
import org.sleuthkit.autopsy.ingest.DataSourceIngestModuleProgress;
|
||||
import org.sleuthkit.autopsy.ingest.IngestJobContext;
|
||||
import org.sleuthkit.autopsy.ingest.IngestServices;
|
||||
import org.sleuthkit.autopsy.ingest.ModuleDataEvent;
|
||||
import org.sleuthkit.autopsy.recentactivity.BinaryCookieReader.Cookie;
|
||||
import org.sleuthkit.datamodel.AbstractFile;
|
||||
import org.sleuthkit.datamodel.BlackboardArtifact;
|
||||
@ -125,6 +124,10 @@ final class ExtractSafari extends Extract {
|
||||
LOG.log(Level.SEVERE, "Exception thrown while processing history file.", ex); //NON-NLS
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Safari_Bookmarks());
|
||||
try {
|
||||
processBookmarkPList(dataSource, context);
|
||||
@ -133,6 +136,10 @@ final class ExtractSafari extends Extract {
|
||||
LOG.log(Level.SEVERE, "Exception thrown while parsing Safari Bookmarks file.", ex); //NON-NLS
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Safari_Downloads());
|
||||
try {
|
||||
processDownloadsPList(dataSource, context);
|
||||
@ -141,6 +148,10 @@ final class ExtractSafari extends Extract {
|
||||
LOG.log(Level.SEVERE, "Exception thrown while parsing Safari Download.plist file.", ex); //NON-NLS
|
||||
}
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Safari_Cookies());
|
||||
try {
|
||||
processBinaryCookieFile(dataSource, context);
|
||||
@ -292,7 +303,9 @@ final class ExtractSafari extends Extract {
|
||||
}
|
||||
|
||||
try {
|
||||
postArtifacts(getHistoryArtifacts(historyFile, tempHistoryFile.toPath(), context));
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(getHistoryArtifacts(historyFile, tempHistoryFile.toPath(), context));
|
||||
}
|
||||
} finally {
|
||||
tempHistoryFile.delete();
|
||||
}
|
||||
@ -319,7 +332,9 @@ final class ExtractSafari extends Extract {
|
||||
File tempFile = createTemporaryFile(context, file);
|
||||
|
||||
try {
|
||||
postArtifacts(getBookmarkArtifacts(file, tempFile, context));
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(getBookmarkArtifacts(file, tempFile, context));
|
||||
}
|
||||
} finally {
|
||||
tempFile.delete();
|
||||
}
|
||||
@ -347,8 +362,9 @@ final class ExtractSafari extends Extract {
|
||||
File tempFile = createTemporaryFile(context, file);
|
||||
|
||||
try {
|
||||
postArtifacts(getDownloadArtifacts(dataSource, file, tempFile));
|
||||
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(getDownloadArtifacts(dataSource, file, tempFile));
|
||||
}
|
||||
} finally {
|
||||
if (tempFile != null) {
|
||||
tempFile.delete();
|
||||
@ -376,7 +392,9 @@ final class ExtractSafari extends Extract {
|
||||
try {
|
||||
tempFile = createTemporaryFile(context, file);
|
||||
|
||||
postArtifacts(getCookieArtifacts(file, tempFile, context));
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(getCookieArtifacts(file, tempFile, context));
|
||||
}
|
||||
|
||||
} finally {
|
||||
if (tempFile != null) {
|
||||
|
@ -386,10 +386,8 @@ final class ExtractSru extends Extract {
|
||||
logger.log(Level.SEVERE, "Error while trying to read into a sqlite db.", ex);//NON-NLS
|
||||
}
|
||||
|
||||
try {
|
||||
blackboard.postArtifacts(bba, MODULE_NAME);
|
||||
} catch (Blackboard.BlackboardException ex) {
|
||||
logger.log(Level.SEVERE, "Error Posting Artifact.", ex);//NON-NLS
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bba);
|
||||
}
|
||||
}
|
||||
|
||||
@ -445,11 +443,10 @@ final class ExtractSru extends Extract {
|
||||
logger.log(Level.SEVERE, "Error while trying to read into a sqlite db.", ex);//NON-NLS
|
||||
}
|
||||
|
||||
try {
|
||||
blackboard.postArtifacts(bba, MODULE_NAME);
|
||||
} catch (Blackboard.BlackboardException ex) {
|
||||
logger.log(Level.SEVERE, "Error Posting Artifact.", ex);//NON-NLS
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bba);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -272,6 +272,7 @@ class ExtractWebAccountType extends Extract {
|
||||
}
|
||||
|
||||
try {
|
||||
List<BlackboardArtifact> artifactList = new ArrayList<>();
|
||||
for (RoleKey key : roles.keySet()) {
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
@ -297,7 +298,11 @@ class ExtractWebAccountType extends Extract {
|
||||
NbBundle.getMessage(this.getClass(),
|
||||
"ExtractWebAccountType.parentModuleName"), role.getUrl()));
|
||||
|
||||
postArtifact(createArtifactWithAttributes(BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_ACCOUNT_TYPE, file, bbattributes));
|
||||
artifactList.add(createArtifactWithAttributes(BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_ACCOUNT_TYPE, file, bbattributes));
|
||||
}
|
||||
|
||||
if (!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(artifactList);
|
||||
}
|
||||
} catch (TskCoreException ex) {
|
||||
logger.log(Level.SEVERE, "Error creating web accounts", ex);
|
||||
|
@ -109,8 +109,10 @@ final class ExtractZoneIdentifier extends Extract {
|
||||
}
|
||||
}
|
||||
|
||||
postArtifacts(associatedObjectArtifacts);
|
||||
postArtifacts(downloadArtifacts);
|
||||
if (!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(associatedObjectArtifacts);
|
||||
postArtifacts(downloadArtifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -112,18 +112,38 @@ class Firefox extends Extract {
|
||||
progressBar.progress(Bundle.Progress_Message_Firefox_History());
|
||||
this.getHistory();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Firefox_Bookmarks());
|
||||
this.getBookmark();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Firefox_Downloads());
|
||||
this.getDownload();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Firefox_Cookies());
|
||||
this.getCookie();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Firefox_FormHistory());
|
||||
this.getFormsHistory();
|
||||
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
progressBar.progress(Bundle.Progress_Message_Firefox_AutoFill());
|
||||
this.getAutofillProfiles();
|
||||
}
|
||||
@ -225,7 +245,9 @@ class Firefox extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -319,7 +341,9 @@ class Firefox extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -346,6 +370,10 @@ class Firefox extends Extract {
|
||||
Collection<BlackboardArtifact> bbartifacts = new ArrayList<>();
|
||||
int j = 0;
|
||||
for (AbstractFile cookiesFile : cookiesFiles) {
|
||||
if (context.dataSourceIngestIsCancelled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (cookiesFile.getSize() == 0) {
|
||||
continue;
|
||||
}
|
||||
@ -429,7 +457,9 @@ class Firefox extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if (!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -576,7 +606,9 @@ class Firefox extends Extract {
|
||||
break;
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -714,7 +746,9 @@ class Firefox extends Extract {
|
||||
break;
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -832,7 +866,9 @@ class Firefox extends Extract {
|
||||
dbFile.delete();
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if(!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -48,9 +48,9 @@ public final class RAImageIngestModule implements DataSourceIngestModule {
|
||||
private static final Logger logger = Logger.getLogger(RAImageIngestModule.class.getName());
|
||||
private final List<Extract> extractors = new ArrayList<>();
|
||||
private final List<Extract> browserExtractors = new ArrayList<>();
|
||||
private IngestServices services = IngestServices.getInstance();
|
||||
private final IngestServices services = IngestServices.getInstance();
|
||||
private IngestJobContext context;
|
||||
private StringBuilder subCompleted = new StringBuilder();
|
||||
private final StringBuilder subCompleted = new StringBuilder();
|
||||
|
||||
RAImageIngestModule() {
|
||||
}
|
||||
|
@ -41,9 +41,12 @@ import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
|
||||
import org.sleuthkit.datamodel.BlackboardAttribute;
|
||||
import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
|
||||
import org.sleuthkit.datamodel.Content;
|
||||
import org.sleuthkit.datamodel.*;
|
||||
import org.sleuthkit.datamodel.TskCoreException;
|
||||
import org.sleuthkit.datamodel.AbstractFile;
|
||||
import org.sleuthkit.datamodel.ReadContentInputStream;
|
||||
import static org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE.TSK_ASSOCIATED_OBJECT;
|
||||
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ASSOCIATED_ARTIFACT;
|
||||
import org.sleuthkit.datamodel.TskData;
|
||||
|
||||
/**
|
||||
* Recent documents class that will extract recent documents in the form of .lnk
|
||||
@ -133,7 +136,9 @@ class RecentDocumentsByLnk extends Extract {
|
||||
}
|
||||
}
|
||||
|
||||
postArtifacts(bbartifacts);
|
||||
if (!context.dataSourceIngestIsCancelled()) {
|
||||
postArtifacts(bbartifacts);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
x
Reference in New Issue
Block a user