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

Renamed ingest job settings classes

Browse Source
This commit is contained in:
Richard Cordovano 2014-03-25 09:47:46 -04:00
parent 51cca21f3f
commit 7c2282e832
24 changed files with 78 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Core/src/org/sleuthkit/autopsy/ingest/IngestJobConfigurationPanel.java
View File

@ -58,7 +58,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
for (IngestModuleModel module : modules) { for (IngestModuleModel module : modules) {
IngestModuleTemplate moduleTemplate = module.getIngestModuleTemplate(); IngestModuleTemplate moduleTemplate = module.getIngestModuleTemplate();
if (module.hasModuleSettingsPanel()) { if (module.hasModuleSettingsPanel()) {
IngestModuleSettings settings = module.getModuleSettingsPanel().getSettings(); IngestModuleIngestJobSettings settings = module.getModuleSettingsPanel().getSettings();
moduleTemplate.setModuleSettings(settings); moduleTemplate.setModuleSettings(settings);
} }
moduleTemplates.add(moduleTemplate); moduleTemplates.add(moduleTemplate);
@ -295,7 +295,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
private final IngestModuleTemplate moduleTemplate; private final IngestModuleTemplate moduleTemplate;
private IngestModuleGlobalSetttingsPanel globalSettingsPanel = null; private IngestModuleGlobalSetttingsPanel globalSettingsPanel = null;
private IngestModuleSettingsPanel moduleSettingsPanel = null; private IngestModuleIngestJobSettingsPanel moduleSettingsPanel = null;
IngestModuleModel(IngestModuleTemplate moduleTemplate) { IngestModuleModel(IngestModuleTemplate moduleTemplate) {
this.moduleTemplate = moduleTemplate; this.moduleTemplate = moduleTemplate;
@ -331,7 +331,7 @@ class IngestJobConfigurationPanel extends javax.swing.JPanel {
return moduleTemplate.hasModuleSettingsPanel(); return moduleTemplate.hasModuleSettingsPanel();
} }
IngestModuleSettingsPanel getModuleSettingsPanel() { IngestModuleIngestJobSettingsPanel getModuleSettingsPanel() {
return moduleSettingsPanel; return moduleSettingsPanel;
} }

8
Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactory.java
View File

@ -117,7 +117,7 @@ public interface IngestModuleFactory {
* *
* @return The ingest options. * @return The ingest options.
*/ */
IngestModuleSettings getDefaultModuleSettings(); IngestModuleIngestJobSettings getDefaultModuleSettings();
/** /**
* Queries the factory to determine if it provides user interface panels to * Queries the factory to determine if it provides user interface panels to
@ -152,7 +152,7 @@ public interface IngestModuleFactory {
* @param ingestOptions Per ingest job options to initialize the panel. * @param ingestOptions Per ingest job options to initialize the panel.
* @return A user interface panel. * @return A user interface panel.
*/ */
IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings); IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings);
/** /**
* Queries the factory to determine if it is capable of creating file ingest * Queries the factory to determine if it is capable of creating file ingest
@ -182,7 +182,7 @@ public interface IngestModuleFactory {
* @param ingestOptions The ingest options for the module instance. * @param ingestOptions The ingest options for the module instance.
* @return A data source ingest module instance. * @return A data source ingest module instance.
*/ */
DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings settings); DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings settings);
/** /**
* Queries the factory to determine if it is capable of creating file ingest * Queries the factory to determine if it is capable of creating file ingest
@ -212,5 +212,5 @@ public interface IngestModuleFactory {
* @param ingestOptions The ingest options for the module instance. * @param ingestOptions The ingest options for the module instance.
* @return A file ingest module instance. * @return A file ingest module instance.
*/ */
FileIngestModule createFileIngestModule(IngestModuleSettings settings); FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings);
} }

8
Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryAdapter.java
View File

