secator 0.10.1a4__tar.gz → 0.10.1a6__tar.gz

{secator-0.10.1a4 → secator-0.10.1a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.10.1a4
+Version: 0.10.1a6
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues

{secator-0.10.1a4 → secator-0.10.1a6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'secator'
-version = "0.10.1a4"
+version = "0.10.1a6"
 authors = [{ name = 'FreeLabz', email = 'sales@freelabz.com' }]
 readme = 'README.md'
 description = "The pentester's swiss knife."

{secator-0.10.1a4 → secator-0.10.1a6}/secator/celery.py

@@ -260,11 +260,8 @@ def mark_runner_complete(results, runner):
 
 	# Run final processing
 	runner.results = results
-	runner.done = True
-	runner.progress = 100
 	if not runner.no_process:
 		runner.mark_duplicates()
-		runner.results = runner.filter_results()
 	runner.log_results()
 	runner.run_hooks('on_end')
 	return runner.results

{secator-0.10.1a4 → secator-0.10.1a6}/secator/report.py

@@ -38,7 +38,7 @@ class Report:
 		exporters (list): List of exporter classes.
 	"""
 	def __init__(self, runner, title=None, exporters=[]):
-		self.title = title or f'{runner.__class__.__name__.lower()}_{runner.config.name}'
+		self.title = title or f'{runner.config.type}_{runner.config.name}'
 		self.runner = runner
 		self.timestamp = get_file_timestamp()
 		self.exporters = exporters

{secator-0.10.1a4 → secator-0.10.1a6}/secator/runners/_base.py

@@ -15,8 +15,8 @@ from secator.config import CONFIG
 from secator.output_types import FINDING_TYPES, OutputType, Progress, Info, Warning, Error, Target, State
 from secator.report import Report
 from secator.rich import console, console_stdout
-from secator.runners._helpers import (get_task_folder_id, process_extractor, run_extractors)
-from secator.utils import (debug, import_dynamic, merge_opts, rich_to_ansi, should_update)
+from secator.runners._helpers import (get_task_folder_id, run_extractors)
+from secator.utils import (debug, import_dynamic, rich_to_ansi, should_update)
 
 logger = logging.getLogger(__name__)
 
@@ -281,6 +281,8 @@ class Runner:
 			# If any errors happened during valid ation, exit
 			if self.errors:
 				yield from self.errors
+				if self.no_process:
+					return
 				self.log_results()
 				self.run_hooks('on_end')
 				return
@@ -303,14 +305,12 @@ class Runner:
 			yield from self.join_threads()
 			yield error
 
-		# Mark duplicates and filter results
-		if not self.no_process:
+		finally:
+			if self.no_process:
+				return
 			self.mark_duplicates()
-			self.results = self.filter_results()
-
-		# Finalize run
-		self.log_results()
-		self.run_hooks('on_end')
+			self.log_results()
+			self.run_hooks('on_end')
 
 	def join_threads(self):
 		"""Wait for all running threads to complete."""
@@ -507,6 +507,8 @@ class Runner:
 				task_id=self.celery_result.id
 			)
 			if self.no_poll:
+				self.enable_hooks = False
+				self.no_process = True
 				return
 			results = CeleryData.iter_results(
 				self.celery_result,
@@ -686,8 +688,6 @@ class Runner:
 
 	def log_results(self):
 		"""Log runner results."""
-		if self.no_poll:
-			return
 		self.started = True
 		self.done = True
 		self.progress = 100
@@ -715,31 +715,6 @@ class Runner:
 			name = self.celery_ids_map.get(task_id, {}).get('full_name')
 			revoke_task(task_id, name)
 
-	def filter_results(self):
-		"""Filter runner results using extractors defined in config."""
-		extractors = self.config.results
-		results = []
-		if extractors:
-			# Keep results based on extractors
-			opts = merge_opts(self.config.options, self.run_opts)
-			for extractor in extractors:
-				tmp = process_extractor(self.results, extractor, ctx=opts)
-				results.extend(tmp)
-
-			# Keep the field types in results not specified in the extractors.
-			extract_fields = [e['type'] for e in extractors]
-			keep_fields = [
-				_type for _type in FINDING_TYPES
-				if _type not in extract_fields
-			]
-			results.extend([
-				item for item in self.results
-				if item._type in keep_fields
-			])
-		else:
-			results = self.results
-		return results
-
 	def _convert_item_schema(self, item):
 		"""Convert dict item to a secator output type.
 

{secator-0.10.1a4 → secator-0.10.1a6}/secator/runners/scan.py

@@ -33,6 +33,7 @@ class Scan(Runner):
 		sigs = []
 		for name, workflow_opts in self.config.workflows.items():
 			run_opts = self.run_opts.copy()
+			run_opts['no_poll'] = True
 			opts = merge_opts(scan_opts, workflow_opts, run_opts)
 			config = TemplateLoader(name=f'workflows/{name}')
 			workflow = Workflow(

{secator-0.10.1a4 → secator-0.10.1a6}/secator/runners/task.py

@@ -6,8 +6,8 @@ from celery import chain
 
 
 class Task(Runner):
+
 	default_exporters = CONFIG.tasks.exporters
-	enable_hooks = False
 
 	@classmethod
 	def delay(cls, *args, **kwargs):
@@ -37,6 +37,7 @@ class Task(Runner):
 		# Set task output types
 		self.output_types = task_cls.output_types
 		self.enable_duplicate_check = False
+		self.enable_hooks = False
 
 		# Get hooks
 		hooks = self._hooks.get(Task, {})

secator-0.10.1a6/secator/scans/__init__.py

@@ -0,0 +1,29 @@
+from secator.cli import ALL_SCANS
+from secator.runners import Scan
+
+
+class DynamicScan(Scan):
+	def __init__(self, config):
+		self.config = config
+
+	def __call__(self, targets, **kwargs):
+		hooks = kwargs.pop('hooks', {})
+		results = kwargs.pop('results', [])
+		context = kwargs.pop('context', {})
+		super().__init__(
+			config=self.config,
+			inputs=targets,
+			results=results,
+			hooks=hooks,
+			context=context,
+			run_opts=kwargs)
+		return self
+
+
+DYNAMIC_SCANS = {}
+for scan in ALL_SCANS:
+	instance = DynamicScan(scan)
+	DYNAMIC_SCANS[scan.name] = instance
+
+globals().update(DYNAMIC_SCANS)
+__all__ = list(DYNAMIC_SCANS)

secator-0.10.1a6/secator/workflows/__init__.py

@@ -0,0 +1,29 @@
+from secator.cli import ALL_WORKFLOWS
+from secator.runners import Workflow
+
+
+class DynamicWorkflow(Workflow):
+	def __init__(self, config):
+		self.config = config
+
+	def __call__(self, targets, **kwargs):
+		hooks = kwargs.pop('hooks', {})
+		results = kwargs.pop('results', [])
+		context = kwargs.pop('context', {})
+		super().__init__(
+			config=self.config,
+			inputs=targets,
+			results=results,
+			hooks=hooks,
+			context=context,
+			run_opts=kwargs)
+		return self
+
+
+DYNAMIC_WORKFLOWS = {}
+for workflow in ALL_WORKFLOWS:
+	instance = DynamicWorkflow(workflow)
+	DYNAMIC_WORKFLOWS[workflow.name] = instance
+
+globals().update(DYNAMIC_WORKFLOWS)
+__all__ = list(DYNAMIC_WORKFLOWS)

{secator-0.10.1a4 → secator-0.10.1a6}/tests/integration/test_celery.py

@@ -10,7 +10,7 @@ from celery import chain, chord
 
 from secator.celery import app, forward_results
 from secator.config import CONFIG
-from secator.utils_test import TEST_TASKS, load_fixture
+from secator.utils_test import TEST_TASKS, TEST_WORKFLOWS,load_fixture
 from secator.runners import Command
 from secator.output_types import Url
 from tests.integration.inputs import INPUTS_SCANS
@@ -24,7 +24,8 @@ OPTS = {
 	'ffuf.wordlist': load_fixture('wordlist', INTEGRATION_DIR, only_path=True),
 }
 URL_TARGETS = INPUTS_SCANS['url']
-URL_TARGETS_RESULTS_COUNT = [12, 1]
+URL_RESULTS_COUNT = [14, 1]
+TAG_RESULTS_COUNT = []
 HOST_TARGETS = INPUTS_SCANS['host']
 
 
@@ -192,4 +193,15 @@ class TestCelery(unittest.TestCase):
 		targets = [r.name for r in results if r._type == 'target']
 		urls = [r.url for r in results if r._type == 'url']
 		self.assertEqual(len(targets), len(URL_TARGETS))
-		self.assertEqual(len(urls), sum(URL_TARGETS_RESULTS_COUNT))
+		self.assertEqual(len(urls), sum(URL_RESULTS_COUNT))
+
+	def test_url_vuln_workflow(self):
+		from secator.workflows import url_vuln
+		workflow = url_vuln([t + '?id=1' for t in URL_TARGETS])
+		workflow = workflow.build_celery_workflow()
+		result = workflow.apply()
+		results = result.get()
+		targets = [r.name for r in results if r._type == 'target']
+		tags = [r.name for r in results if r._type == 'tag']
+		self.assertEqual(len(targets), 16)
+		self.assertEqual(len(tags), 6)

secator-0.10.1a4/secator/scans/__init__.py

@@ -1,28 +0,0 @@
-from secator.cli import ALL_SCANS
-
-
-def generate_class(config):
-	from secator.runners import Scan
-
-	class scan(Scan):
-		def __init__(self, inputs=[], **run_opts):
-			hooks = run_opts.pop('hooks', {})
-			results = run_opts.pop('results', [])
-			context = run_opts.pop('context', {})
-			super().__init__(
-				config=config,
-				inputs=inputs,
-				results=results,
-				run_opts=run_opts,
-				hooks=hooks,
-				context=context)
-	return scan, config.name
-
-
-DYNAMIC_SCANS = {}
-for scan in ALL_SCANS:
-	cls, name = generate_class(scan)
-	DYNAMIC_SCANS[name] = cls
-
-globals().update(DYNAMIC_SCANS)
-__all__ = list(DYNAMIC_SCANS)

secator-0.10.1a4/secator/workflows/__init__.py

@@ -1,28 +0,0 @@
-from secator.cli import ALL_WORKFLOWS
-
-
-def generate_class(config):
-	from secator.runners import Workflow
-
-	class workflow(Workflow):
-		def __init__(self, inputs=[], **run_opts):
-			hooks = run_opts.pop('hooks', {})
-			results = run_opts.pop('results', [])
-			context = run_opts.pop('context', {})
-			super().__init__(
-				config=config,
-				inputs=inputs,
-				results=results,
-				run_opts=run_opts,
-				hooks=hooks,
-				context=context)
-	return workflow, config.name
-
-
-DYNAMIC_WORKFLOWS = {}
-for workflow in ALL_WORKFLOWS:
-	cls, name = generate_class(workflow)
-	DYNAMIC_WORKFLOWS[name] = cls
-
-globals().update(DYNAMIC_WORKFLOWS)
-__all__ = list(DYNAMIC_WORKFLOWS)