diff --git a/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED index 9905159d99..5971ab0d82 100755 --- a/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED +++ b/Core/src/org/sleuthkit/autopsy/modules/exif/Bundle.properties-MERGED @@ -1,5 +1,5 @@ CannotRunFileTypeDetection=Cannot run file type detection. -ExifParserFileIngestModule.indexError.message=Failed to index EXIF Metadata artifact for keyword search. +ExifParserFileIngestModule.indexError.message=Failed to post EXIF Metadata artifact(s). OpenIDE-Module-Display-Category=Ingest Module OpenIDE-Module-Long-Description=\ Exif metadata ingest module. \n\n\ diff --git a/Core/src/org/sleuthkit/autopsy/timeline/images/artifact-icon.png b/Core/src/org/sleuthkit/autopsy/timeline/images/artifact-icon.png new file mode 100755 index 0000000000..5b0c461f5c Binary files /dev/null and b/Core/src/org/sleuthkit/autopsy/timeline/images/artifact-icon.png differ diff --git a/Core/src/org/sleuthkit/autopsy/timeline/ui/EventTypeUtils.java b/Core/src/org/sleuthkit/autopsy/timeline/ui/EventTypeUtils.java index 72e2752501..a973ba33d9 100755 --- a/Core/src/org/sleuthkit/autopsy/timeline/ui/EventTypeUtils.java +++ b/Core/src/org/sleuthkit/autopsy/timeline/ui/EventTypeUtils.java @@ -91,7 +91,11 @@ final public class EventTypeUtils { imageFileName = "raw_access_logs.png"; } else if (typeID == TimelineEventType.USER_CREATED.getTypeID()) { imageFileName = "hand_point.png"; - } else { + } else if (typeID == EventType.WEB_FORM_AUTOFILL.getTypeID()) { + imageFileName = "artifact-icon.png"; + } else if (typeID == EventType.WEB_FORM_ADDRESSES.getTypeID()) { + imageFileName = "artifact-icon.png"; + }else { imageFileName = "timeline_marker.png"; } diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED index 6137de4747..5e11018086 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED @@ -1,7 +1,6 @@ cannotBuildXmlParser=Unable to build XML parser: cannotLoadSEUQA=Unable to load Search Engine URL Query Analyzer settings file, SEUQAMappings.xml: cannotParseXml=Unable to parse XML file: -Chrome.getBookmark.errMsg.errAnalyzeFile={0}: Error while trying to analyze file: {1} ChromeCacheExtractor.moduleName=ChromeCacheExtractor # {0} - module name # {1} - row number @@ -65,7 +64,7 @@ ExtractZone_progress_Msg=Extracting :Zone.Identifer files ExtractZone_Restricted=Restricted Sites Zone ExtractZone_Trusted=Trusted Sites Zone OpenIDE-Module-Display-Category=Ingest Module -OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\nThe module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy. +OpenIDE-Module-Long-Description=Recent Activity ingest module.\n\n\The module extracts useful information about the recent user activity on the disk image being ingested, such as:\n\n- Recently open documents,\n- Web activity (sites visited, stored cookies, book marked sites, search engine queries, file downloads),\n- Recently attached devices,\n- Installed programs.\n\nThe module currently supports Windows only disk images.\nThe plugin is also fully functional when deployed on Windows version of Autopsy. OpenIDE-Module-Name=RecentActivity OpenIDE-Module-Short-Description=Recent Activity finder ingest module Chrome.moduleName=Chrome diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java index 64cef67fd2..f75132c610 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java @@ -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())); } } + postArtifacts(bbartifacts); dbFile.delete(); } } diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java index d2e866404f..63ac3b6ee6 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java @@ -818,12 +818,9 @@ class ExtractRegistry extends Extract { break; } } // for - if (!usbBBartifacts.isEmpty()) { - IngestServices.getInstance().fireModuleDataEvent(new ModuleDataEvent(moduleName, BlackboardArtifact.ARTIFACT_TYPE.TSK_DEVICE_ATTACHED, usbBBartifacts)); - } - if (!wifiBBartifacts.isEmpty()) { - IngestServices.getInstance().fireModuleDataEvent(new ModuleDataEvent(moduleName, BlackboardArtifact.ARTIFACT_TYPE.TSK_WIFI_NETWORK, wifiBBartifacts)); - } + + postArtifacts(usbBBartifacts); + postArtifacts(wifiBBartifacts); return true; } catch (FileNotFoundException ex) { logger.log(Level.SEVERE, "Error finding the registry file.", ex); //NON-NLS diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractSafari.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractSafari.java index 164bbe1391..704826047f 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractSafari.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractSafari.java @@ -291,12 +291,7 @@ final class ExtractSafari extends Extract { } try { - Collection bbartifacts = getHistoryArtifacts(historyFile, tempHistoryFile.toPath(), context); - if (!bbartifacts.isEmpty()) { - services.fireModuleDataEvent(new ModuleDataEvent( - RecentActivityExtracterModuleFactory.getModuleName(), - BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_HISTORY, bbartifacts)); - } + postArtifacts(getHistoryArtifacts(historyFile, tempHistoryFile.toPath(), context)); } finally { tempHistoryFile.delete(); } @@ -323,12 +318,7 @@ final class ExtractSafari extends Extract { File tempFile = createTemporaryFile(context, file); try { - Collection bbartifacts = getBookmarkArtifacts(file, tempFile, context); - if (!bbartifacts.isEmpty()) { - services.fireModuleDataEvent(new ModuleDataEvent( - RecentActivityExtracterModuleFactory.getModuleName(), - BlackboardArtifact.ARTIFACT_TYPE.TSK_WEB_BOOKMARK, bbartifacts)); - } + postArtifacts(getBookmarkArtifacts(file, tempFile, context)); } finally { tempFile.delete(); } @@ -356,12 +346,8 @@ final class ExtractSafari extends Extract { File tempFile = createTemporaryFile(context, file); try { - Collection 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 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();