Codacy

Codacy

Core/src/org/sleuthkit/autopsy/modules/ileappanalyzer/ILeappAnalyzerIngestModule.java

@@ -27,9 +27,7 @@ import java.nio.file.Paths;
 import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -70,7 +68,7 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
     private ILeappFileProcessor iLeappFileProcessor;
 
     ILeappAnalyzerIngestModule() {
-
+        // This constructor is intentionally empty. Nothing special is needed here.     
     }
 
     @NbBundle.Messages({
@@ -88,7 +86,7 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
         try {
             iLeappFileProcessor = new ILeappFileProcessor();
         } catch (IOException | IngestModuleException ex) {
-            throw new IngestModuleException(Bundle.ILeappAnalyzerIngestModule_error_ileapp_file_processor_init());
+            throw new IngestModuleException(Bundle.ILeappAnalyzerIngestModule_error_ileapp_file_processor_init(), ex);
         }
 
         try {
@@ -143,16 +141,15 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
                         logger.log(Level.SEVERE, String.format("Error running iLeapp, error code returned %d", result)); //NON-NLS
                         return ProcessResult.ERROR;
                     }
-                    String reportFileName = findReportFile(moduleOutputPath);
+                    
-                    if (reportFileName.length() > 2) {
+                    addILeappReportToReports(moduleOutputPath, currentCase);
-                        currentCase.addReport(reportFileName, MODULE_NAME, Bundle.ILeappAnalyzerIngestModule_report_name());
+//                    String reportFileName = findReportFile(moduleOutputPath);
-                    }
+//                    if (reportFileName.length() > 2) {
+//                        currentCase.addReport(reportFileName, MODULE_NAME, Bundle.ILeappAnalyzerIngestModule_report_name());
+//                    }
                 } catch (IOException ex) {
                     logger.log(Level.SEVERE, String.format("Error when trying to execute iLeapp program against file %s", iLeappFile.getLocalAbsPath()), ex);
                     return ProcessResult.ERROR;
-                } catch (TskCoreException ex) {
-                    // Error trying to add report, continue on 
-                    logger.log(Level.WARNING, String.format("Error when trying to add report in ModuleOuput %s", moduleOutputPath.toString()), ex);
                 }
 
                 if (context.dataSourceIngestIsCancelled()) {
@@ -245,10 +242,9 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
     }
 
     /**
-     * Find the tsv files in the iLeapp output directory and match them to files
+     * Find the index.html file in the iLeapp output directory so it can be added to reports
-     * we know we want to process and return the list to process those files.
      */
-    private String findReportFile(Path iLeappOutputDir) {
+    private void addILeappReportToReports(Path iLeappOutputDir, Case currentCase) {
         List<String> allIndexFiles = new ArrayList<>();
 
         try (Stream<Path> walk = Files.walk(iLeappOutputDir)) {
@@ -256,15 +252,15 @@ public class ILeappAnalyzerIngestModule implements DataSourceIngestModule {
             allIndexFiles = walk.map(x -> x.toString())
                     .filter(f -> f.toLowerCase().endsWith("index.html")).collect(Collectors.toList());
 
-            return allIndexFiles.get(0);
+            if (allIndexFiles.get(0).length() > 2) {
+                currentCase.addReport(allIndexFiles.get(0), MODULE_NAME, Bundle.ILeappAnalyzerIngestModule_report_name());
+            }
 
-        } catch (IOException ex) {
+        } catch (IOException | TskCoreException ex) {
             // catch the error and continue on
             logger.log(Level.WARNING, String.format("Error finding index file in path %s", iLeappOutputDir.toString()), ex);
         }
 
-        return "";
-
     }
 
 }

Experimental/src/org/sleuthkit/autopsy/experimental/autoingest/Bundle.properties-MERGED

@@ -205,9 +205,7 @@ DeleteCaseTask.progress.parsingManifest=Parsing manifest file {0}...
 DeleteCaseTask.progress.releasingManifestLock=Releasing lock on the manifest file {0}...
 DeleteCaseTask.progress.startMessage=Starting deletion...
 DeleteOrphanCaseNodesAction.progressDisplayName=Cleanup Case Znodes
-# {0} - item count
 DeleteOrphanCaseNodesDialog.additionalInit.lblNodeCount.text=Znodes found: {0}
-# {0} - item count
 DeleteOrphanCaseNodesDialog.additionalInit.znodesTextArea.countMessage=ZNODES FOUND: {0}
 DeleteOrphanCaseNodesTask.progress.connectingToCoordSvc=Connecting to the coordination service
 # {0} - node path

KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Bundle.properties-MERGED

@@ -36,7 +36,7 @@ KeywordSearchResultFactory.createNodeForKey.noResultsFound.text=No results found
 KeywordSearchResultFactory.query.exception.msg=Could not perform the query 
 OpenIDE-Module-Display-Category=Ingest Module
 
-OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\n\The module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
+OpenIDE-Module-Long-Description=Keyword Search ingest module.\n\nThe module indexes files found in the disk image at ingest time.\nIt then periodically runs the search on the indexed files using one or more keyword lists (containing pure words and/or regular expressions) and posts results.\n\nThe module also contains additional tools integrated in the main GUI, such as keyword list configuration, keyword search bar in the top-right corner, extracted text viewer and search results viewer showing highlighted keywords found.
 OpenIDE-Module-Name=KeywordSearch
 OptionsCategory_Name_KeywordSearchOptions=Keyword Search
 OptionsCategory_Keywords_KeywordSearchOptions=Keyword Search

RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED

@@ -5,10 +5,15 @@ ChromeCacheExtract_adding_artifacts_msg=Chrome Cache: Adding %d artifacts for an
 ChromeCacheExtract_adding_extracted_files_msg=Chrome Cache: Adding %d extracted files for analysis.
 ChromeCacheExtract_loading_files_msg=Chrome Cache: Loading files from %s.
 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
 DataSourceUsage_FlashDrive=Flash Drive
+# {0} - OS name
 DataSourceUsageAnalyzer.customVolume.label=OS Drive ({0})
 DataSourceUsageAnalyzer.parentModuleName=Recent Activity
 Extract.indexError.message=Failed to index artifact for keyword search.
@@ -211,6 +216,7 @@ Recently_Used_Artifacts_Winrar=Recently opened according to WinRAR MRU
 Registry_System_Bam=Recently Executed according to Background Activity Moderator (BAM)
 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

branding/core/core.jar/org/netbeans/core/startup/Bundle.properties

@@ -1,5 +1,5 @@
 #Updated by build script
-#Wed, 08 Jul 2020 15:15:46 -0400
+#Wed, 09 Sep 2020 10:39:20 -0400
 LBL_splash_window_title=Starting Autopsy
 SPLASH_HEIGHT=314
 SPLASH_WIDTH=538

branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties

@@ -1,4 +1,4 @@
 #Updated by build script
-#Wed, 08 Jul 2020 15:15:46 -0400
+#Wed, 09 Sep 2020 10:39:20 -0400
 CTL_MainWindow_Title=Autopsy 4.16.0
 CTL_MainWindow_Title_No_Project=Autopsy 4.16.0