@ -44,7 +44,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory
} }
@Override @Override
public IngestModuleSettings getDefaultModuleSettings() { public IngestModuleIngestJobSettings getDefaultModuleSettings() {
return new NoIngestModuleSettings(); return new NoIngestModuleSettings();
} }
@ -54,7 +54,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory
} }
@Override @Override
public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings ingestOptions) { public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings ingestOptions) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -64,7 +64,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory
} }
@Override @Override
public DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings ingestOptions) { public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestOptions) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -74,7 +74,7 @@ public abstract class IngestModuleFactoryAdapter implements IngestModuleFactory
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }

8
Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettings.java → Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettings.java
View File

@ -21,9 +21,9 @@ package org.sleuthkit.autopsy.ingest;
import java.io.Serializable; import java.io.Serializable;
/** /**
* Interface for per ingest job options for ingest modules. Options are * Interface for per ingest job settings for ingest modules. The settings are
* serializable to support persistence of options between invocations of the * serializable to support persistence of settings for different contexts and
* application. * between invocations of the application.
*/ */
public interface IngestModuleSettings extends Serializable { public interface IngestModuleIngestJobSettings extends Serializable {
} }

7
Core/src/org/sleuthkit/autopsy/ingest/IngestModuleSettingsPanel.java → Core/src/org/sleuthkit/autopsy/ingest/IngestModuleIngestJobSettingsPanel.java
View File

@ -21,14 +21,15 @@ package org.sleuthkit.autopsy.ingest;
import javax.swing.JPanel; import javax.swing.JPanel;
/** /**
* Abstract base class for ingest module job settings panels. * Abstract base class for panels that allow users to specify per ingest job
* settings for ingest modules.
*/ */
public abstract class IngestModuleSettingsPanel extends JPanel { public abstract class IngestModuleIngestJobSettingsPanel extends JPanel {
/** /**
* Gets the ingest job settings for an ingest module. * Gets the ingest job settings for an ingest module.
* *
* @return The ingest settings. * @return The ingest settings.
*/ */
public abstract IngestModuleSettings getSettings(); public abstract IngestModuleIngestJobSettings getSettings();
} }

10
Core/src/org/sleuthkit/autopsy/ingest/IngestModuleTemplate.java
View File

@ -25,10 +25,10 @@ package org.sleuthkit.autopsy.ingest;
final class IngestModuleTemplate { final class IngestModuleTemplate {
private final IngestModuleFactory moduleFactory; private final IngestModuleFactory moduleFactory;
private IngestModuleSettings settings = null; private IngestModuleIngestJobSettings settings = null;
private boolean enabled = true; private boolean enabled = true;
IngestModuleTemplate(IngestModuleFactory moduleFactory, IngestModuleSettings settings) { IngestModuleTemplate(IngestModuleFactory moduleFactory, IngestModuleIngestJobSettings settings) {
this.moduleFactory = moduleFactory; this.moduleFactory = moduleFactory;
this.settings = settings; this.settings = settings;
} }
@ -41,11 +41,11 @@ final class IngestModuleTemplate {
return moduleFactory.getModuleDescription(); return moduleFactory.getModuleDescription();
} }
IngestModuleSettings getModuleSettings() { IngestModuleIngestJobSettings getModuleSettings() {
return settings; return settings;
} }
void setModuleSettings(IngestModuleSettings settings) { void setModuleSettings(IngestModuleIngestJobSettings settings) {
this.settings = settings; this.settings = settings;
} }
@ -53,7 +53,7 @@ final class IngestModuleTemplate {
return moduleFactory.hasModuleSettingsPanel(); return moduleFactory.hasModuleSettingsPanel();
} }
IngestModuleSettingsPanel getModuleSettingsPanel() { IngestModuleIngestJobSettingsPanel getModuleSettingsPanel() {
return moduleFactory.getModuleSettingsPanel(settings); return moduleFactory.getModuleSettingsPanel(settings);
} }

2
Core/src/org/sleuthkit/autopsy/ingest/NoIngestModuleSettings.java
View File

