secator 0.10.1a5__py3-none-any.whl → 0.10.1a7__py3-none-any.whl

secator/celery.py

@@ -235,6 +235,8 @@ def mark_runner_started(runner):
 	Returns:
 		list: Runner results
 	"""
+	if IN_CELERY_WORKER_PROCESS:
+		console.print(Info(message=f'Marking runner {runner.unique_name} as started'))
 	runner.started = True
 	# runner.start_time = time()
 	runner.run_hooks('on_start')
@@ -252,17 +254,20 @@ def mark_runner_complete(results, runner):
 	Returns:
 		list: Final results
 	"""
+	if IN_CELERY_WORKER_PROCESS:
+		console.print(Info(message=f'Marking runner {runner.unique_name} as completed'))
 	results = forward_results(results)
 
 	# If sync mode, don't update the runner as it's already done
 	if runner.sync:
+		if IN_CELERY_WORKER_PROCESS:
+			console.print(Info(message=f'Runner {runner.unique_name} is in sync mode, skipping final processing'))
 		return results
 
 	# Run final processing
 	runner.results = results
-	if not runner.no_process:
-		runner.mark_duplicates()
-		runner.results = runner.filter_results()
+	# if not runner.no_process:
+		# runner.mark_duplicates()
 	runner.log_results()
 	runner.run_hooks('on_end')
 	return runner.results

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,
@@ -713,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/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/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.1a5.dist-info → secator-0.10.1a7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.10.1a5
+Version: 0.10.1a7
 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.1a5.dist-info → secator-0.10.1a7.dist-info}/RECORD

@@ -1,6 +1,6 @@
 secator/.gitignore,sha256=da8MUc3hdb6Mo0WjZu2upn5uZMbXcBGvhdhTQ1L89HI,3093
 secator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-secator/celery.py,sha256=NNaLjSENWnNTUgSSW8XXni6wlTE_-2ju9dd3Exwk7bE,9663
+secator/celery.py,sha256=xxDdT_m5KIgds3nL26SmvpoOr0ZZA02NhaQvsspmzfs,9985
 secator/celery_signals.py,sha256=iumfx7tTeoavAbHijBtij0JzeIqElxQldNZtuZmFY_U,4456
 secator/celery_utils.py,sha256=bW1yzMCjfIiesU4SOVNVuy0I8HukJyh8KmNB4w0woJM,8857
 secator/cli.py,sha256=3_tTTusW12MCejFgtOeYjiedjrJpyQj_gsCK8FkTMJA,43922
@@ -69,12 +69,12 @@ secator/output_types/user_account.py,sha256=rm10somxyu30JHjj629IkR15Nhahylud_fVO
 secator/output_types/vulnerability.py,sha256=nF7OT9zGez8sZvLrkhjBOORjVi8hCqfCYUFq3eZ_ywo,2870
 secator/output_types/warning.py,sha256=47GtmG083GqGPb_R5JDFmARJ9Mqrme58UxwJhgdGPuI,853
 secator/runners/__init__.py,sha256=EBbOk37vkBy9p8Hhrbi-2VtM_rTwQ3b-0ggTyiD22cE,290
-secator/runners/_base.py,sha256=MhjvSUTY7tkNWyxwjMzmt6qA5qCFAlREujkqG_z2xIw,31264
+secator/runners/_base.py,sha256=FMqUix_6GVe5U2OT1jiQ_zbaWEieBBxtZVQfeGZKWpU,30512
 secator/runners/_helpers.py,sha256=QhJmdmFdu5XSx3LBFf4Q4Hy2EXS6bLGnJUq8G7C6f68,2410
 secator/runners/celery.py,sha256=bqvDTTdoHiGRCt0FRvlgFHQ_nsjKMP5P0PzGbwfCj_0,425
 secator/runners/command.py,sha256=9AvjZgSXctP8D-ffPCtlnXEiGqTeaD2wVGhiGNuROb0,25469
-secator/runners/scan.py,sha256=9FjDsFmQrAWfA6crWkCJaVqG3-t2HBVjcsv4UQp_9b8,1500
-secator/runners/task.py,sha256=59jPXKSxFtSNXsm6VTAz8li2jxpM0Bkcgcn77HIDCrY,1869
+secator/runners/scan.py,sha256=jKguiqlH4jw0uRGMN6GNsqgexw9T0HBIL7_4mIUo3xA,1530
+secator/runners/task.py,sha256=RXVnNLPflFC7g9u6M8u6cnB7MYVyRALmQsjCCBtk7kA,1876
 secator/runners/workflow.py,sha256=qldnRm7r_SCvRHJFkZ7eaml62RZkOeCdT18PU357grY,2982
 secator/scans/__init__.py,sha256=s4Ojsk5CWwyWqHu_A4zaXUL5Hm5L5nCmCHZn7wdD3Io,623
 secator/serializers/__init__.py,sha256=OP5cmFl77ovgSCW_IDcZ21St2mUt5UK4QHfrsK2KvH8,248
@@ -110,8 +110,8 @@ secator/tasks/searchsploit.py,sha256=gvtLZbL2hzAZ07Cf0cSj2Qs0GvWK94XyHvoPFsetXu8
 secator/tasks/subfinder.py,sha256=C6W5NnXT92OUB1aSS9IYseqdI3wDMAz70TOEl8X-o3U,1213
 secator/tasks/wpscan.py,sha256=036ywiEqZfX_Bt071U7qIm7bi6pNk7vodflmuslJurA,5550
 secator/workflows/__init__.py,sha256=R_TTyjg9f2Ph2_LYiF0lL07IjTrfRE_zqJzy-N7_WCk,675
-secator-0.10.1a5.dist-info/METADATA,sha256=oZnZtXatOa_oqR8f816Hc-0-Re2uouxu0mgHa-vLNyk,14726
-secator-0.10.1a5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-secator-0.10.1a5.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.10.1a5.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.10.1a5.dist-info/RECORD,,
+secator-0.10.1a7.dist-info/METADATA,sha256=dhleA9gO-4uZqLlfteBXhfVKSMIZASymP9wyu8QatkM,14726
+secator-0.10.1a7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+secator-0.10.1a7.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
+secator-0.10.1a7.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
+secator-0.10.1a7.dist-info/RECORD,,