mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-14 08:56:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Save and load from a new disabled modules list in the ingest properties config file. Loaded modules which are missing from the config file will be auto-added as enabled.

Browse Source
This commit is contained in:
Samuel H. Kenyon 2014-01-06 21:48:30 -05:00
parent 97dff22d0b
commit aa32aa261a
2 changed files with 58 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
View File

@ -19,6 +19,7 @@
package org.sleuthkit.autopsy.ingest; package org.sleuthkit.autopsy.ingest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import javax.swing.JPanel; import javax.swing.JPanel;
import org.openide.util.lookup.ServiceProvider; import org.openide.util.lookup.ServiceProvider;
@ -29,6 +30,7 @@ import org.sleuthkit.datamodel.Content;
public class GeneralIngestConfigurator implements IngestConfigurator { public class GeneralIngestConfigurator implements IngestConfigurator {
public static final String ENABLED_INGEST_MODULES_KEY = "Enabled_Ingest_Modules"; public static final String ENABLED_INGEST_MODULES_KEY = "Enabled_Ingest_Modules";
public static final String DISABLED_INGEST_MODULES_KEY = "Disabled_Ingest_Modules";
public static final String PARSE_UNALLOC_SPACE_KEY = "Process_Unallocated_Space"; public static final String PARSE_UNALLOC_SPACE_KEY = "Process_Unallocated_Space";
private List<Content> contentToIngest; private List<Content> contentToIngest;
private IngestManager manager; private IngestManager manager;
@ -51,20 +53,53 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
private List<String> loadSettingsForContext() { private List<String> loadSettingsForContext() {
List<String> messages = new ArrayList<>(); List<String> messages = new ArrayList<>();
List<IngestModuleAbstract> allModules = IngestManager.getDefault().enumerateAllModules();
// If there is no enabled ingest modules setting for this user, default to enabling all // If there is no enabled ingest modules setting for this user, default to enabling all
// of the ingest modules the IngestManager has loaded. // of the ingest modules the IngestManager has loaded.
if (ModuleSettings.settingExists(moduleContext, ENABLED_INGEST_MODULES_KEY) == false) { if (ModuleSettings.settingExists(moduleContext, ENABLED_INGEST_MODULES_KEY) == false) {
String defaultSetting = moduleListToCsv(IngestManager.getDefault().enumerateAllModules()); String defaultSetting = moduleListToCsv(allModules);
ModuleSettings.setConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY, defaultSetting); ModuleSettings.setConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY, defaultSetting);
} }
String[] enabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY).split(", ");
ArrayList<String> enabledList = new ArrayList<>(Arrays.asList(enabledModuleNames));
// Check for modules that are missing from the config file
if (ModuleSettings.settingExists(moduleContext, DISABLED_INGEST_MODULES_KEY)) {
String[] disabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, DISABLED_INGEST_MODULES_KEY).split(", ");
for (IngestModuleAbstract module : allModules) {
boolean found = false;
// Check enabled first
for (String moduleName : enabledModuleNames) {
if (module.getName().equals(moduleName)) {
found = true;
break;
}
}
// Then check disabled
if (!found) {
for (String moduleName : disabledModuleNames) {
if (module.getName().equals(moduleName)) {
found = true;
break;
}
}
}
if (!found) {
enabledList.add(module.getName());
//it will get saved to file later
}
}
}
// Get the enabled ingest modules setting, check for missing modules, and pass the setting to // Get the enabled ingest modules setting, check for missing modules, and pass the setting to
// the UI component. // the UI component.
List<IngestModuleAbstract> allModules = IngestManager.getDefault().enumerateAllModules();
String[] enabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY).split(", ");
List<IngestModuleAbstract> enabledModules = new ArrayList<>(); List<IngestModuleAbstract> enabledModules = new ArrayList<>();
for (String moduleName : enabledModuleNames) { for (String moduleName : enabledList) {
if (moduleName.equals("Thunderbird Parser") if (moduleName.equals("Thunderbird Parser")
|| moduleName.equals("MBox Parser")) { || moduleName.equals("MBox Parser")) {
moduleName = "Email Parser"; moduleName = "Email Parser";
@ -112,6 +147,10 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
String enabledModulesCsvList = moduleListToCsv(ingestDialogPanel.getModulesToStart()); String enabledModulesCsvList = moduleListToCsv(ingestDialogPanel.getModulesToStart());
ModuleSettings.setConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY, enabledModulesCsvList); ModuleSettings.setConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY, enabledModulesCsvList);
// Save the user's configuration of the set of disabled ingest modules.
String disabledModulesCsvList = moduleListToCsv(ingestDialogPanel.getDisabledModules());
ModuleSettings.setConfigSetting(moduleContext, DISABLED_INGEST_MODULES_KEY, disabledModulesCsvList);
// Save the user's setting for the process unallocated space flag. // Save the user's setting for the process unallocated space flag.
String processUnalloc = Boolean.toString(ingestDialogPanel.processUnallocSpaceEnabled()); String processUnalloc = Boolean.toString(ingestDialogPanel.processUnallocSpaceEnabled());
ModuleSettings.setConfigSetting(moduleContext, PARSE_UNALLOC_SPACE_KEY, processUnalloc); ModuleSettings.setConfigSetting(moduleContext, PARSE_UNALLOC_SPACE_KEY, processUnalloc);

16
Core/src/org/sleuthkit/autopsy/ingest/IngestDialogPanel.java
View File

@ -60,7 +60,7 @@ public class IngestDialogPanel extends javax.swing.JPanel {
this.context = context; this.context = context;
} }
public IngestModuleAbstract getCurrentIngestModule() { public IngestModuleAbstract getCurrentIngestModule() {
return currentModule; return currentModule;
} }
@ -69,6 +69,10 @@ public class IngestDialogPanel extends javax.swing.JPanel {
return tableModel.getSelectedModules(); return tableModel.getSelectedModules();
} }
public List<IngestModuleAbstract> getDisabledModules() {
return tableModel.getUnSelectedModules();
}
public boolean processUnallocSpaceEnabled() { public boolean processUnallocSpaceEnabled() {
return processUnallocCheckbox.isSelected(); return processUnallocCheckbox.isSelected();
} }
@ -350,6 +354,16 @@ public class IngestDialogPanel extends javax.swing.JPanel {
return selectedModules; return selectedModules;
} }
public List<IngestModuleAbstract> getUnSelectedModules() {
List<IngestModuleAbstract> unselectedModules = new ArrayList<>();
for (Map.Entry<IngestModuleAbstract, Boolean> entry : moduleData) {
if (!entry.getValue().booleanValue()) {
unselectedModules.add(entry.getKey());
}
}
return unselectedModules;
}
/** /**
* Sets the given modules as selected in the modules table * Sets the given modules as selected in the modules table
* @param selectedModules * @param selectedModules