From 9c136f8e6f1611a1de581e1b06e203d58681110c Mon Sep 17 00:00:00 2001 From: adam-m Date: Mon, 25 Feb 2013 10:48:25 -0500 Subject: [PATCH] rename ingest context to pipeline context --- .../autopsy/ingest/IngestImageThread.java | 14 ++++----- .../autopsy/ingest/IngestManager.java | 30 +++++++++---------- .../ingest/IngestModuleAbstractFile.java | 4 +-- .../autopsy/ingest/IngestModuleImage.java | 4 +-- .../autopsy/ingest/IngestScheduler.java | 12 ++++---- .../autopsy/ingest/IngestServices.java | 4 +-- ...ngestContext.java => PipelineContext.java} | 10 +++---- .../ExifParserFileIngestModule.java | 4 +-- .../hashdatabase/HashDbIngestModule.java | 4 +-- .../KeywordSearchIngestModule.java | 4 +-- .../autopsy/recentactivity/Chrome.java | 4 +-- .../autopsy/recentactivity/ExtractIE.java | 4 +-- .../recentactivity/ExtractRegistry.java | 4 +-- .../autopsy/recentactivity/Firefox.java | 4 +-- .../recentactivity/RAImageIngestModule.java | 6 ++-- .../SearchEngineURLQueryAnalyzer.java | 4 +-- .../sevenzip/SevenZipIngestModule.java | 20 ++++++------- .../ThunderbirdMboxFileIngestModule.java | 4 +-- 18 files changed, 69 insertions(+), 71 deletions(-) rename Core/src/org/sleuthkit/autopsy/ingest/{IngestContext.java => PipelineContext.java} (86%) diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java index 81a1c33ecc..d7c3209fd7 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestImageThread.java @@ -40,7 +40,7 @@ public class IngestImageThread extends SwingWorker { private final Logger logger = Logger.getLogger(IngestImageThread.class.getName()); private ProgressHandle progress; - private final IngestContextingestContext; + private final PipelineContextpipelineContext; private final Image image; private final IngestModuleImage module; private IngestImageWorkerController controller; @@ -52,20 +52,20 @@ public class IngestImageThread extends SwingWorker { //TODO use a real queue and manager to allow multiple different modules to run in parallel private static final Lock imageIngestModuleLock = new ReentrantReadWriteLock(true).writeLock(); - IngestImageThread(IngestManager manager, IngestContextingestContext, Image image, IngestModuleImage module, IngestModuleInit init) { + IngestImageThread(IngestManager manager, PipelineContextpipelineContext, Image image, IngestModuleImage module, IngestModuleInit init) { this.manager = manager; - this.ingestContext = ingestContext; + this.pipelineContext = pipelineContext; this.image = image; this.module = module; this.init = init; } - IngestContextgetContext() { - return ingestContext; + PipelineContextgetContext() { + return pipelineContext; } Image getImage() { - return ingestContext.getScheduledTask().getImage(); + return pipelineContext.getScheduledTask().getImage(); } IngestModuleImage getModule() { @@ -120,7 +120,7 @@ public class IngestImageThread extends SwingWorker { final StopWatch timer = new StopWatch(); timer.start(); try { - module.process(ingestContext, image, controller); + module.process(pipelineContext, image, controller); } catch (Exception e) { logger.log(Level.WARNING, "Exception in module: " + module.getName() + " image: " + image.getName(), e); } finally { diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java index ef6ede7b3e..fd19f8f34a 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java @@ -257,10 +257,10 @@ public class IngestManager { * Now we want to process this file with the same ingest context. * * @param file file to be scheduled - * @param ingestContext ingest context used to ingest parent of the file to be scheduled + * @param pipelineContext ingest context used to ingest parent of the file to be scheduled */ - void scheduleFile(AbstractFile file, IngestContext ingestContext) { - scheduler.getFileScheduler().schedule(file, ingestContext); + void scheduleFile(AbstractFile file, PipelineContext pipelineContext) { + scheduler.getFileScheduler().schedule(file, pipelineContext); } /** @@ -314,10 +314,10 @@ public class IngestManager { IngestModuleInit moduleInit = new IngestModuleInit(); moduleInit.setModuleArgs(taskModule.getArguments()); - IngestContextimageIngestContext = - new IngestContext(imageTask, getProcessUnallocSpace()); + PipelineContextimagepipelineContext = + new PipelineContext(imageTask, getProcessUnallocSpace()); final IngestImageThread newImageWorker = new IngestImageThread(this, - imageIngestContext, imageTask.getImage(), taskModule, moduleInit); + imagepipelineContext, imageTask.getImage(), taskModule, moduleInit); imageIngesters.add(newImageWorker); @@ -850,8 +850,8 @@ public class IngestManager { //process AbstractFiles queue while (fileScheduler.hasNext()) { final ProcessTask fileTask = fileScheduler.next(); - final IngestContext fileIngestContext = fileTask.context; - final ScheduledImageTask fileIngestTask = fileIngestContext.getScheduledTask(); + final PipelineContext filepipelineContext = fileTask.context; + final ScheduledImageTask fileIngestTask = filepipelineContext.getScheduledTask(); final AbstractFile fileToProcess = fileTask.file; //clear return values from modules for last file @@ -871,7 +871,7 @@ public class IngestManager { try { stats.logFileModuleStartProcess(module); IngestModuleAbstractFile.ProcessResult result = module.process - (fileIngestContext, fileToProcess); + (filepipelineContext, fileToProcess); stats.logFileModuleEndProcess(module); //store the result for subsequent modules for this file @@ -1076,19 +1076,19 @@ public class IngestManager { //queue to schedulers final boolean processUnalloc = getProcessUnallocSpace(); final ScheduledImageTask imageTask = new ScheduledImageTask(image, imageMods); - final IngestContextimageIngestContext - = new IngestContext(imageTask, processUnalloc); + final PipelineContextimagepipelineContext + = new PipelineContext(imageTask, processUnalloc); logger.log(Level.INFO, "Queing image ingest task: " + imageTask); progress.progress("Image Ingest" + " " + imageName, processed); - imageScheduler.schedule(imageIngestContext); + imageScheduler.schedule(imagepipelineContext); progress.progress("Image Ingest" + " " + imageName, ++processed); final ScheduledImageTask fTask = new ScheduledImageTask(image, fileMods); - final IngestContextfileIngestContext - = new IngestContext(fTask, processUnalloc); + final PipelineContextfilepipelineContext + = new PipelineContext(fTask, processUnalloc); logger.log(Level.INFO, "Queing file ingest task: " + fTask); progress.progress("File Ingest" + " " + imageName, processed); - fileScheduler.schedule(fileIngestContext); + fileScheduler.schedule(filepipelineContext); progress.progress("File Ingest" + " " + imageName, ++processed); } //for images diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java index 26b8ea7d1c..98321809e1 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleAbstractFile.java @@ -40,9 +40,9 @@ public interface IngestModuleAbstractFile extends IngestModuleAbstract { * Entry point to process file / directory by the module. See \ref ingestmodule_making for details * on what modules are responsible for doing. * - * @param ingestContext the context in which the ingest runs (with its own settings, modules, etc) + * @param pipelineContext the context in which the ingest runs (with its own settings, modules, etc) * @param abstractFile file to process * @return ProcessResult result of the processing that can be used in the pipeline as a hint whether to further process this file */ - public ProcessResult process(IngestContextingestContext, AbstractFile abstractFile); + public ProcessResult process(PipelineContextpipelineContext, AbstractFile abstractFile); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java index 841870eac7..082f3b93a0 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestModuleImage.java @@ -43,9 +43,9 @@ public interface IngestModuleImage extends IngestModuleAbstract { * The module is responsible for posting progress to controller * And to periodically check controller if it should break out of the processing loop because task has been canceled * - * @param ingestContext the context in which the ingest runs (with its own settings, modules, etc) + * @param pipelineContext the context in which the ingest runs (with its own settings, modules, etc) * @param image to process * @param controller to post progress to and to use for checking if cancellation has occurred */ - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller); + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java index 6421cc9a6c..a9698df5ed 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestScheduler.java @@ -204,9 +204,9 @@ class IngestScheduler { static class ProcessTask { final AbstractFile file; - final IngestContext context; + final PipelineContext context; - public ProcessTask(AbstractFile file, IngestContext context) { + public ProcessTask(AbstractFile file, PipelineContext context) { this.file = file; this.context = context; } @@ -267,7 +267,7 @@ class IngestScheduler { * @param context the original ingest context * @return */ - private static List createFromScheduledTask(IngestContext context) { + private static List createFromScheduledTask(PipelineContext context) { ScheduledImageTask scheduledTask = context.getScheduledTask(); Collection rootObjects = scheduledTask.getImage().accept(new GetRootDirVisitor()); List firstLevelFiles = new ArrayList(); @@ -356,7 +356,7 @@ class IngestScheduler { * @param originalContext original image schedule context that was used to * schedule the parent origin file, with the modules, settings, etc. */ - synchronized void schedule(AbstractFile file, IngestContext originalContext) { + synchronized void schedule(AbstractFile file, PipelineContext originalContext) { ScheduledImageTask originalTask = originalContext.getScheduledTask(); //skip if task contains no modules @@ -378,7 +378,7 @@ class IngestScheduler { * * @param task image schedule task with image and associated modules */ - synchronized void schedule(IngestContext context) { + synchronized void schedule(PipelineContext context) { final ScheduledImageTask task = context.getScheduledTask(); @@ -876,7 +876,7 @@ class IngestScheduler { tasks = new LinkedList>(); } - synchronized void schedule(IngestContext context) { + synchronized void schedule(PipelineContext context) { ScheduledImageTask task = context.getScheduledTask(); diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java index e16913cbb2..b8c96e5448 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestServices.java @@ -128,9 +128,9 @@ public class IngestServices { * * @param file file to be scheduled */ - public void scheduleFile(AbstractFile file, IngestContext ingestContext) { + public void scheduleFile(AbstractFile file, PipelineContext pipelineContext) { logger.log(Level.INFO, "Scheduling file: " + file.getName()); - manager.scheduleFile(file, ingestContext); + manager.scheduleFile(file, pipelineContext); } diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestContext.java b/Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java similarity index 86% rename from Core/src/org/sleuthkit/autopsy/ingest/IngestContext.java rename to Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java index 4f10628078..107503688d 100644 --- a/Core/src/org/sleuthkit/autopsy/ingest/IngestContext.java +++ b/Core/src/org/sleuthkit/autopsy/ingest/PipelineContext.java @@ -18,8 +18,6 @@ */ package org.sleuthkit.autopsy.ingest; -import java.util.HashMap; -import java.util.Map; import java.util.Objects; @@ -34,11 +32,11 @@ import java.util.Objects; * @param T type of the ingest associated with the context (file or image) * */ -public class IngestContext { +public class PipelineContext { private final ScheduledImageTask task; private final boolean processUnalloc; - IngestContext(ScheduledImageTask task, boolean processUnalloc) { + PipelineContext(ScheduledImageTask task, boolean processUnalloc) { this.task = task; this.processUnalloc = processUnalloc; } @@ -56,7 +54,7 @@ public class IngestContext { @Override public String toString() { - return "IngestContext{" + "task=" + task + ", processUnalloc=" + processUnalloc + '}'; + return "pipelineContext{" + "task=" + task + ", processUnalloc=" + processUnalloc + '}'; } @Override @@ -75,7 +73,7 @@ public class IngestContext { if (getClass() != obj.getClass()) { return false; } - final IngestContext other = (IngestContext) obj; + final PipelineContext other = (PipelineContext) obj; if (!Objects.equals(this.task, other.task)) { return false; diff --git a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java b/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java index 7f4e5ae59a..e217f1aefd 100644 --- a/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java +++ b/ExifParser/src/org/sleuthkit/autopsy/exifparser/ExifParserFileIngestModule.java @@ -38,7 +38,7 @@ import java.util.Collections; import java.util.Date; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.IngestMessage; import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType; @@ -89,7 +89,7 @@ public final class ExifParserFileIngestModule implements IngestModuleAbstractFil } @Override - public IngestModuleAbstractFile.ProcessResult process(IngestContextingestContext, AbstractFile content) { + public IngestModuleAbstractFile.ProcessResult process(PipelineContextpipelineContext, AbstractFile content) { //skip unalloc if(content.getType().equals(TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) { diff --git a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java index 48ce932290..0a02b32200 100644 --- a/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java +++ b/HashDatabase/src/org/sleuthkit/autopsy/hashdatabase/HashDbIngestModule.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.logging.Level; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestMessage; import org.sleuthkit.autopsy.ingest.IngestModuleAbstractFile; import org.sleuthkit.autopsy.ingest.IngestModuleInit; @@ -193,7 +193,7 @@ public class HashDbIngestModule implements IngestModuleAbstractFile { @Override - public ProcessResult process(IngestContextingestContext, AbstractFile file) { + public ProcessResult process(PipelineContextpipelineContext, AbstractFile file) { //skip unalloc if (file.getType().equals(TskData.TSK_DB_FILES_TYPE_ENUM.UNALLOC_BLOCKS)) { return IngestModuleAbstractFile.ProcessResult.OK; diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java index 4bd0042237..0545b7c97f 100644 --- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java +++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchIngestModule.java @@ -45,7 +45,7 @@ import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.EscapeUtil; import org.sleuthkit.autopsy.coreutils.StopWatch; import org.sleuthkit.autopsy.coreutils.StringExtract.StringExtractUnicodeTable.SCRIPT; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.IngestMessage; import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType; @@ -147,7 +147,7 @@ public final class KeywordSearchIngestModule implements IngestModuleAbstractFile } @Override - public ProcessResult process(IngestContextingestContext, AbstractFile abstractFile) { + public ProcessResult process(PipelineContextpipelineContext, AbstractFile abstractFile) { if (initialized == false) //error initializing indexing/Solr { diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java index c3e6249233..cffd3684cc 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Chrome.java @@ -40,7 +40,7 @@ import java.io.UnsupportedEncodingException; import java.sql.SQLException; import org.sleuthkit.autopsy.casemodule.services.FileManager; import org.sleuthkit.autopsy.coreutils.EscapeUtil; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestImageWorkerController; import org.sleuthkit.autopsy.ingest.IngestModuleImage; import org.sleuthkit.autopsy.ingest.IngestModuleInit; @@ -90,7 +90,7 @@ public class Chrome extends Extract implements IngestModuleImage { } @Override - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller) { + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller) { this.getHistory(image, controller); this.getBookmark(image, controller); this.getCookie(image, controller); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java index 73c71bde08..3da9b20e00 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractIE.java @@ -67,7 +67,7 @@ import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.FsContent; import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.autopsy.coreutils.PlatformUtil; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestModuleImage; import org.sleuthkit.autopsy.ingest.IngestModuleInit; import org.sleuthkit.datamodel.*; @@ -117,7 +117,7 @@ public class ExtractIE extends Extract implements IngestModuleImage { } @Override - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller) { + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller) { this.getHistory(image, controller); this.getBookmark(image, controller); this.getCookie(image, controller); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java index ef5e3070e4..8edf598105 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java @@ -38,7 +38,7 @@ import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.datamodel.ContentUtils; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestImageWorkerController; import org.sleuthkit.autopsy.ingest.IngestModuleImage; import org.sleuthkit.autopsy.ingest.IngestModuleInit; @@ -389,7 +389,7 @@ public class ExtractRegistry extends Extract implements IngestModuleImage { } @Override - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller) { + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller) { this.getRegistryFiles(image, controller); } diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java index 7462530f68..d08100a7c6 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Firefox.java @@ -34,7 +34,7 @@ import java.util.logging.Level; import org.sleuthkit.autopsy.casemodule.services.FileManager; import org.sleuthkit.autopsy.coreutils.EscapeUtil; import org.sleuthkit.autopsy.datamodel.ContentUtils; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestImageWorkerController; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.IngestModuleImage; @@ -84,7 +84,7 @@ public class Firefox extends Extract implements IngestModuleImage { } @Override - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller) { + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller) { this.getHistory(image, controller); this.getBookmark(image, controller); this.getDownload(image, controller); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java index e495a9ea01..016f62022f 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAImageIngestModule.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import org.sleuthkit.autopsy.coreutils.Logger; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestImageWorkerController; import org.sleuthkit.autopsy.ingest.IngestServices; import org.sleuthkit.autopsy.ingest.IngestMessage; @@ -65,7 +65,7 @@ public final class RAImageIngestModule implements IngestModuleImage { } @Override - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller) { + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller) { services.postMessage(IngestMessage.createMessage(++messageId, MessageType.INFO, this, "Started " + image.getName())); controller.switchToDeterminate(modules.size()); @@ -79,7 +79,7 @@ public final class RAImageIngestModule implements IngestModuleImage { break; } try { - module.process(ingestContext, image, controller); + module.process(pipelineContext, image, controller); } catch (Exception ex) { logger.log(Level.SEVERE, "Exception occurred in " + module.getName(), ex); subCompleted.append(module.getName()).append(" failed - see log for details
"); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java index ef1bf24413..c0c4ea5e97 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java @@ -37,7 +37,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.coreutils.XMLUtil; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestImageWorkerController; import org.sleuthkit.autopsy.ingest.IngestModuleAbstract; import org.sleuthkit.autopsy.ingest.IngestModuleImage; @@ -325,7 +325,7 @@ public class SearchEngineURLQueryAnalyzer extends Extract implements IngestModul } @Override - public void process(IngestContextingestContext, Image image, IngestImageWorkerController controller) { + public void process(PipelineContextpipelineContext, Image image, IngestImageWorkerController controller) { this.getURLs(image, controller); logger.info("Search Engine stats: \n" + getTotals()); } diff --git a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java index 04efbdb5c6..d5cfb95d29 100644 --- a/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java +++ b/SevenZip/src/org/sleuthkit/autopsy/sevenzip/SevenZipIngestModule.java @@ -48,7 +48,7 @@ import org.netbeans.api.progress.ProgressHandleFactory; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.casemodule.services.FileManager; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestMessage; import org.sleuthkit.datamodel.BlackboardArtifact; import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE; @@ -145,7 +145,7 @@ public final class SevenZipIngestModule implements IngestModuleAbstractFile { } @Override - public ProcessResult process(IngestContext ingestContext, AbstractFile abstractFile) { + public ProcessResult process(PipelineContext pipelineContext, AbstractFile abstractFile) { if (initialized == false) { //error initializing the module logger.log(Level.WARNING, "Skipping processing, module not initialized, file: " + abstractFile.getName()); @@ -178,10 +178,10 @@ public final class SevenZipIngestModule implements IngestModuleAbstractFile { ++processedFiles; - List unpackedFiles = unpack(ingestContext, abstractFile); + List unpackedFiles = unpack(pipelineContext, abstractFile); if (!unpackedFiles.isEmpty()) { sendNewFilesEvent(unpackedFiles); - rescheduleNewFiles(ingestContext, unpackedFiles); + rescheduleNewFiles(pipelineContext, unpackedFiles); } //process, return error if occurred @@ -192,9 +192,9 @@ public final class SevenZipIngestModule implements IngestModuleAbstractFile { private void sendNewFilesEvent(List unpackedFiles) { } - private void rescheduleNewFiles(IngestContext ingestContext, List unpackedFiles) { + private void rescheduleNewFiles(PipelineContext pipelineContext, List unpackedFiles) { for (AbstractFile unpackedFile : unpackedFiles) { - services.scheduleFile(unpackedFile, ingestContext); + services.scheduleFile(unpackedFile, pipelineContext); } } @@ -233,7 +233,7 @@ public final class SevenZipIngestModule implements IngestModuleAbstractFile { //TODO reimplement recursion depth check -// Integer curDepth = (Integer) ingestContext.getContextParamsValue(CONTEXT_DEPTH_PARAM); +// Integer curDepth = (Integer) pipelineContext.getContextParamsValue(CONTEXT_DEPTH_PARAM); // if (curDepth == null) { // curDepth = 1; // } else { @@ -244,7 +244,7 @@ public final class SevenZipIngestModule implements IngestModuleAbstractFile { // "The archive is " + curDepth + " levels deep, skipping processing of this archive and its contents "); // return unpackedFiles; // } else { -// ingestContext.addContextParamsValue(CONTEXT_DEPTH_PARAM, curDepth); +// pipelineContext.addContextParamsValue(CONTEXT_DEPTH_PARAM, curDepth); // } } @@ -302,11 +302,11 @@ public final class SevenZipIngestModule implements IngestModuleAbstractFile { /** * Unpack the file to local folder and return a list of derived files * - * @param ingestContext current ingest context + * @param pipelineContext current ingest context * @param archiveFile file to unpack * @return list of unpacked derived files */ - private List unpack(IngestContext ingestContext, AbstractFile archiveFile) { + private List unpack(PipelineContext pipelineContext, AbstractFile archiveFile) { List unpackedFiles = Collections.emptyList(); if (isZipBombArchiveCheck(archiveFile)) { diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java index be4e9c1b62..387e4206d6 100644 --- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java +++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestModule.java @@ -48,7 +48,7 @@ import org.apache.commons.lang.StringEscapeUtils; import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.datamodel.ContentUtils; -import org.sleuthkit.autopsy.ingest.IngestContext; +import org.sleuthkit.autopsy.ingest.PipelineContext; import org.sleuthkit.autopsy.ingest.IngestModuleInit; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.Content; @@ -77,7 +77,7 @@ public class ThunderbirdMboxFileIngestModule implements IngestModuleAbstractFile } @Override - public ProcessResult process(IngestContextingestContext, AbstractFile abstractFile) { + public ProcessResult process(PipelineContextingestContext, AbstractFile abstractFile) { ThunderbirdEmailParser mbox = new ThunderbirdEmailParser(); boolean isMbox = false;