secator 0.10.1a8__tar.gz → 0.10.1a9__tar.gz

{secator-0.10.1a8 → secator-0.10.1a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.10.1a8
+Version: 0.10.1a9
 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.1a8 → secator-0.10.1a9}/pyproject.toml

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

{secator-0.10.1a8 → secator-0.10.1a9}/secator/cli.py

@@ -118,11 +118,12 @@ for config in sorted(ALL_SCANS, key=lambda x: x['name']):
 @click.option('-r', '--reload', is_flag=True, help='Autoreload Celery on code changes.')
 @click.option('-Q', '--queue', type=str, default='', help='Listen to a specific queue.')
 @click.option('-P', '--pool', type=str, default='eventlet', help='Pool implementation.')
+@click.option('--quiet', is_flag=True, help='Quiet mode.')
 @click.option('--check', is_flag=True, help='Check if Celery worker is alive.')
 @click.option('--dev', is_flag=True, help='Start a worker in dev mode (celery multi).')
 @click.option('--stop', is_flag=True, help='Stop a worker in dev mode (celery multi).')
 @click.option('--show', is_flag=True, help='Show command (celery multi).')
-def worker(hostname, concurrency, reload, queue, pool, check, dev, stop, show):
+def worker(hostname, concurrency, reload, queue, pool, quiet, check, dev, stop, show):
 	"""Run a worker."""
 
 	# Check Celery addon is installed
@@ -152,6 +153,8 @@ def worker(hostname, concurrency, reload, queue, pool, check, dev, stop, show):
 
 	app_str = 'secator.celery.app'
 	celery = f'{sys.executable} -m celery'
+	if quiet:
+		celery += ' --quiet'
 
 	if dev:
 		subcmd = 'stop' if stop else 'show' if show else 'start'

{secator-0.10.1a8 → secator-0.10.1a9}/secator/runners/task.py

@@ -47,6 +47,9 @@ class Task(Runner):
 		opts['context'] = self.context.copy()
 		opts['reports_folder'] = str(self.reports_folder)
 		opts['enable_reports'] = False  # Task will handle reports
+		opts['enable_duplicate_check'] = False # Task will handle duplicate check
+		opts['has_parent'] = False
+		opts['skip_if_no_inputs'] = False
 
 		# Create task signature
 		task_id = str(uuid.uuid4())

{secator-0.10.1a8 → secator-0.10.1a9}/secator/runners/workflow.py

@@ -37,12 +37,14 @@ class Workflow(Runner):
 		# Set hooks and reports
 		self.enable_reports = True  # Workflow will handle reports
 		self.enable_hooks = False   # Celery will handle hooks
+
 		# Get hooks
 		hooks = self._hooks.get(Task, {})
 		opts['hooks'] = hooks
 		opts['context'] = self.context.copy()
 		opts['reports_folder'] = str(self.reports_folder)
 		opts['enable_reports'] = False  # Workflow will handle reports
+		opts['enable_duplicate_check'] = False  # Workflow will handle duplicate check
 		opts['has_parent'] = True
 		opts['skip_if_no_inputs'] = True
 
@@ -73,8 +75,7 @@ class Workflow(Runner):
 		Returns:
 			tuple (List[celery.Signature], List[str]): Celery signatures, Celery task ids.
 		"""
-		from celery import chain, chord
-		from secator.celery import forward_results
+		from celery import chain, group
 		sigs = []
 		for task_name, task_opts in config.items():
 			# Task opts can be None
@@ -88,7 +89,7 @@ class Workflow(Runner):
 					workflow_opts,
 					run_opts
 				)
-				sig = chord((tasks), forward_results.s().set(queue='results'))
+				sig = group(*tasks)
 			elif task_name == '_chain':
 				tasks = self.get_tasks(
 					task_opts,
@@ -107,6 +108,7 @@ class Workflow(Runner):
 
 				# Create task signature
 				task_id = str(uuid.uuid4())
+				opts['context'] = self.context.copy()
 				sig = task.s(inputs, **opts).set(queue=task.profile, task_id=task_id)
 				self.add_subtask(task_id, task_name, task_opts.get('description', ''))
 				self.output_types.extend(task.output_types)