From 34e14d65111d35d6f5edf9619c3e897d154b04ef Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Wed, 29 Jan 2020 10:07:13 -0500 Subject: [PATCH] Added DATA_SOURCE_USAGE artifact for DJI drone data sources --- .../recentactivity/Bundle.properties-MERGED | 5 ----- .../recentactivity/DataSourceUsageAnalyzer.java | 15 ++++++++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED index 3ec230d8ff..4535bf7685 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED @@ -3,10 +3,6 @@ cannotLoadSEUQA=Unable to load Search Engine URL Query Analyzer settings file, S cannotParseXml=Unable to parse XML file: ChromeCacheExtract_adding_extracted_files_msg=Adding %d extracted files for analysis. ChromeCacheExtractor.moduleName=ChromeCacheExtractor -# {0} - module name -# {1} - row number -# {2} - table length -# {3} - cache path ChromeCacheExtractor.progressMsg={0}: Extracting cache entry {1} of {2} entries from {3} DataSourceUsage_AndroidMedia=Android Media Card DataSourceUsage_DJU_Drone_DAT=DJI Internal SD Card @@ -190,7 +186,6 @@ RecentDocumentsByLnk.parentModuleName.noSpace=RecentActivity RecentDocumentsByLnk.parentModuleName=Recent Activity RegRipperFullNotFound=Full version RegRipper executable not found. RegRipperNotFound=Autopsy RegRipper executable not found. -# {0} - file name SearchEngineURLQueryAnalyzer.init.exception.msg=Unable to find {0}. SearchEngineURLQueryAnalyzer.moduleName.text=Search Engine SearchEngineURLQueryAnalyzer.engineName.none=NONE diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java index c5f09f1565..8fedade02a 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/DataSourceUsageAnalyzer.java @@ -214,15 +214,24 @@ class DataSourceUsageAnalyzer extends Extract { } } + + /** + * Checks to see if the data source might be a DJI internal drone storage + * card. If so, creates TSK_DATA_SOURCE_USAGE artifact. + * + * @return true if any specified files exist false if none exist + * + * @throws TskCoreException + */ @Messages({ "DataSourceUsage_DJU_Drone_DAT=DJI Internal SD Card" }) private void createDJIDroneDATArtitifacts() throws TskCoreException { - //fileList = fileManager.findFiles(dataSource, "FLY___.DAT"); //NON-NLS FileManager fileManager = currentCase.getServices().getFileManager(); - for(AbstractFile file : fileManager.findFiles(dataSource, "FLY___.DAT")) { + // The underscores are SQL wild cards. + List files = fileManager.findFiles(dataSource, "FLY___.DAT"); + if (files != null && files.size() > 0) { createDataSourceUsageArtifact(Bundle.DataSourceUsage_DJU_Drone_DAT()); - return; } } }