added missing postArtifact calls for Safari and moved call in chrome

This commit is contained in:
Kelly Kelly 2019-07-12 13:42:34 -04:00
parent 6693f1806e
commit a30b1b51f6
2 changed files with 7 additions and 27 deletions

View File

@ -364,8 +364,6 @@ class Chrome extends Extract {
RecentActivityExtracterModuleFactory.getModuleName(), domain));
bbart.addAttributes(bbattributes);
// index the artifact for keyword search
postArtifact(bbart);
bbartifacts.add(bbart);
} catch (TskCoreException ex) {
logger.log(Level.SEVERE, "Error while trying to insert Chrome bookmark artifact{0}", ex); //NON-NLS
@ -374,6 +372,7 @@ class Chrome extends Extract {
this.getName(), bookmarkFile.getName()));
}
}
postArtifact(bbartifacts);
dbFile.delete();
}
}

View File

@ -291,12 +291,7 @@ final class ExtractSafari extends Extract {
}
try {
Collection<BlackboardArtifact> bbartifacts = getHistoryArtifacts(historyFile, tempHistoryFile.toPath(), context);
if (!bbartifacts.isEmpty()) {
services.fireModuleDataEvent(new ModuleDataEvent(
RecentActivityExtracterModuleFactory.getModuleName(),
BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY, bbartifacts));
}
postArtifact(getHistoryArtifacts(historyFile, tempHistoryFile.toPath(), context));
} finally {
tempHistoryFile.delete();
}
@ -323,12 +318,7 @@ final class ExtractSafari extends Extract {
File tempFile = createTemporaryFile(context, file);
try {
Collection<BlackboardArtifact> bbartifacts = getBookmarkArtifacts(file, tempFile, context);
if (!bbartifacts.isEmpty()) {
services.fireModuleDataEvent(new ModuleDataEvent(
RecentActivityExtracterModuleFactory.getModuleName(),
BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK, bbartifacts));
}
postArtifact( getBookmarkArtifacts(file, tempFile, context));
} finally {
tempFile.delete();
}
@ -356,12 +346,8 @@ final class ExtractSafari extends Extract {
File tempFile = createTemporaryFile(context, file);
try {
Collection<BlackboardArtifact> bbartifacts = getDownloadArtifacts(dataSource, file, tempFile);
if (!bbartifacts.isEmpty()) {
services.fireModuleDataEvent(new ModuleDataEvent(
RecentActivityExtracterModuleFactory.getModuleName(),
BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_DOWNLOAD, bbartifacts));
}
postArtifacts(getDownloadArtifacts(dataSource, file, tempFile));
} finally {
if (tempFile != null) {
tempFile.delete();
@ -389,13 +375,8 @@ final class ExtractSafari extends Extract {
try {
tempFile = createTemporaryFile(context, file);
Collection<BlackboardArtifact> bbartifacts = getCookieArtifacts(file, tempFile, context);
if (!bbartifacts.isEmpty()) {
services.fireModuleDataEvent(new ModuleDataEvent(
RecentActivityExtracterModuleFactory.getModuleName(),
BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_COOKIE, bbartifacts));
}
postArtifacts(getCookieArtifacts(file, tempFile, context));
} finally {
if (tempFile != null) {
tempFile.delete();