From c4a8f618ec4c8419ef8214b82209ed1920f7a8e1 Mon Sep 17 00:00:00 2001 From: Aaron Peterson Date: Mon, 22 Jan 2024 15:29:17 -0800 Subject: [PATCH] Move redis, sshd and tomcat tasks into analysis folder --- turbinia/jobs/redis.py | 2 +- turbinia/jobs/sshd.py | 2 +- turbinia/jobs/tomcat.py | 2 +- turbinia/task_utils.py | 10 +++++----- turbinia/workers/{ => analysis}/redis.py | 0 turbinia/workers/{ => analysis}/redis_test.py | 2 +- turbinia/workers/{ => analysis}/sshd.py | 0 turbinia/workers/{ => analysis}/sshd_test.py | 2 +- turbinia/workers/{ => analysis}/tomcat.py | 0 turbinia/workers/{ => analysis}/tomcat_test.py | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename turbinia/workers/{ => analysis}/redis.py (100%) rename turbinia/workers/{ => analysis}/redis_test.py (97%) rename turbinia/workers/{ => analysis}/sshd.py (100%) rename turbinia/workers/{ => analysis}/sshd_test.py (97%) rename turbinia/workers/{ => analysis}/tomcat.py (100%) rename turbinia/workers/{ => analysis}/tomcat_test.py (98%) diff --git a/turbinia/jobs/redis.py b/turbinia/jobs/redis.py index 02f2f9c6f..6707fe50f 100644 --- a/turbinia/jobs/redis.py +++ b/turbinia/jobs/redis.py @@ -17,7 +17,7 @@ from __future__ import unicode_literals from turbinia.workers import artifact -from turbinia.workers import redis +from turbinia.workers.analysis import redis from turbinia.evidence import ContainerdContainer from turbinia.evidence import Directory from turbinia.evidence import DockerContainer diff --git a/turbinia/jobs/sshd.py b/turbinia/jobs/sshd.py index 0301257c2..ac3e64af4 100644 --- a/turbinia/jobs/sshd.py +++ b/turbinia/jobs/sshd.py @@ -17,7 +17,7 @@ from __future__ import unicode_literals from turbinia.workers import artifact -from turbinia.workers import sshd +from turbinia.workers.analysis import sshd from turbinia.evidence import ContainerdContainer from turbinia.evidence import Directory from turbinia.evidence import DockerContainer diff --git a/turbinia/jobs/tomcat.py b/turbinia/jobs/tomcat.py index df47aa28a..36e7abf0c 100644 --- a/turbinia/jobs/tomcat.py +++ b/turbinia/jobs/tomcat.py @@ -15,7 +15,7 @@ """Job to execute Apache Tomcat analysis task.""" from __future__ import unicode_literals from turbinia.workers import artifact -from turbinia.workers import tomcat +from turbinia.workers.analysis import tomcat from turbinia.evidence import ContainerdContainer from turbinia.evidence import Directory from turbinia.evidence import DockerContainer diff --git a/turbinia/task_utils.py b/turbinia/task_utils.py index a1dfc91be..eac56b7d3 100644 --- a/turbinia/task_utils.py +++ b/turbinia/task_utils.py @@ -103,12 +103,15 @@ def get_task(self, task_name): from turbinia.workers.analysis.jenkins import JenkinsAnalysisTask from turbinia.workers.analysis.jupyter import JupyterAnalysisTask from turbinia.workers.analysis.linux_acct import LinuxAccountAnalysisTask - from turbinia.workers.analysis.yara import YaraAnalysisTask from turbinia.workers.analysis.postgresql_acct import PostgresAccountAnalysisTask + from turbinia.workers.analysis.redis import RedisAnalysisTask from turbinia.workers.analysis.ssh_analyzer import LinuxSSHAnalysisTask + from turbinia.workers.analysis.sshd import SSHDAnalysisTask + from turbinia.workers.analysis.tomcat import TomcatAnalysisTask from turbinia.workers.analysis.windows_acct import WindowsAccountAnalysisTask from turbinia.workers.analysis.wordpress_access import WordpressAccessLogAnalysisTask from turbinia.workers.analysis.wordpress_creds import WordpressCredsAnalysisTask + from turbinia.workers.analysis.yara import YaraAnalysisTask from turbinia.workers.artifact import FileArtifactExtractionTask from turbinia.workers.binary_extractor import BinaryExtractorTask from turbinia.workers.bulk_extractor import BulkExtractorTask @@ -122,14 +125,11 @@ def get_task(self, task_name): from turbinia.workers.hindsight import HindsightTask from turbinia.workers.partitions import PartitionEnumerationTask from turbinia.workers.photorec import PhotorecTask - from turbinia.workers.plaso import PlasoParserTask from turbinia.workers.plaso import PlasoHasherTask + from turbinia.workers.plaso import PlasoParserTask from turbinia.workers.psort import PsortTask - from turbinia.workers.redis import RedisAnalysisTask - from turbinia.workers.sshd import SSHDAnalysisTask from turbinia.workers.strings import StringsAsciiTask from turbinia.workers.strings import StringsUnicodeTask - from turbinia.workers.tomcat import TomcatAnalysisTask from turbinia.workers.volatility import VolatilityTask from turbinia.workers.worker_stat import StatTask diff --git a/turbinia/workers/redis.py b/turbinia/workers/analysis/redis.py similarity index 100% rename from turbinia/workers/redis.py rename to turbinia/workers/analysis/redis.py diff --git a/turbinia/workers/redis_test.py b/turbinia/workers/analysis/redis_test.py similarity index 97% rename from turbinia/workers/redis_test.py rename to turbinia/workers/analysis/redis_test.py index d237aa748..8852eeafc 100644 --- a/turbinia/workers/redis_test.py +++ b/turbinia/workers/analysis/redis_test.py @@ -19,7 +19,7 @@ import unittest from turbinia import config -from turbinia.workers import redis +from turbinia.workers.analysis import redis class RedisAnalysisTaskTest(unittest.TestCase): diff --git a/turbinia/workers/sshd.py b/turbinia/workers/analysis/sshd.py similarity index 100% rename from turbinia/workers/sshd.py rename to turbinia/workers/analysis/sshd.py diff --git a/turbinia/workers/sshd_test.py b/turbinia/workers/analysis/sshd_test.py similarity index 97% rename from turbinia/workers/sshd_test.py rename to turbinia/workers/analysis/sshd_test.py index 0655ae6fe..51a23330b 100644 --- a/turbinia/workers/sshd_test.py +++ b/turbinia/workers/analysis/sshd_test.py @@ -19,7 +19,7 @@ import unittest from turbinia import config -from turbinia.workers import sshd +from turbinia.workers.analysis import sshd class SSHDAnalysisTaskTest(unittest.TestCase): diff --git a/turbinia/workers/tomcat.py b/turbinia/workers/analysis/tomcat.py similarity index 100% rename from turbinia/workers/tomcat.py rename to turbinia/workers/analysis/tomcat.py diff --git a/turbinia/workers/tomcat_test.py b/turbinia/workers/analysis/tomcat_test.py similarity index 98% rename from turbinia/workers/tomcat_test.py rename to turbinia/workers/analysis/tomcat_test.py index b8da043fc..0ed9d14ad 100644 --- a/turbinia/workers/tomcat_test.py +++ b/turbinia/workers/analysis/tomcat_test.py @@ -19,7 +19,7 @@ import unittest from turbinia import config -from turbinia.workers import tomcat +from turbinia.workers.analysis import tomcat class TomcatAnalysisTaskTest(unittest.TestCase):