@ -22,7 +22,7 @@ package org.sleuthkit.autopsy.ingest;
* Implementation of the IngestModuleOptions interface for use by ingest modules * Implementation of the IngestModuleOptions interface for use by ingest modules
* that do not have per ingest job options. * that do not have per ingest job options.
*/ */
public final class NoIngestModuleSettings implements IngestModuleSettings { public final class NoIngestModuleSettings implements IngestModuleIngestJobSettings {
private final String setting = "None"; private final String setting = "None";

4
ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserModuleFactory.java
View File

@ -23,7 +23,7 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
/** /**
@ -60,7 +60,7 @@ public class ExifParserModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) {
return new ExifParserFileIngestModule(); return new ExifParserFileIngestModule();
} }
} }

10
FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleFactory.java
View File

@ -24,8 +24,8 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
/** /**
@ -57,7 +57,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda
} }
@Override @Override
public IngestModuleSettings getDefaultModuleSettings() { public IngestModuleIngestJobSettings getDefaultModuleSettings() {
return new FileExtMismatchDetectorModuleSettings(); return new FileExtMismatchDetectorModuleSettings();
} }
@ -67,7 +67,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda
} }
@Override @Override
public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings) { public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings) {
assert settings instanceof FileExtMismatchDetectorModuleSettings; assert settings instanceof FileExtMismatchDetectorModuleSettings;
if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) { if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) {
throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings"); throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings");
@ -94,7 +94,7 @@ public class FileExtMismatchDetectorModuleFactory extends IngestModuleFactoryAda
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
assert settings instanceof FileExtMismatchDetectorModuleSettings; assert settings instanceof FileExtMismatchDetectorModuleSettings;
if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) { if (!(settings instanceof FileExtMismatchDetectorModuleSettings)) {
throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings"); throw new IllegalArgumentException("Expected settings argument to be instanceof FileExtMismatchDetectorModuleSettings");

4
FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchDetectorModuleSettings.java
View File

@ -18,12 +18,12 @@
*/ */
package org.sleuthkit.autopsy.fileextmismatch; package org.sleuthkit.autopsy.fileextmismatch;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* Ingest options for the file extension mismatch detector ingest module. * Ingest options for the file extension mismatch detector ingest module.
*/ */
final class FileExtMismatchDetectorModuleSettings implements IngestModuleSettings { final class FileExtMismatchDetectorModuleSettings implements IngestModuleIngestJobSettings {
private boolean skipKnownFiles = false; private boolean skipKnownFiles = false;
private boolean skipFilesWithNoExtension = true; private boolean skipFilesWithNoExtension = true;

8
FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchModuleSettingsPanel.java
View File

@ -18,14 +18,14 @@
*/ */
package org.sleuthkit.autopsy.fileextmismatch; package org.sleuthkit.autopsy.fileextmismatch;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
/** /**
* UI component used to set ingest job options for file extension mismatch * UI component used to set ingest job options for file extension mismatch
* detector ingest modules. * detector ingest modules.
*/ */
final class FileExtMismatchModuleSettingsPanel extends IngestModuleSettingsPanel { final class FileExtMismatchModuleSettingsPanel extends IngestModuleIngestJobSettingsPanel {
private final FileExtMismatchDetectorModuleSettings settings; private final FileExtMismatchDetectorModuleSettings settings;
@ -42,7 +42,7 @@ final class FileExtMismatchModuleSettingsPanel extends IngestModuleSettingsPanel
} }
@Override @Override
public IngestModuleSettings getSettings() { public IngestModuleIngestJobSettings getSettings() {
return settings; return settings;
} }

10
FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleFactory.java
View File

@ -24,8 +24,8 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
/** /**
* An factory that creates file ingest modules that determine the types of * An factory that creates file ingest modules that determine the types of
@ -56,7 +56,7 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public IngestModuleSettings getDefaultModuleSettings() { public IngestModuleIngestJobSettings getDefaultModuleSettings() {
return new FileTypeIdModuleSettings(); return new FileTypeIdModuleSettings();
} }
@ -66,7 +66,7 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings) { public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings) {
assert settings instanceof FileTypeIdModuleSettings; assert settings instanceof FileTypeIdModuleSettings;
if (!(settings instanceof FileTypeIdModuleSettings)) { if (!(settings instanceof FileTypeIdModuleSettings)) {
throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings"); throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings");
@ -80,7 +80,7 @@ public class FileTypeIdModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
assert settings instanceof FileTypeIdModuleSettings; assert settings instanceof FileTypeIdModuleSettings;
if (!(settings instanceof FileTypeIdModuleSettings)) { if (!(settings instanceof FileTypeIdModuleSettings)) {
throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings"); throw new IllegalArgumentException("Expected settings argument to be instanceof FileTypeIdModuleSettings");

4
FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettings.java
View File

@ -18,12 +18,12 @@
*/ */
package org.sleuthkit.autopsy.filetypeid; package org.sleuthkit.autopsy.filetypeid;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* Ingest job options for the file type identifier ingest module instances. * Ingest job options for the file type identifier ingest module instances.
*/ */
public class FileTypeIdModuleSettings implements IngestModuleSettings { public class FileTypeIdModuleSettings implements IngestModuleIngestJobSettings {
private boolean skipKnownFiles = true; private boolean skipKnownFiles = true;

8
FileTypeId/src/org/sleuthkit/autopsy/filetypeid/FileTypeIdModuleSettingsPanel.java
View File

@ -18,14 +18,14 @@
*/ */
package org.sleuthkit.autopsy.filetypeid; package org.sleuthkit.autopsy.filetypeid;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
/** /**
* UI component used to set ingest job options for file type identifier ingest * UI component used to set ingest job options for file type identifier ingest
* modules. * modules.
*/ */
final class FileTypeIdModuleSettingsPanel extends IngestModuleSettingsPanel { final class FileTypeIdModuleSettingsPanel extends IngestModuleIngestJobSettingsPanel {
private final FileTypeIdModuleSettings settings; private final FileTypeIdModuleSettings settings;
@ -40,7 +40,7 @@ final class FileTypeIdModuleSettingsPanel extends IngestModuleSettingsPanel {
} }
@Override @Override
public IngestModuleSettings getSettings() { public IngestModuleIngestJobSettings getSettings() {
return settings; return settings;
} }

10
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleFactory.java
View File

@ -26,8 +26,8 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
/** /**
@ -58,7 +58,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public IngestModuleSettings getDefaultModuleSettings() { public IngestModuleIngestJobSettings getDefaultModuleSettings() {
HashDbManager hashDbManager = HashDbManager.getInstance(); HashDbManager hashDbManager = HashDbManager.getInstance();
List<String> enabledHashSets = new ArrayList<>(); List<String> enabledHashSets = new ArrayList<>();
List<HashDbManager.HashDb> knownFileHashSets = hashDbManager.getKnownFileHashSets(); List<HashDbManager.HashDb> knownFileHashSets = hashDbManager.getKnownFileHashSets();
@ -82,7 +82,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings settings) { public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings settings) {
if (moduleSettingsPanel == null) { if (moduleSettingsPanel == null) {
moduleSettingsPanel = new HashLookupModuleSettingsPanel(); moduleSettingsPanel = new HashLookupModuleSettingsPanel();
} }
@ -108,7 +108,7 @@ public class HashLookupModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
assert settings instanceof HashLookupModuleSettings; assert settings instanceof HashLookupModuleSettings;
if (!(settings instanceof HashLookupModuleSettings)) { if (!(settings instanceof HashLookupModuleSettings)) {
throw new IllegalArgumentException("Expected settings argument to be instanceof HashLookupModuleSettings"); throw new IllegalArgumentException("Expected settings argument to be instanceof HashLookupModuleSettings");

4
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettings.java
View File

@ -20,12 +20,12 @@ package org.sleuthkit.autopsy.hashdatabase;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* Settings for a hash lookup file ingest module instance. * Settings for a hash lookup file ingest module instance.
*/ */
final class HashLookupModuleSettings implements IngestModuleSettings { final class HashLookupModuleSettings implements IngestModuleIngestJobSettings {
private final HashSet<String> enabledHashSets = new HashSet<>(); private final HashSet<String> enabledHashSets = new HashSet<>();
private boolean shouldCalculateHashes = true; private boolean shouldCalculateHashes = true;

8
HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashLookupModuleSettingsPanel.java
View File

@ -33,14 +33,14 @@ import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.ingest.IngestManager; import org.sleuthkit.autopsy.ingest.IngestManager;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb; import org.sleuthkit.autopsy.hashdatabase.HashDbManager.HashDb;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
/** /**
* Instances of this class provide a simplified UI for managing the hash sets * Instances of this class provide a simplified UI for managing the hash sets
* configuration. * configuration.
*/ */
public class HashLookupModuleSettingsPanel extends IngestModuleSettingsPanel implements PropertyChangeListener { public class HashLookupModuleSettingsPanel extends IngestModuleIngestJobSettingsPanel implements PropertyChangeListener {
private final HashDbManager hashDbManager = HashDbManager.getInstance(); private final HashDbManager hashDbManager = HashDbManager.getInstance();
private HashDatabasesTableModel knownTableModel; private HashDatabasesTableModel knownTableModel;
@ -88,7 +88,7 @@ public class HashLookupModuleSettingsPanel extends IngestModuleSettingsPanel imp
} }
@Override @Override
public IngestModuleSettings getSettings() { public IngestModuleIngestJobSettings getSettings() {
List<String> enabledHashSets = new ArrayList<>(); List<String> enabledHashSets = new ArrayList<>();
List<HashDbManager.HashDb> knownFileHashSets = hashDbManager.getKnownFileHashSets(); List<HashDbManager.HashDb> knownFileHashSets = hashDbManager.getKnownFileHashSets();
for (HashDb db : knownFileHashSets) { for (HashDb db : knownFileHashSets) {

8
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestSimplePanel.java
View File

@ -27,14 +27,14 @@ import javax.swing.ListSelectionModel;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableColumn; import javax.swing.table.TableColumn;
import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
import org.sleuthkit.autopsy.ingest.NoIngestModuleSettings; import org.sleuthkit.autopsy.ingest.NoIngestModuleSettings;
/** /**
* Ingest job options panel for the keyword search file ingest module. * Ingest job options panel for the keyword search file ingest module.
*/ */
public class KeywordSearchIngestSimplePanel extends IngestModuleSettingsPanel { public class KeywordSearchIngestSimplePanel extends IngestModuleIngestJobSettingsPanel {
private final static Logger logger = Logger.getLogger(KeywordSearchIngestSimplePanel.class.getName()); private final static Logger logger = Logger.getLogger(KeywordSearchIngestSimplePanel.class.getName());
public static final String PROP_OPTIONS = "Keyword Search_Options"; public static final String PROP_OPTIONS = "Keyword Search_Options";
@ -72,7 +72,7 @@ public class KeywordSearchIngestSimplePanel extends IngestModuleSettingsPanel {
} }
@Override @Override
public IngestModuleSettings getSettings() { public IngestModuleIngestJobSettings getSettings() {
return new NoIngestModuleSettings(); return new NoIngestModuleSettings();
} }

8
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchModuleFactory.java
View File

@ -25,8 +25,8 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.sleuthkit.autopsy.ingest.IngestModuleSettingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettingsPanel;
import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel; import org.sleuthkit.autopsy.ingest.IngestModuleGlobalSetttingsPanel;
/** /**
@ -60,7 +60,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public IngestModuleSettingsPanel getModuleSettingsPanel(IngestModuleSettings ingestJobOptions) { public IngestModuleIngestJobSettingsPanel getModuleSettingsPanel(IngestModuleIngestJobSettings ingestJobOptions) {
KeywordSearchIngestSimplePanel ingestOptionsPanel = new KeywordSearchIngestSimplePanel(); KeywordSearchIngestSimplePanel ingestOptionsPanel = new KeywordSearchIngestSimplePanel();
ingestOptionsPanel.load(); ingestOptionsPanel.load();
return ingestOptionsPanel; return ingestOptionsPanel;
@ -84,7 +84,7 @@ public class KeywordSearchModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings ingestJobOptions) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestJobOptions) {
return new KeywordSearchIngestModule(); return new KeywordSearchIngestModule();
} }
} }

4
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RecentActivityExtracterModuleFactory.java
View File

@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; import org.sleuthkit.autopsy.ingest.DataSourceIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* A factory that creates data source ingest modules that extract recent * A factory that creates data source ingest modules that extract recent
@ -58,7 +58,7 @@ public class RecentActivityExtracterModuleFactory extends IngestModuleFactoryAda
} }
@Override @Override
public DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings ingestJobOptions) { public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestJobOptions) {
return new RAImageIngestModule(); return new RAImageIngestModule();
} }
} }

4
ScalpelCarver/src/org/sleuthkit/autopsy/scalpel/ScalpelCarverModuleFactory.java
View File

@ -24,7 +24,7 @@ package org.sleuthkit.autopsy.scalpel;
import org.sleuthkit.autopsy.coreutils.Version; import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
import org.openide.util.NbBundle; import org.openide.util.NbBundle;
/** /**
@ -60,7 +60,7 @@ public class ScalpelCarverModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) {
return new ScalpelCarverIngestModule(); return new ScalpelCarverIngestModule();
} }
} }

4
SevenZip/src/org/sleuthkit/autopsy/sevenzip/ArchiveFileExtractorModuleFactory.java
View File

@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* A factory for creating archive extractor file ingest modules and the user * A factory for creating archive extractor file ingest modules and the user
@ -59,7 +59,7 @@ public class ArchiveFileExtractorModuleFactory extends IngestModuleFactoryAdapte
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings ingestOptions) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) {
return new SevenZipIngestModule(); return new SevenZipIngestModule();
} }
} }

4
ewfVerify/src/org/sleuthkit/autopsy/ewfverify/EwfVerifierModuleFactory.java
View File

@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.DataSourceIngestModule; import org.sleuthkit.autopsy.ingest.DataSourceIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* An factory that creates data source ingest modules that verify the integrity * An factory that creates data source ingest modules that verify the integrity
@ -60,7 +60,7 @@ public class EwfVerifierModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public DataSourceIngestModule createDataSourceIngestModule(IngestModuleSettings ingestOptions) { public DataSourceIngestModule createDataSourceIngestModule(IngestModuleIngestJobSettings ingestOptions) {
return new EwfVerifyIngestModule(); return new EwfVerifyIngestModule();
} }
} }

4
thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/EmailParserModuleFactory.java
View File

@ -24,7 +24,7 @@ import org.sleuthkit.autopsy.coreutils.Version;
import org.sleuthkit.autopsy.ingest.FileIngestModule; import org.sleuthkit.autopsy.ingest.FileIngestModule;
import org.sleuthkit.autopsy.ingest.IngestModuleFactory; import org.sleuthkit.autopsy.ingest.IngestModuleFactory;
import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter; import org.sleuthkit.autopsy.ingest.IngestModuleFactoryAdapter;
import org.sleuthkit.autopsy.ingest.IngestModuleSettings; import org.sleuthkit.autopsy.ingest.IngestModuleIngestJobSettings;
/** /**
* A factory for creating email parser file ingest module instances. * A factory for creating email parser file ingest module instances.
@ -63,7 +63,7 @@ public class EmailParserModuleFactory extends IngestModuleFactoryAdapter {
} }
@Override @Override
public FileIngestModule createFileIngestModule(IngestModuleSettings settings) { public FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
return new ThunderbirdMboxFileIngestModule(); return new ThunderbirdMboxFileIngestModule();
} }
} }