From bdb831dcb55fe75e29de715107a269c5eba5aa99 Mon Sep 17 00:00:00 2001
From: Aaron Peterson <aaronp@gmail.com>
Date: Sun, 8 Oct 2023 14:34:32 -0700
Subject: [PATCH] Fix required states

---
 turbinia/workers/analysis/jenkins.py          | 2 +-
 turbinia/workers/analysis/jupyter.py          | 4 ++--
 turbinia/workers/analysis/wordpress_access.py | 4 ++--
 turbinia/workers/analysis/wordpress_creds.py  | 3 ++-
 turbinia/workers/redis.py                     | 4 ++--
 turbinia/workers/sshd.py                      | 3 ++-
 turbinia/workers/tomcat.py                    | 4 ++--
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/turbinia/workers/analysis/jenkins.py b/turbinia/workers/analysis/jenkins.py
index 8d894a241..fbe9acf8a 100644
--- a/turbinia/workers/analysis/jenkins.py
+++ b/turbinia/workers/analysis/jenkins.py
@@ -32,7 +32,7 @@
 class JenkinsAnalysisTask(TurbiniaTask):
   """Task to analyze a Jenkins install."""
 
-  # Input is typically extract artifact so does not need to be MOUNTED
+  # Does not need to be MOUNTED as this Task uses extract_files()
   REQUIRED_STATES = [state.ATTACHED, state.CONTAINER_MOUNTED]
 
   TASK_CONFIG = {
diff --git a/turbinia/workers/analysis/jupyter.py b/turbinia/workers/analysis/jupyter.py
index 7f03400f5..ad7f3c820 100644
--- a/turbinia/workers/analysis/jupyter.py
+++ b/turbinia/workers/analysis/jupyter.py
@@ -30,8 +30,8 @@
 class JupyterAnalysisTask(TurbiniaTask):
   """Task to analyze a Jupyter Notebook config."""
 
-  # Input is typically extracted artifact so does not need to be MOUNTED
-  REQUIRED_STATES = [state.ATTACHED, state.MOUNTED, state.CONTAINER_MOUNTED]
+  # Input Evidence is ExportedFileArtifact so does not need to be pre-processed.
+  REQUIRED_STATES = []
 
   def run(self, evidence, result):
     """Run the Jupyter worker.
diff --git a/turbinia/workers/analysis/wordpress_access.py b/turbinia/workers/analysis/wordpress_access.py
index b436b9cf7..c6f4e25cf 100644
--- a/turbinia/workers/analysis/wordpress_access.py
+++ b/turbinia/workers/analysis/wordpress_access.py
@@ -30,8 +30,8 @@
 class WordpressAccessLogAnalysisTask(TurbiniaTask):
   """Task to analyze Wordpress access logs."""
 
-  # Input is typically extracted artifact so does not need to be MOUNTED
-  REQUIRED_STATES = [state.ATTACHED, state.CONTAINER_MOUNTED]
+  # Input Evidence is ExportedFileArtifact so does not need to be preprocessed.
+  REQUIRED_STATES = []
 
   timestamp_regex = re.compile(r'\[(?P<timestamp>.+)\]')
 
diff --git a/turbinia/workers/analysis/wordpress_creds.py b/turbinia/workers/analysis/wordpress_creds.py
index 6efaa2ebd..930584b67 100644
--- a/turbinia/workers/analysis/wordpress_creds.py
+++ b/turbinia/workers/analysis/wordpress_creds.py
@@ -34,8 +34,9 @@
 class WordpressCredsAnalysisTask(TurbiniaTask):
   """Task to analyze the credentials of a Wordpress instance."""
 
+  # Does not need to be MOUNTED as uses extract_files()
   REQUIRED_STATES = [
-      state.ATTACHED, state.MOUNTED, state.CONTAINER_MOUNTED, state.DECOMPRESSED
+      state.ATTACHED, state.CONTAINER_MOUNTED, state.DECOMPRESSED
   ]
 
   TASK_CONFIG = {
diff --git a/turbinia/workers/redis.py b/turbinia/workers/redis.py
index efa4bf750..98b16dd2f 100644
--- a/turbinia/workers/redis.py
+++ b/turbinia/workers/redis.py
@@ -29,8 +29,8 @@
 class RedisAnalysisTask(TurbiniaTask):
   """Task to analyze a Redis configuration file."""
 
-  # Input is typically extracted artifact so does not need to be MOUNTED
-  REQUIRED_STATES = [state.ATTACHED, state.CONTAINER_MOUNTED]
+  # Input Evidence is ExportedFileArtifact so does not need to be pre-processed.
+  REQUIRED_STATES = []
 
   def run(self, evidence, result):
     """Run the Redis configuration analysis worker.
diff --git a/turbinia/workers/sshd.py b/turbinia/workers/sshd.py
index 813b2ed47..130b88283 100644
--- a/turbinia/workers/sshd.py
+++ b/turbinia/workers/sshd.py
@@ -29,7 +29,8 @@
 class SSHDAnalysisTask(TurbiniaTask):
   """Task to analyze a sshd_config file."""
 
-  REQUIRED_STATES = [state.ATTACHED, state.MOUNTED, state.CONTAINER_MOUNTED]
+  # Input Evidence is ExportedFileArtifact so does not need to be pre-processed.
+  REQUIRED_STATES = []
 
   def run(self, evidence, result):
     """Run the sshd_config analysis worker.
diff --git a/turbinia/workers/tomcat.py b/turbinia/workers/tomcat.py
index 7703cdc4b..5abb1e06d 100644
--- a/turbinia/workers/tomcat.py
+++ b/turbinia/workers/tomcat.py
@@ -29,8 +29,8 @@
 class TomcatAnalysisTask(TurbiniaTask):
   """Task to analyze a Tomcat file."""
 
-  # Input is typically extracted artifact so does not need to be MOUNTED
-  REQUIRED_STATES = [state.ATTACHED, state.CONTAINER_MOUNTED]
+  # Input Evidence is ExportedFileArtifact so does not need to be pre-processed.
+  REQUIRED_STATES = []
 
   def run(self, evidence, result):
     """Run the Tomcat analysis worker.