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

7959 comment out data artifacts ingest pipeline

Browse Source
This commit is contained in:
Richard Cordovano 2021-09-08 16:15:50 -04:00
parent 2621d15bb6
commit b8598d0b14
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Core/src/org/sleuthkit/autopsy/centralrepository/ingestmodule/CentralRepoIngestModuleFactory.java
View File

@ -121,14 +121,14 @@ public class CentralRepoIngestModuleFactory extends IngestModuleFactoryAdapter {
throw new IllegalArgumentException("Expected settings argument to be an instance of IngestSettings"); throw new IllegalArgumentException("Expected settings argument to be an instance of IngestSettings");
} }
@Override // @Override
public boolean isDataArtifactIngestModuleFactory() { // public boolean isDataArtifactIngestModuleFactory() {
return true; // return true;
} // }
//
@Override // @Override
public DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) { // public DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) {
return new CentralRepoDataArtifactIngestModule(); // return new CentralRepoDataArtifactIngestModule();
} // }
} }

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

@ -44,10 +44,10 @@ final class DataArtifactIngestPipeline extends IngestTaskPipeline<DataArtifactIn
@Override @Override
Optional<PipelineModule<DataArtifactIngestTask>> acceptModuleTemplate(IngestModuleTemplate template) { Optional<PipelineModule<DataArtifactIngestTask>> acceptModuleTemplate(IngestModuleTemplate template) {
Optional<IngestTaskPipeline.PipelineModule<DataArtifactIngestTask>> module = Optional.empty(); Optional<IngestTaskPipeline.PipelineModule<DataArtifactIngestTask>> module = Optional.empty();
if (template.isDataArtifactIngestModuleTemplate()) { // if (template.isDataArtifactIngestModuleTemplate()) {
DataArtifactIngestModule ingestModule = template.createDataArtifactIngestModule(); // DataArtifactIngestModule ingestModule = template.createDataArtifactIngestModule();
module = Optional.of(new DataArtifactIngestPipelineModule(ingestModule, template.getModuleName())); // module = Optional.of(new DataArtifactIngestPipelineModule(ingestModule, template.getModuleName()));
} // }
return module; return module;
} }

20
Core/src/org/sleuthkit/autopsy/ingest/IngestJobPipeline.java
View File

@ -368,9 +368,9 @@ final class IngestJobPipeline {
if (template.isFileIngestModuleTemplate()) { if (template.isFileIngestModuleTemplate()) {
addModuleTemplateToSortingMap(javaFileModuleTemplates, jythonFileModuleTemplates, template); addModuleTemplateToSortingMap(javaFileModuleTemplates, jythonFileModuleTemplates, template);
} }
if (template.isDataArtifactIngestModuleTemplate()) { // if (template.isDataArtifactIngestModuleTemplate()) {
addModuleTemplateToSortingMap(javaArtifactModuleTemplates, jythonArtifactModuleTemplates, template); // addModuleTemplateToSortingMap(javaArtifactModuleTemplates, jythonArtifactModuleTemplates, template);
} // }
} }
/** /**
@ -616,13 +616,13 @@ final class IngestJobPipeline {
type = IngestModuleType.MULTIPLE; type = IngestModuleType.MULTIPLE;
} }
} }
if (moduleTemplate.isDataArtifactIngestModuleTemplate()) { // if (moduleTemplate.isDataArtifactIngestModuleTemplate()) {
if (type == null) { // if (type == null) {
type = IngestModuleType.DATA_ARTIFACT; // type = IngestModuleType.DATA_ARTIFACT;
} else { // } else {
type = IngestModuleType.MULTIPLE; // type = IngestModuleType.MULTIPLE;
} // }
} // }
return type; return type;
} }

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

@ -318,7 +318,7 @@ public final class IngestJobSettings {
// Add modules that are going to be used for this ingest depending on type. // Add modules that are going to be used for this ingest depending on type.
for (IngestModuleFactory moduleFactory : allModuleFactories) { for (IngestModuleFactory moduleFactory : allModuleFactories) {
if (moduleFactory.isDataArtifactIngestModuleFactory() || ingestType.equals(IngestType.ALL_MODULES)) { if (/*moduleFactory.isDataArtifactIngestModuleFactory() ||*/ ingestType.equals(IngestType.ALL_MODULES)) {
moduleFactories.add(moduleFactory); moduleFactories.add(moduleFactory);
} else if (this.ingestType.equals(IngestType.DATA_SOURCE_ONLY) && moduleFactory.isDataSourceIngestModuleFactory()) { } else if (this.ingestType.equals(IngestType.DATA_SOURCE_ONLY) && moduleFactory.isDataSourceIngestModuleFactory()) {
moduleFactories.add(moduleFactory); moduleFactories.add(moduleFactory);

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

@ -228,7 +228,7 @@ public interface IngestModuleFactory {
* *
* @return A file ingest module instance. * @return A file ingest module instance.
*/ */
default FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings ingestOptions) { default FileIngestModule createFileIngestModule(IngestModuleIngestJobSettings settings) {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
@ -238,9 +238,9 @@ public interface IngestModuleFactory {
* *
* @return True or false. * @return True or false.
*/ */
default boolean isDataArtifactIngestModuleFactory() { // default boolean isDataArtifactIngestModuleFactory() {
return false; // return false;
} // }
/** /**
* Creates a data artifact ingest module instance. * Creates a data artifact ingest module instance.
@ -267,8 +267,8 @@ public interface IngestModuleFactory {
* *
* @return A file ingest module instance. * @return A file ingest module instance.
*/ */
default DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) { // default DataArtifactIngestModule createDataArtifactIngestModule(IngestModuleIngestJobSettings settings) {
throw new UnsupportedOperationException(); // throw new UnsupportedOperationException();
} // }
} }

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

@ -85,13 +85,13 @@ public final class IngestModuleTemplate {
return moduleFactory.createFileIngestModule(settings); return moduleFactory.createFileIngestModule(settings);
} }
public boolean isDataArtifactIngestModuleTemplate() { // public boolean isDataArtifactIngestModuleTemplate() {
return moduleFactory.isDataArtifactIngestModuleFactory(); // return moduleFactory.isDataArtifactIngestModuleFactory();
} // }
public DataArtifactIngestModule createDataArtifactIngestModule() { // public DataArtifactIngestModule createDataArtifactIngestModule() {
return moduleFactory.createDataArtifactIngestModule(settings); // return moduleFactory.createDataArtifactIngestModule(settings);
} // }
public void setEnabled(boolean enabled) { public void setEnabled(boolean enabled) {
this.enabled = enabled; this.enabled = enabled;