secator 0.16.4__py3-none-any.whl → 0.17.0__py3-none-any.whl

secator/celery.py

@@ -1,3 +1,4 @@
+import gc
 import json
 import logging
 import os
@@ -5,6 +6,7 @@ import os
 from time import time
 
 from celery import Celery, chord
+from celery.canvas import signature
 from celery.app import trace
 
 from rich.logging import RichHandler
@@ -61,9 +63,10 @@ app.conf.update({
 	'result_backend': CONFIG.celery.result_backend,
 	'result_expires': CONFIG.celery.result_expires,
 	'result_backend_transport_options': json.loads(CONFIG.celery.result_backend_transport_options) if CONFIG.celery.result_backend_transport_options else {},  # noqa: E501
-	'result_extended': True,
+	'result_extended': not CONFIG.addons.mongodb.enabled,
 	'result_backend_thread_safe': True,
 	'result_serializer': 'pickle',
+	'result_accept_content': ['application/x-python-serialize'],
 
 	# Task config
 	'task_acks_late': CONFIG.celery.task_acks_late,
@@ -81,6 +84,11 @@ app.conf.update({
 	'task_store_eager_result': True,
 	'task_send_sent_event': CONFIG.celery.task_send_sent_event,
 	'task_serializer': 'pickle',
+	'task_accept_content': ['application/x-python-serialize'],
+
+	# Event config
+	'event_serializer': 'pickle',
+	'event_accept_content': ['application/x-python-serialize'],
 
 	# Worker config
 	# 'worker_direct': True,  # TODO: consider enabling this to allow routing to specific workers
@@ -168,6 +176,12 @@ def run_scan(self, args=[], kwargs={}):
 
 @app.task(bind=True)
 def run_command(self, results, name, targets, opts={}):
+	# Set Celery request id in context
+	context = opts.get('context', {})
+	context['celery_id'] = self.request.id
+	context['worker_name'] = os.environ.get('WORKER_NAME', 'unknown')
+
+	# Set routing key in context
 	if IN_CELERY_WORKER_PROCESS:
 		quiet = not CONFIG.cli.worker_command_verbose
 		opts.update({
@@ -179,15 +193,13 @@ def run_command(self, results, name, targets, opts={}):
 			'quiet': quiet
 		})
 		routing_key = self.request.delivery_info['routing_key']
+		context['routing_key'] = routing_key
 		debug(f'Task "{name}" running with routing key "{routing_key}"', sub='celery.state')
 
 	# Flatten + dedupe + filter results
 	results = forward_results(results)
 
-	# Set Celery request id in context
-	context = opts.get('context', {})
-	context['celery_id'] = self.request.id
-	context['worker_name'] = os.environ.get('WORKER_NAME', 'unknown')
+	# Set task opts
 	opts['context'] = context
 	opts['results'] = results
 	opts['sync'] = True
@@ -204,10 +216,13 @@ def run_command(self, results, name, targets, opts={}):
 	# Chunk task if needed
 	if chunk_it:
 		if IN_CELERY_WORKER_PROCESS:
-			console.print(Info(message=f'Task {name} requires chunking, breaking into {len(targets)} tasks'))
-		tasks = break_task(task, opts, results=results)
+			console.print(Info(message=f'Task {name} requires chunking'))
+		workflow = break_task(task, opts, results=results)
+		if IN_CELERY_WORKER_PROCESS:
+			console.print(Info(message=f'Task {name} successfully broken into {len(workflow)} chunks'))
 		update_state(self, task, force=True)
-		return self.replace(tasks)
+		console.print(Info(message=f'Task {name} updated state, replacing task with Celery chord workflow'))
+		return replace(self, workflow)
 
 	# Update state live
 	for _ in task:
@@ -240,7 +255,8 @@ def forward_results(results):
 		console.print(Info(message=f'Deduplicating {len(results)} results'))
 
 	results = flatten(results)
-	if CONFIG.addons.mongodb.enabled:
+	if IN_CELERY_WORKER_PROCESS and CONFIG.addons.mongodb.enabled:
+		console.print(Info(message=f'Extracting uuids from {len(results)} results'))
 		uuids = [r._uuid for r in results if hasattr(r, '_uuid')]
 		uuids.extend([r for r in results if isinstance(r, str)])
 		results = list(set(uuids))
@@ -271,12 +287,14 @@ def mark_runner_started(results, runner, enable_hooks=True):
 	if results:
 		results = forward_results(results)
 	runner.enable_hooks = enable_hooks
-	if CONFIG.addons.mongodb.enabled:
+	if IN_CELERY_WORKER_PROCESS and CONFIG.addons.mongodb.enabled:
 		from secator.hooks.mongodb import get_results
 		results = get_results(results)
 	for item in results:
 		runner.add_result(item, print=False)
 	runner.mark_started()
+	if IN_CELERY_WORKER_PROCESS and CONFIG.addons.mongodb.enabled:
+		return [r._uuid for r in runner.results]
 	return runner.results
 
 
@@ -297,12 +315,14 @@ def mark_runner_completed(results, runner, enable_hooks=True):
 	debug(f'Runner {runner.unique_name} has finished, running mark_completed', sub='celery')
 	results = forward_results(results)
 	runner.enable_hooks = enable_hooks
-	if CONFIG.addons.mongodb.enabled:
+	if IN_CELERY_WORKER_PROCESS and CONFIG.addons.mongodb.enabled:
 		from secator.hooks.mongodb import get_results
 		results = get_results(results)
 	for item in results:
 		runner.add_result(item, print=False)
 	runner.mark_completed()
+	if IN_CELERY_WORKER_PROCESS and CONFIG.addons.mongodb.enabled:
+		return [r._uuid for r in runner.results]
 	return runner.results
 
 
@@ -322,6 +342,52 @@ def is_celery_worker_alive():
 	return result
 
 
+def replace(task_instance, sig):
+	"""Replace this task, with a new task inheriting the task id.
+
+	Execution of the host task ends immediately and no subsequent statements
+	will be run.
+
+	.. versionadded:: 4.0
+
+	Arguments:
+		sig (Signature): signature to replace with.
+		visitor (StampingVisitor): Visitor API object.
+
+	Raises:
+		~@Ignore: This is always raised when called in asynchronous context.
+		It is best to always use ``return self.replace(...)`` to convey
+		to the reader that the task won't continue after being replaced.
+	"""
+	console.print('Replacing task')
+	chord = task_instance.request.chord
+	sig.freeze(task_instance.request.id)
+	replaced_task_nesting = task_instance.request.get('replaced_task_nesting', 0) + 1
+	sig.set(
+		chord=chord,
+		group_id=task_instance.request.group,
+		group_index=task_instance.request.group_index,
+		root_id=task_instance.request.root_id,
+		replaced_task_nesting=replaced_task_nesting
+	)
+	import psutil
+	import os
+	process = psutil.Process(os.getpid())
+	length = len(task_instance.request.chain) if task_instance.request.chain else 0
+	console.print(f'Adding {length} chain tasks from request chain')
+	for ix, t in enumerate(reversed(task_instance.request.chain or [])):
+		console.print(f'Adding chain task {t.name} from request chain ({ix + 1}/{length})')
+		chain_task = signature(t, app=task_instance.app)
+		chain_task.set(replaced_task_nesting=replaced_task_nesting)
+		sig |= chain_task
+		del chain_task
+		del t
+		memory_bytes = process.memory_info().rss
+		console.print(f'Memory usage: {memory_bytes / 1024 / 1024:.2f} MB (chain task {ix + 1}/{length})')
+	gc.collect()
+	return task_instance.on_replace(sig)
+
+
 def break_task(task, task_opts, results=[]):
 	"""Break a task into multiple of the same type."""
 	chunks = task.inputs
@@ -365,16 +431,21 @@ def break_task(task, task_opts, results=[]):
 		task_id = sig.freeze().task_id
 		full_name = f'{task.name}_{ix + 1}'
 		task.add_subtask(task_id, task.name, full_name)
-		info = Info(message=f'Celery chunked task created: {task_id}')
+		info = Info(message=f'Celery chunked task created ({ix + 1} / {len(chunks)}): {task_id}')
 		task.add_result(info)
 		sigs.append(sig)
 
 	# Mark main task as async since it's being chunked
 	task.sync = False
+	task.results = []
+	task.uuids = set()
+	console.print(Info(message=f'Task {task.unique_name} is now async, building chord with{len(sigs)} chunks'))
+	console.print(Info(message=f'Results: {results}'))
 
 	# Build Celery workflow
 	workflow = chord(
 		tuple(sigs),
 		mark_runner_completed.s(runner=task).set(queue='results')
 	)
+	console.print(Info(message=f'Task {task.unique_name} chord built with {len(sigs)} chunks, returning workflow'))
 	return workflow

secator/celery_signals.py

@@ -92,8 +92,9 @@ def task_postrun_handler(**kwargs):
 
 	# Get sender name from kwargs
 	sender_name = kwargs['sender'].name
+	# console.print(Info(message=f'Task postrun handler --> Sender name: {sender_name}'))
 
-	if CONFIG.celery.worker_kill_after_task and sender_name.startswith('secator.'):
+	if CONFIG.celery.worker_kill_after_task and (sender_name.startswith('secator.') or sender_name.startswith('api.')):
 		worker_name = os.environ.get('WORKER_NAME', 'unknown')
 		console.print(Info(message=f'Shutdown worker {worker_name} since config celery.worker_kill_after_task is set.'))
 		kill_worker(parent=True)

secator/cli.py

@@ -134,7 +134,10 @@ for config in SCANS:
 @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).')
 @click.option('--use-command-runner', is_flag=True, default=False, help='Use command runner to run the command.')
-def worker(hostname, concurrency, reload, queue, pool, quiet, loglevel, check, dev, stop, show, use_command_runner):
+@click.option('--without-gossip', is_flag=True)
+@click.option('--without-mingle', is_flag=True)
+@click.option('--without-heartbeat', is_flag=True)
+def worker(hostname, concurrency, reload, queue, pool, quiet, loglevel, check, dev, stop, show, use_command_runner, without_gossip, without_mingle, without_heartbeat):  # noqa: E501
 	"""Run a worker."""
 
 	# Check Celery addon is installed
@@ -182,6 +185,9 @@ def worker(hostname, concurrency, reload, queue, pool, quiet, loglevel, check, d
 	cmd += f' -P {pool}' if pool else ''
 	cmd += f' -c {concurrency}' if concurrency else ''
 	cmd += f' -l {loglevel}' if loglevel else ''
+	cmd += ' --without-mingle' if without_mingle else ''
+	cmd += ' --without-gossip' if without_gossip else ''
+	cmd += ' --without-heartbeat' if without_heartbeat else ''
 
 	if reload:
 		patterns = "celery.py;tasks/*.py;runners/*.py;serializers/*.py;output_types/*.py;hooks/*.py;exporters/*.py"

secator/config.py

@@ -100,6 +100,7 @@ class Security(StrictModel):
 	allow_local_file_access: bool = True
 	auto_install_commands: bool = True
 	force_source_install: bool = False
+	memory_limit_mb: int = -1
 
 
 class HTTP(StrictModel):

secator/hooks/gcs.py

@@ -14,6 +14,16 @@ ITEMS_TO_SEND = {
 	'url': ['screenshot_path', 'stored_response_path']
 }
 
+_gcs_client = None
+
+
+def get_gcs_client():
+	"""Get or create GCS client"""
+	global _gcs_client
+	if _gcs_client is None:
+		_gcs_client = storage.Client()
+	return _gcs_client
+
 
 def process_item(self, item):
 	if item._type not in ITEMS_TO_SEND.keys():
@@ -39,13 +49,15 @@ def process_item(self, item):
 def upload_blob(bucket_name, source_file_name, destination_blob_name):
 	"""Uploads a file to the bucket."""
 	start_time = time()
-	storage_client = storage.Client()
+	storage_client = get_gcs_client()
 	bucket = storage_client.bucket(bucket_name)
 	blob = bucket.blob(destination_blob_name)
-	blob.upload_from_filename(source_file_name)
+	with open(source_file_name, 'rb') as f:
+		f.seek(0)
+		blob.upload_from_file(f)
 	end_time = time()
 	elapsed = end_time - start_time
-	debug(f'in {elapsed:.4f}s', obj={'blob': 'CREATED', 'blob_name': destination_blob_name, 'bucket': bucket_name}, obj_after=False, sub='hooks.gcs', verbose=True)  # noqa: E501
+	debug(f'in {elapsed:.4f}s', obj={'blob': 'UPLOADED', 'blob_name': destination_blob_name, 'bucket': bucket_name}, obj_after=False, sub='hooks.gcs', verbose=True)  # noqa: E501
 
 
 HOOKS = {

secator/hooks/mongodb.py

@@ -30,7 +30,8 @@ def get_mongodb_client():
 		_mongodb_client = pymongo.MongoClient(
 			escape_mongodb_url(MONGODB_URL),
 			maxPoolSize=MONGODB_MAX_POOL_SIZE,
-			serverSelectionTimeoutMS=MONGODB_CONNECT_TIMEOUT
+			serverSelectionTimeoutMS=MONGODB_CONNECT_TIMEOUT,
+			connect=False
 		)
 	return _mongodb_client
 
@@ -157,89 +158,98 @@ def load_findings(objs):
 
 
 @shared_task
-def tag_duplicates(ws_id: str = None):
+def tag_duplicates(ws_id: str = None, full_scan: bool = False):
 	"""Tag duplicates in workspace.
 
 	Args:
 		ws_id (str): Workspace id.
+		full_scan (bool): If True, scan all findings, otherwise only untagged findings.
 	"""
 	debug(f'running duplicate check on workspace {ws_id}', sub='hooks.mongodb')
+	init_time = time.time()
 	client = get_mongodb_client()
 	db = client.main
-	workspace_query = list(
-		db.findings.find({'_context.workspace_id': str(ws_id), '_tagged': True}).sort('_timestamp', -1))
-	untagged_query = list(
-		db.findings.find({'_context.workspace_id': str(ws_id), '_tagged': {'$ne': True}}).sort('_timestamp', -1))
-	if not untagged_query:
-		debug('no untagged findings. Skipping.', id=ws_id, sub='hooks.mongodb')
-		return
-	debug(f'found {len(untagged_query)} untagged findings', id=ws_id, sub='hooks.mongodb')
+	start_time = time.time()
+	workspace_query = {'_context.workspace_id': str(ws_id), '_context.workspace_duplicate': False, '_tagged': True}
+	untagged_query = {'_context.workspace_id': str(ws_id), '_tagged': {'$ne': True}}
+	if full_scan:
+		del untagged_query['_tagged']
+	workspace_findings = load_findings(list(db.findings.find(workspace_query).sort('_timestamp', -1)))
+	untagged_findings = load_findings(list(db.findings.find(untagged_query).sort('_timestamp', -1)))
+	debug(
+		f'Workspace non-duplicates findings: {len(workspace_findings)}, '
+		f'Untagged findings: {len(untagged_findings)}. '
+		f'Query time: {time.time() - start_time}s',
+		sub='hooks.mongodb'
+	)
+	start_time = time.time()
+	seen = []
+	db_updates = {}
 
-	untagged_findings = load_findings(untagged_query)
-	workspace_findings = load_findings(workspace_query)
-	non_duplicates = []
-	duplicates = []
 	for item in untagged_findings:
-		# If already seen in duplicates
-		seen = [f for f in duplicates if f._uuid == item._uuid]
-		if seen:
+		if item._uuid in seen:
 			continue
 
-		# Check for duplicates
-		tmp_duplicates = []
+		debug(
+			f'Processing: {repr(item)} ({item._timestamp}) [{item._uuid}]',
+			sub='hooks.mongodb',
+			verbose=True
+		)
+
+		duplicate_ids = [
+			_._uuid
+			for _ in untagged_findings
+			if _ == item and _._uuid != item._uuid
+		]
+		seen.extend(duplicate_ids)
 
-		# Check if already present in list of workspace_findings findings, list of duplicates, or untagged_findings
-		workspace_dupes = [f for f in workspace_findings if f == item and f._uuid != item._uuid]
-		untagged_dupes = [f for f in untagged_findings if f == item and f._uuid != item._uuid]
-		seen_dupes = [f for f in duplicates if f == item and f._uuid != item._uuid]
-		tmp_duplicates.extend(workspace_dupes)
-		tmp_duplicates.extend(untagged_dupes)
-		tmp_duplicates.extend(seen_dupes)
 		debug(
-			f'for item {item._uuid}',
-			obj={
-				'workspace dupes': len(workspace_dupes),
-				'untagged dupes': len(untagged_dupes),
-				'seen dupes': len(seen_dupes)
-			},
-			id=ws_id,
+			f'Found {len(duplicate_ids)} duplicates for item',
 			sub='hooks.mongodb',
-			verbose=True)
-		tmp_duplicates_ids = list(dict.fromkeys([i._uuid for i in tmp_duplicates]))
-		debug(f'duplicate ids: {tmp_duplicates_ids}', id=ws_id, sub='hooks.mongodb', verbose=True)
-
-		# Update latest object as non-duplicate
-		if tmp_duplicates:
-			duplicates.extend([f for f in tmp_duplicates])
-			db.findings.update_one({'_id': ObjectId(item._uuid)}, {'$set': {'_related': tmp_duplicates_ids}})
-			debug(f'adding {item._uuid} as non-duplicate', id=ws_id, sub='hooks.mongodb', verbose=True)
-			non_duplicates.append(item)
-		else:
-			debug(f'adding {item._uuid} as non-duplicate', id=ws_id, sub='hooks.mongodb', verbose=True)
-			non_duplicates.append(item)
+			verbose=True
+		)
 
-	# debug(f'found {len(duplicates)} total duplicates')
+		duplicate_ws = [
+			_ for _ in workspace_findings
+			if _ == item and _._uuid != item._uuid
+		]
+		debug(f' --> Found {len(duplicate_ws)} workspace duplicates for item', sub='hooks.mongodb', verbose=True)
+
+		related_ids = []
+		if duplicate_ws:
+			duplicate_ws_ids = [_._uuid for _ in duplicate_ws]
+			duplicate_ids.extend(duplicate_ws_ids)
+			for related in duplicate_ws:
+				related_ids.extend(related._related)
+
+		debug(f' --> Found {len(duplicate_ids)} total duplicates for item', sub='hooks.mongodb', verbose=True)
+
+		db_updates[item._uuid] = {
+			'_related': duplicate_ids + related_ids,
+			'_context.workspace_duplicate': False,
+			'_tagged': True
+		}
+		for uuid in duplicate_ids:
+			db_updates[uuid] = {
+				'_context.workspace_duplicate': True,
+				'_tagged': True
+			}
+	debug(f'Finished processing untagged findings in {time.time() - start_time}s', sub='hooks.mongodb')
+	start_time = time.time()
 
-	# Update objects with _tagged and _duplicate fields
-	duplicates_ids = list(dict.fromkeys([n._uuid for n in duplicates]))
-	non_duplicates_ids = list(dict.fromkeys([n._uuid for n in non_duplicates]))
+	debug(f'Executing {len(db_updates)} database updates', sub='hooks.mongodb')
 
-	search = {'_id': {'$in': [ObjectId(d) for d in duplicates_ids]}}
-	update = {'$set': {'_context.workspace_duplicate': True, '_tagged': True}}
-	db.findings.update_many(search, update)
+	from pymongo import UpdateOne
+	if not db_updates:
+		debug('no db updates to execute', sub='hooks.mongodb')
+		return
 
-	search = {'_id': {'$in': [ObjectId(d) for d in non_duplicates_ids]}}
-	update = {'$set': {'_context.workspace_duplicate': False, '_tagged': True}}
-	db.findings.update_many(search, update)
-	debug(
-		'completed duplicates check for workspace.',
-		id=ws_id,
-		obj={
-			'processed': len(untagged_findings),
-			'duplicates': len(duplicates_ids),
-			'non-duplicates': len(non_duplicates_ids)
-		},
-		sub='hooks.mongodb')
+	result = db.findings.bulk_write(
+		[UpdateOne({'_id': ObjectId(uuid)}, {'$set': update}) for uuid, update in db_updates.items()]
+	)
+	debug(result, sub='hooks.mongodb')
+	debug(f'Finished running db update in {time.time() - start_time}s', sub='hooks.mongodb')
+	debug(f'Finished running tag duplicates in {time.time() - init_time}s', sub='hooks.mongodb')
 
 
 HOOKS = {

secator/installer.py

@@ -395,7 +395,7 @@ class GithubInstaller:
 		for root, _, files in os.walk(directory):
 			for file in files:
 				# Match the file name exactly with the repository name
-				if file == binary_name:
+				if file.startswith(binary_name):
 					return os.path.join(root, file)
 		return None
 

secator/output_types/certificate.py

@@ -26,7 +26,7 @@ class Certificate(OutputType):
 	serial_number: str = field(default='', compare=False)
 	ciphers: list[str] = field(default_factory=list, compare=False)
 	# parent_certificate: 'Certificate' = None  # noqa: F821
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='certificate', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/exploit.py

@@ -18,7 +18,7 @@ class Exploit(OutputType):
 	cves: list = field(default_factory=list, compare=False)
 	tags: list = field(default_factory=list, compare=False)
 	extra_data: dict = field(default_factory=dict, compare=False)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='exploit', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/ip.py

@@ -18,7 +18,7 @@ class Ip(OutputType):
 	host: str = field(default='', repr=True, compare=False)
 	alive: bool = False
 	protocol: str = field(default=IpProtocol.IPv4)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='ip', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/progress.py

@@ -9,7 +9,7 @@ from secator.utils import rich_to_ansi, format_object
 class Progress(OutputType):
 	percent: int = 0
 	extra_data: dict = field(default_factory=dict)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='progress', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/record.py

@@ -12,7 +12,7 @@ class Record(OutputType):
 	type: str
 	host: str = ''
 	extra_data: dict = field(default_factory=dict, compare=False)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='record', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/stat.py

@@ -13,7 +13,7 @@ class Stat(OutputType):
 	memory: int
 	net_conns: int = field(default=None, repr=True)
 	extra_data: dict = field(default_factory=dict)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='stat', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/state.py

@@ -12,7 +12,7 @@ class State(OutputType):
 	task_id: str
 	state: str
 	_type: str = field(default='state', repr=True)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)
 	_context: dict = field(default_factory=dict, repr=True, compare=False)

secator/output_types/subdomain.py

@@ -13,7 +13,7 @@ class Subdomain(OutputType):
 	domain: str
 	sources: List[str] = field(default_factory=list, compare=False)
 	extra_data: dict = field(default_factory=dict, compare=False)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='subdomain', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/tag.py

@@ -11,7 +11,7 @@ class Tag(OutputType):
 	match: str
 	extra_data: dict = field(default_factory=dict, repr=True, compare=False)
 	stored_response_path: str = field(default='', compare=False)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='tag', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/target.py

@@ -9,7 +9,7 @@ from secator.utils import autodetect_type, rich_to_ansi, rich_escape as _s
 class Target(OutputType):
 	name: str
 	type: str = ''
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='target', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/user_account.py

@@ -13,7 +13,7 @@ class UserAccount(OutputType):
 	email: str = ''
 	site_name: str = ''
 	extra_data: dict = field(default_factory=dict, compare=False)
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='user_account', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/output_types/vulnerability.py

@@ -25,7 +25,7 @@ class Vulnerability(OutputType):
 	reference: str = field(default='', compare=False)
 	confidence_nb: int = 0
 	severity_nb: int = 0
-	_source: str = field(default='', repr=True)
+	_source: str = field(default='', repr=True, compare=False)
 	_type: str = field(default='vulnerability', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
 	_uuid: str = field(default='', repr=True, compare=False)

secator/runners/command.py

@@ -18,7 +18,7 @@ from secator.config import CONFIG
 from secator.output_types import Info, Warning, Error, Stat
 from secator.runners import Runner
 from secator.template import TemplateLoader
-from secator.utils import debug, rich_escape as _s
+from secator.utils import debug, rich_escape as _s, signal_to_name
 
 
 logger = logging.getLogger(__name__)
@@ -440,6 +440,7 @@ class Command(Runner):
 			# Output and results
 			self.return_code = 0
 			self.killed = False
+			self.memory_limit_mb = CONFIG.security.memory_limit_mb
 
 			# Run the command using subprocess
 			env = os.environ
@@ -449,6 +450,7 @@ class Command(Runner):
 				stdout=subprocess.PIPE,
 				stderr=subprocess.STDOUT,
 				universal_newlines=True,
+				preexec_fn=os.setsid,
 				shell=self.shell,
 				env=env,
 				cwd=self.cwd)
@@ -473,6 +475,11 @@ class Command(Runner):
 		except FileNotFoundError as e:
 			yield from self.handle_file_not_found(e)
 
+		except MemoryError as e:
+			self.debug(f'{self.unique_name}: {type(e).__name__}.', sub='end')
+			self.stop_process(exit_ok=True, sig=signal.SIGTERM)
+			yield Warning(message=f'Memory limit {self.memory_limit_mb}MB reached for {self.unique_name}')
+
 		except BaseException as e:
 			self.debug(f'{self.unique_name}: {type(e).__name__}.', sub='end')
 			self.stop_process()
@@ -527,7 +534,7 @@ class Command(Runner):
 		if self.last_updated_stat and (time() - self.last_updated_stat) < CONFIG.runners.stat_update_frequency:
 			return
 
-		yield from self.stats()
+		yield from self.stats(self.memory_limit_mb)
 		self.last_updated_stat = time()
 
 	def print_description(self):
@@ -565,26 +572,31 @@ class Command(Runner):
 			error = Error.from_exception(exc)
 		yield error
 
-	def stop_process(self, exit_ok=False):
+	def stop_process(self, exit_ok=False, sig=signal.SIGINT):
 		"""Sends SIGINT to running process, if any."""
 		if not self.process:
 			return
-		self.debug(f'Sending SIGINT to process {self.process.pid}.', sub='error')
-		self.process.send_signal(signal.SIGINT)
+		self.debug(f'Sending signal {signal_to_name(sig)} to process {self.process.pid}.', sub='error')
+		if self.process and self.process.pid:
+			os.killpg(os.getpgid(self.process.pid), sig)
 		if exit_ok:
 			self.exit_ok = True
 
-	def stats(self):
+	def stats(self, memory_limit_mb=None):
 		"""Gather stats about the current running process, if any."""
 		if not self.process or not self.process.pid:
 			return
 		proc = psutil.Process(self.process.pid)
 		stats = Command.get_process_info(proc, children=True)
+		total_mem = 0
 		for info in stats:
 			name = info['name']
 			pid = info['pid']
 			cpu_percent = info['cpu_percent']
 			mem_percent = info['memory_percent']
+			mem_rss = round(info['memory_info']['rss'] / 1024 / 1024, 2)
+			total_mem += mem_rss
+			self.debug(f'{name} {pid} {mem_rss}MB', sub='stats')
 			net_conns = info.get('net_connections') or []
 			extra_data = {k: v for k, v in info.items() if k not in ['cpu_percent', 'memory_percent', 'net_connections']}
 			yield Stat(
@@ -595,6 +607,9 @@ class Command(Runner):
 				net_conns=len(net_conns),
 				extra_data=extra_data
 			)
+		self.debug(f'Total mem: {total_mem}MB, memory limit: {memory_limit_mb}', sub='stats')
+		if memory_limit_mb and memory_limit_mb != -1 and total_mem > memory_limit_mb:
+			raise MemoryError(f'Memory limit {memory_limit_mb}MB reached for {self.unique_name}')
 
 	@staticmethod
 	def get_process_info(process, children=False):

secator/tasks/_categories.py

@@ -96,6 +96,20 @@ class HttpFuzzer(Command):
 	meta_opts = {k: OPTS[k] for k in OPTS_HTTP_FUZZERS}
 	input_types = [URL]
 	output_types = [Url]
+	profile = lambda opts: HttpFuzzer.dynamic_profile(opts)  # noqa: E731
+
+	@staticmethod
+	def dynamic_profile(opts):
+		wordlist = HttpFuzzer._get_opt_value(
+			opts,
+			'wordlist',
+			opts_conf=dict(HttpFuzzer.opts, **HttpFuzzer.meta_opts),
+			opt_aliases=opts.get('aliases', []),
+			preprocess=True,
+			process=True,
+		)
+		wordlist_size_mb = os.path.getsize(wordlist) / (1024 * 1024)
+		return 'cpu' if wordlist_size_mb > 5 else 'io'
 
 
 #----------------#

secator/tasks/cariddi.py

@@ -31,6 +31,7 @@ class cariddi(HttpCrawler):
 	input_types = [URL]
 	output_types = [Url, Tag]
 	tags = ['url', 'crawl']
+	input_chunk_size = 1
 	input_flag = OPT_PIPE_INPUT
 	file_flag = OPT_PIPE_INPUT
 	json_flag = '-json'
@@ -77,7 +78,42 @@ class cariddi(HttpCrawler):
 	proxychains = False
 	proxy_socks5 = True  # with leaks... https://github.com/edoardottt/cariddi/issues/122
 	proxy_http = True  # with leaks... https://github.com/edoardottt/cariddi/issues/122
-	profile = 'cpu'
+	profile = lambda opts: cariddi.dynamic_profile(opts)  # noqa: E731
+
+	@staticmethod
+	def dynamic_profile(opts):
+		juicy_endpoints = cariddi._get_opt_value(
+			opts,
+			'juicy_endpoints',
+			opts_conf=dict(cariddi.opts, **cariddi.meta_opts),
+			opt_aliases=opts.get('aliases', [])
+		)
+		juicy_extensions = cariddi._get_opt_value(
+			opts,
+			'juicy_extensions',
+			opts_conf=dict(cariddi.opts, **cariddi.meta_opts),
+			opt_aliases=opts.get('aliases', [])
+		)
+		info = cariddi._get_opt_value(
+			opts,
+			'info',
+			opts_conf=dict(cariddi.opts, **cariddi.meta_opts),
+			opt_aliases=opts.get('aliases', [])
+		)
+		secrets = cariddi._get_opt_value(
+			opts,
+			'secrets',
+			opts_conf=dict(cariddi.opts, **cariddi.meta_opts),
+			opt_aliases=opts.get('aliases', [])
+		)
+		errors = cariddi._get_opt_value(
+			opts,
+			'errors',
+			opts_conf=dict(cariddi.opts, **cariddi.meta_opts),
+			opt_aliases=opts.get('aliases', [])
+		)
+		hunt = juicy_endpoints or (juicy_extensions is not None) or info or secrets or errors
+		return 'cpu' if hunt is True else 'io'
 
 	@staticmethod
 	def on_json_loaded(self, item):

secator/tasks/dalfox.py

@@ -26,8 +26,8 @@ class dalfox(VulnHttp):
 	tags = ['url', 'fuzz']
 	input_flag = 'url'
 	input_chunk_size = 20
+	ignore_return_code = True
 	file_flag = 'file'
-	# input_chunk_size = 1
 	json_flag = '--format jsonl'
 	version_flag = 'version'
 	opt_prefix = '--'
@@ -57,7 +57,7 @@ class dalfox(VulnHttp):
 		}
 	}
 	install_version = 'v2.11.0'
-	install_cmd = 'go install -v github.com/hahwul/dalfox/v2@latest'
+	install_cmd = 'go install -v github.com/hahwul/dalfox/v2@[install_version]'
 	install_github_handle = 'hahwul/dalfox'
 	encoding = 'ansi'
 	proxychains = False

secator/tasks/dirsearch.py

@@ -62,7 +62,6 @@ class dirsearch(HttpFuzzer):
 	proxychains = True
 	proxy_socks5 = True
 	proxy_http = True
-	profile = 'io'
 
 	@staticmethod
 	def on_init(self):

secator/tasks/feroxbuster.py

@@ -75,7 +75,6 @@ class feroxbuster(HttpFuzzer):
 	proxychains = False
 	proxy_socks5 = True
 	proxy_http = True
-	profile = 'io'
 
 	@staticmethod
 	def on_start(self):

secator/tasks/ffuf.py

@@ -84,7 +84,6 @@ class ffuf(HttpFuzzer):
 	proxychains = False
 	proxy_socks5 = True
 	proxy_http = True
-	profile = 'io'
 
 	@staticmethod
 	def before_init(self):

secator/tasks/katana.py

@@ -17,6 +17,7 @@ from secator.tasks._categories import HttpCrawler
 class katana(HttpCrawler):
 	"""Next-generation crawling and spidering framework."""
 	cmd = 'katana'
+	input_chunk_size = 1
 	input_types = [URL]
 	output_types = [Url]
 	tags = ['url', 'crawl']
@@ -144,6 +145,8 @@ class katana(HttpCrawler):
 		if store_responses and os.path.exists(item.stored_response_path):
 			with open(item.stored_response_path, 'r', encoding='latin-1') as fin:
 				data = fin.read().splitlines(True)
+				if not data:
+					return item
 				first_line = data[0]
 			with open(item.stored_response_path, 'w', encoding='latin-1') as fout:
 				fout.writelines(data[1:])

secator/tasks/naabu.py

@@ -38,8 +38,7 @@ class naabu(ReconPort):
 		# 'health_check': 'hc'
 	}
 	opt_value_map = {
-		TIMEOUT: lambda x: int(x*1000) if x and x > 0 else None,  # convert to milliseconds
-		RETRIES: lambda x: 1 if x == 0 else x,
+		TIMEOUT: lambda x: int(x)*1000 if x and int(x) > 0 else None,  # convert to milliseconds
 		PROXY: lambda x: x.replace('socks5://', '')
 	}
 	item_loaders = [JSONSerializer()]

secator/tasks/nuclei.py

@@ -20,6 +20,7 @@ class nuclei(VulnMulti):
 	file_flag = '-l'
 	input_flag = '-u'
 	json_flag = '-jsonl'
+	input_chunk_size = 20
 	opts = {
 		'bulk_size': {'type': int, 'short': 'bs', 'help': 'Maximum number of hosts to be analyzed in parallel per template'},  # noqa: E501
 		'debug': {'type': str, 'help': 'Debug mode'},
@@ -31,6 +32,7 @@ class nuclei(VulnMulti):
 		'new_templates': {'type': str, 'short': 'nt', 'help': 'Run only new templates added in latest nuclei-templates release'},  # noqa: E501
 		'automatic_scan': {'is_flag': True, 'short': 'as', 'help': 'Automatic web scan using wappalyzer technology detection to tags mapping'},  # noqa: E501
 		'omit_raw': {'is_flag': True, 'short': 'or', 'default': True, 'help': 'Omit requests/response pairs in the JSON, JSONL, and Markdown outputs (for findings only)'},  # noqa: E501
+		'response_size_read': {'type': int, 'help': 'Max body size to read (bytes)'},
 		'stats': {'is_flag': True, 'short': 'stats', 'default': True, 'help': 'Display statistics about the running scan'},
 		'stats_json': {'is_flag': True, 'short': 'sj', 'default': True, 'help': 'Display statistics in JSONL(ines) format'},
 		'stats_interval': {'type': str, 'short': 'si', 'help': 'Number of seconds to wait between showing a statistics update'},  # noqa: E501
@@ -52,7 +54,8 @@ class nuclei(VulnMulti):
 		# nuclei opts
 		'exclude_tags': 'exclude-tags',
 		'exclude_severity': 'exclude-severity',
-		'templates': 't'
+		'templates': 't',
+		'response_size_read': 'rsr'
 	}
 	opt_value_map = {
 		'tags': lambda x: ','.join(x) if isinstance(x, list) else x,

secator/utils.py

@@ -6,6 +6,7 @@ import json
 import logging
 import operator
 import os
+import signal
 import tldextract
 import re
 import select
@@ -823,3 +824,11 @@ def get_versions_from_string(string):
 	if not matches:
 		return []
 	return matches
+
+
+def signal_to_name(signum):
+	"""Convert a signal number to its name"""
+	for name, value in vars(signal).items():
+		if name.startswith('SIG') and not name.startswith('SIG_') and value == signum:
+			return name
+	return str(signum)

{secator-0.16.4.dist-info → secator-0.17.0.dist-info}/METADATA

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

@@ -1,23 +1,23 @@
 secator/.gitignore,sha256=da8MUc3hdb6Mo0WjZu2upn5uZMbXcBGvhdhTQ1L89HI,3093
 secator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-secator/celery.py,sha256=st9wpAwilYk5BCO18wscGt0vqQdCIP4Pynw_9RcvWec,11246
-secator/celery_signals.py,sha256=R4ZNBPKSxUvesGCvZ7MXoRkWNOTMS5hraZzjLh5sQ0o,4191
+secator/celery.py,sha256=UeF1MGz4UCZ0xH6S-8GsXF0GnYWkMColWkwh8_48olI,14214
+secator/celery_signals.py,sha256=chWicrTmvh2ioMXRm43r1zN09wrhWnw3Kc4mWDUY55s,4314
 secator/celery_utils.py,sha256=vhL5ZxXDn3ODvyVxMijKyUTJ1dOisMDjF_PhFUyOVSA,9451
-secator/cli.py,sha256=lzgttr8-Hib1X6bGi8PCOfX90incum7ZFR5x46cDZ34,60887
+secator/cli.py,sha256=zmaMa-RhN3ENAPcfltTwUEE3Dobg9kKeVGTxsMN1v1g,61267
 secator/cli_helper.py,sha256=EJFl80fd1HcgMYbmiddMZssCD32YDiFLnr-UbLp61aQ,13720
 secator/click.py,sha256=pg7XPI7-wAhhEhd4aeAC8vHSqKi-H0zeFRlh0T-ayYg,2662
-secator/config.py,sha256=4bZ5i5NuAhLDv4hYr9tXwnwavAZMd_P8YAt8_4YB6gQ,20778
+secator/config.py,sha256=6CjGLMNNFWg1PAvW16v8SGceyngFs2SCEKjJhV2NtOU,20805
 secator/cve.py,sha256=j47VOGyZjOvCY_xwVYS9fiXQPKHL5bPRtCnVAmbQthE,21356
 secator/decorators.py,sha256=uygU8MguxEO0BKXRvF4Nn2QEDnjqdIer8ReBj_j9ALg,88
 secator/definitions.py,sha256=sJaR9e_4aEgAo7cVzYQcD2lotXQPN_3lze_qWhKvo1M,3275
-secator/installer.py,sha256=oWHzUXrEp8D6oPiFHjWcOvDjqMLRhftB7kG-OcCg7PY,21120
+secator/installer.py,sha256=-gw6jSCCezuRgKdrlKYYK7UIORP4OWyx69bohM-8tfc,21129
 secator/loader.py,sha256=fR0oAdBgZlII8guOmSs_htQq917mUZZIiAzf0fvUq0Y,4139
 secator/report.py,sha256=4lEjW_GzDgsPBe1eQHX4ntcHWs0nsAMIbrNMw0UfWHc,4025
 secator/rich.py,sha256=jITAXV_Wgj32Q7FfkssDN-DMD8TxK1wwlrIlkaCNc70,3960
 secator/template.py,sha256=vLp-4cmg05YDKyvqmPtKoclH-b_NamRKvr_qprIPSGA,9905
 secator/thread.py,sha256=EqilUiqunUmVLHvZQiPl7GUYXHXVneDpI8crhqKKT_4,562
 secator/tree.py,sha256=zxZ1rXE5jzipyNNUVuTDoeq35qA-7h5yAZ4mE230ZUQ,7000
-secator/utils.py,sha256=TUVUjVNbKfp1vCItP8-PjWIUi1DBrCDr_kJXWFbZocg,21929
+secator/utils.py,sha256=NIfmFO_V2_wn3tjFhC-lFIldq1HDXDNgwWKB9B0x-40,22174
 secator/utils_test.py,sha256=cI8JRhKhgq9X5c8Lvvhs-T_C2UxxHY1wexVo4qBStS4,10131
 secator/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 secator/configs/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,32 +57,32 @@ secator/exporters/json.py,sha256=1ZtDf8RksPO_V0zIvnwDUxMUb630DCElAMM8_RQvyAo,474
 secator/exporters/table.py,sha256=zYNmwNGEyB6dTJ1ATVkrv-AOuPjrW6tvk1_4naLQo8Q,1114
 secator/exporters/txt.py,sha256=t_FykaJOxs4UUlqiH4k6HCccEqYqc8e3iNZndL_CKPg,739
 secator/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-secator/hooks/gcs.py,sha256=CNQmDWbwnIA1mDhzwO75P8907lAFd5-vA2sJVMbhAiY,1514
-secator/hooks/mongodb.py,sha256=fCm_E1hxgSl9C6l4eGW8J-Jjstvbfy9daITWYcmNTe8,8198
+secator/hooks/gcs.py,sha256=sQ_1O16aPMrjwa_pVMOTw7g_4oQ2cSJpfc7MQJUOpb8,1724
+secator/hooks/mongodb.py,sha256=tHBuHwO8wejShV7FLHK5jVNRyw_fZ52vfvqqRrkkjlU,7955
 secator/output_types/__init__.py,sha256=CJcYy2_Ek-opKiBz4wFlDHQBTm3t0JVwZ4w_2Jxoeuw,1291
 secator/output_types/_base.py,sha256=9iBqPdtlfJBldBiuC729KamHHGbKhwo69P-2UNwz-3Q,2874
-secator/output_types/certificate.py,sha256=IXW3GN0JRmuDgoedr8NV8ccuRQOuoInNZWnAKL8zeqY,3040
+secator/output_types/certificate.py,sha256=Y6Lv1nI73zEIZt13n6yQwArgol3Z-p8sUInbj73Gs3c,3055
 secator/output_types/error.py,sha256=lA7DDNUb8iuw3nbanzMD0BjQjOEwUEQPAMZy_9sRs9o,1540
-secator/output_types/exploit.py,sha256=-BKTqPBg94rVgjw8YSmcYuBCI2x-73WwMd9ITP9qr3Y,1750
+secator/output_types/exploit.py,sha256=TwRqaIvoTSSsXahz3ZSZC1XLGMiml0jiTIWdSTXFicA,1765
 secator/output_types/info.py,sha256=HcOwdF4OPw3Qni_X0c8bDSLqq2LZLMjIwwLgtEwBwHE,820
-secator/output_types/ip.py,sha256=wH06b0-_F4_7g0Bcfdh7EpDW50IdjESQoqZHPuVK0hg,1217
+secator/output_types/ip.py,sha256=rKSv6yAu9AKZ3nKBh7pzRg8eai8d1fE36vKUAMjyMJ8,1232
 secator/output_types/port.py,sha256=JdqXnEF8XuwaWFMT8Vghj7fKLwtsImuUdRfMmITgmWM,1879
-secator/output_types/progress.py,sha256=alRcuEUv-2_ExmYOEa0p2f6GIp-DerGglgI4JLdowjQ,1213
-secator/output_types/record.py,sha256=HnsKxlIhkgswA_Yjz7BZ1vDjP53l6OJ0BCOtCSDwCSY,1250
-secator/output_types/stat.py,sha256=7ZNWgfrJWONKeJx931eEFngEV4WhJaHs38AUUxxhZC8,1248
-secator/output_types/state.py,sha256=TofrVIL1oPTnq8-x6pATVVLEa7Z4GGYtUSqWmrcGxF4,981
-secator/output_types/subdomain.py,sha256=ivJ_2kmrJ8hdB8wmvRJYlKV1BcE3Cds_vAI_5wL7ES4,1344
-secator/output_types/tag.py,sha256=6oNyDWydngLt5Rj7ZIcUNbJV6EfRsw0lrPDHRdZYFKA,1641
-secator/output_types/target.py,sha256=8XTxV3YcJUb7cDSBOqtTk5e9_pf-vIQArXeJPDik5Ic,1052
+secator/output_types/progress.py,sha256=D598UDh4VBcSLetOjcd-DY1H_EVgymQXVgbMK6FE-ZY,1228
+secator/output_types/record.py,sha256=ehbJ-4rcVuFUxof5RXkYcuoh34DdnJEeFZazPQN4QKo,1265
+secator/output_types/stat.py,sha256=YpKZRP5fge42oTmlWSYEfixDPx764g-5aVBeilQM0io,1263
+secator/output_types/state.py,sha256=kY5ArRYpRVfIULj7Qt93Lx8YeeIEMa1Ke7q8vnK0Yzk,996
+secator/output_types/subdomain.py,sha256=1pWVXGKA6r7IWaBSt0TRe4tC3tEVbBsRQBettr0FEH8,1359
+secator/output_types/tag.py,sha256=4-khdI4W9tahW3G4YPh1WEWKHoOYW69M9UDtzPlrqnU,1656
+secator/output_types/target.py,sha256=gIrx-IXermWBaPfIS4CBs0PfsrfdtMsYlnduwmZe8BE,1067
 secator/output_types/url.py,sha256=rPbDek2zmvGK2mcjQfQoi6Ij7gKTyItIaDxMT04f2TE,3628
-secator/output_types/user_account.py,sha256=EvF3Ebg9eXS_-iDguU1dSHZ9wAsJimEJznDvpSt_RSY,1417
-secator/output_types/vulnerability.py,sha256=eWJDFCYf3sP5-hPKQT-4Kd5id9bJzTW2u-O_d_4P6EA,2849
+secator/output_types/user_account.py,sha256=IqPg0nfKzSsxA5DerLA3PEWIN9HscV_D7PRKoyqllU8,1432
+secator/output_types/vulnerability.py,sha256=cuS5r_BKFuO-DQlrSEiN7elmunwlu2sdC4Rt9WDa10g,2864
 secator/output_types/warning.py,sha256=iy949Aj5OXJLWif7HFB5EvjcYrgKHAzIP9ffyLTV7LA,830
 secator/runners/__init__.py,sha256=EBbOk37vkBy9p8Hhrbi-2VtM_rTwQ3b-0ggTyiD22cE,290
 secator/runners/_base.py,sha256=IkAQfPzz_kou5Pa82y-2Wmtp_lIudKMc9ix8_NP4370,40663
 secator/runners/_helpers.py,sha256=TeebZnpo4cp-9tpgPlDoFm_gmr00_CERAC1aOYhTzA4,6281
 secator/runners/celery.py,sha256=bqvDTTdoHiGRCt0FRvlgFHQ_nsjKMP5P0PzGbwfCj_0,425
-secator/runners/command.py,sha256=5fmwmqkUkomceLUSp2rtJvn_ydE2gI95rqS4WKWciYI,30200
+secator/runners/command.py,sha256=A--1cFpzHAxvzO0xvpMSyY0Tb0OZxkJc8HsJaTNsfB0,31096
 secator/runners/scan.py,sha256=axT_OmGhixogCPMUS1OUeMLnFtk8PxY7zL9NYCugFVU,2578
 secator/runners/task.py,sha256=PrkVns8UAGht2JbCmCUWycA6B39Z5oeMmAMq69KtXKI,2199
 secator/runners/workflow.py,sha256=YnpTSdmp54d55vORe4khWLSx2J7gtDFNryKfZXYAWnY,6076
@@ -92,16 +92,16 @@ secator/serializers/dataclass.py,sha256=Fo2ZVsVjSF0KMq81JT8mGZxsKsxyueShlDsh9Pgw
 secator/serializers/json.py,sha256=UJwAymRzjF-yBKOgz1MTOyBhQcdQg7fOKRXgmHIu8fo,411
 secator/serializers/regex.py,sha256=fh-fE0RGvKSGKByFtwmKsWriRpZR9PXZQsY9JybHBWI,489
 secator/tasks/__init__.py,sha256=Op0O0Aa8c124AfDG-cEB9VLRsXZ1wXTpVrT3g-wxMNg,184
-secator/tasks/_categories.py,sha256=yns_5PBKStp6TJEeaYB6yFUjkFMmLh7LEuxcNcADNro,14962
+secator/tasks/_categories.py,sha256=ZmUNzeFIZ9-_er9sLJw66PTYIL5nO799JQU3EoW-6nE,15394
 secator/tasks/arjun.py,sha256=WdRZtTCd2Ejbv5HlLS_FoWVKgGpMsR6RCDekV2kR788,3061
 secator/tasks/bbot.py,sha256=moIkwd52jCKaeg1v6Nv4Gfmd4GPObo9c9nwOzQvf-2M,9236
 secator/tasks/bup.py,sha256=9IXsCqMdhOeZcCsQB2L4IJ3Kzm2oQKDE7mflGljm0lM,3867
-secator/tasks/cariddi.py,sha256=iT-2Aryw2PPrzPedc-N_E--DxKFz_gSrcJj4z5PGQf8,4142
-secator/tasks/dalfox.py,sha256=DWz0VWBH5SU_AyHU36YC88vAEyJ1hXkKKKNXgQvwlrU,2493
-secator/tasks/dirsearch.py,sha256=_6xPZYpNsbwR4d9NFQw3NXxQKn5zyfO1lyrWzl5p7NY,2469
+secator/tasks/cariddi.py,sha256=pc1z6FWFV4dauSJxWL9BKD-MXjCo14sgcNtAkGuKy5I,5194
+secator/tasks/dalfox.py,sha256=dllEP9A8-7YaX12fGRmLMltfNjm_9Us6wYoS86C_VO0,2507
+secator/tasks/dirsearch.py,sha256=-oa2P2Pq8LjF61PguUEtjgr9rgvVpGLzRZRDXIJMswY,2453
 secator/tasks/dnsx.py,sha256=2qNC-wSjS33geuHMOwuBapLwKEvWTlDgnmvM67ZSJVA,4220
-secator/tasks/feroxbuster.py,sha256=dz_DGw_CbVGw9AeFjtrAEQwoxDgKzYC-KT9VLwE5UlE,3022
-secator/tasks/ffuf.py,sha256=UjSnbbbeBE8fIOiy98akBqaO9gBtZWb7vYrNs9DjUX8,4119
+secator/tasks/feroxbuster.py,sha256=H7_WT8B0cPIBeq7FOownpQlrZ468R07zRLqrDLNCkg8,3006
+secator/tasks/ffuf.py,sha256=L2Rb34YIH30CFJacvaY8QVF1gDah9E0nNCdgAHWL9jo,4103
 secator/tasks/fping.py,sha256=uTOq24DcNQpNgpXQlFV4xxBdn8P9gJWM5mmhkobqW-Y,1575
 secator/tasks/gau.py,sha256=SJaza2yQoMeJeE6TOCRrRv0udbwRIoiXX4gRE64GXoU,1804
 secator/tasks/gf.py,sha256=svNRzaBr_DYW3QGFoPmUBWZh0Xm07XDS2bbNH-tfcA4,1028
@@ -110,13 +110,13 @@ secator/tasks/gospider.py,sha256=5cEgBCCGWIGE05XfAkjMhTap9V-MwLK2lm1iqxcbj-M,251
 secator/tasks/grype.py,sha256=OasQs5WQwgt--o6M2_uh3RYZZaA3-difweCS46Uc5-w,2573
 secator/tasks/h8mail.py,sha256=XsDnL8LPk_jIHfJhqeYMj2423epk0NADorjd_JhBa9o,2033
 secator/tasks/httpx.py,sha256=0Umt2ouL36TELxmoaZ4dKSGXgipN3ve__IQFgUKrWZQ,6498
-secator/tasks/katana.py,sha256=NQimtCi7qgIIK6npzzm8OKZSVsBWxuj950W_4VNUa8U,6164
+secator/tasks/katana.py,sha256=10Sml1d0bO_UDwT1y_4TDQ_a0ihWKAW6L6-n8M9ArUw,6220
 secator/tasks/maigret.py,sha256=jjuyR8lAZYUybmN8SwEj3hrRB25p9xm4X_361auZK_Q,2173
 secator/tasks/mapcidr.py,sha256=tMTHQspHSs92F4R-9HVYjFBpiu9ZhxoJSNvpd8KwKKc,1057
 secator/tasks/msfconsole.py,sha256=3VjAEpwEAFDcGxyYMhKyDLHRObXELYFx_H306fzmtMw,6566
-secator/tasks/naabu.py,sha256=dI-NNb4MQzyCgnvfkstkn3IyjUpW0ORbftcsVFmx994,2443
+secator/tasks/naabu.py,sha256=Z8kYvAMeeSLrhnojLRx8GzxvwhFhDCfDj9a7r9Wbr1A,2407
 secator/tasks/nmap.py,sha256=bGfPrB_JD_XaVccUJTvMAN81cNfmWo2gI4Hd6P_ZRLI,16986
-secator/tasks/nuclei.py,sha256=F5r7DQu8XBGHn518QWs8DSKoRVEGSGGMMDTcOW5bEHk,5010
+secator/tasks/nuclei.py,sha256=ApY9oQaQZAvrFKObVQt0JxZS9ZcoLabL_lrc5Uwxl9s,5144
 secator/tasks/searchsploit.py,sha256=gwP05nLdu3yBnpMrAVu7S2CIjgCtcS3w9_1K0Tp9WBM,3503
 secator/tasks/subfinder.py,sha256=Q7YIBSyFxHWXSskmn2dEWPxU_HZ9rZCMU3Kl4sdvPwc,1297
 secator/tasks/testssl.py,sha256=rrpKerOYcNA4NJr9RQ_uAtAbl3W50FRp3bPo3yD8EEg,8787
@@ -125,8 +125,8 @@ secator/tasks/wafw00f.py,sha256=9CnV9F7ZrykO27F3PAb5HtwULDMYEKGSTbz-jh0kc2g,3189
 secator/tasks/wpprobe.py,sha256=1QPJ-7JvhL7LFvjUTAmqpH2Krp-Qmi079lonso16YPQ,3229
 secator/tasks/wpscan.py,sha256=dBkbG9EODHDUBAA8uNVULX4SdVgTCAi_F1T1oCfRbsI,5852
 secator/workflows/__init__.py,sha256=XOviyjSylZ4cuVmmQ76yuqZRdmvOEghqAnuw_4cLmfk,702
-secator-0.16.4.dist-info/METADATA,sha256=E_R6VdalGxZysqe043SuT0M_897S8cT5kXhmwOSWLpY,17253
-secator-0.16.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-secator-0.16.4.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.16.4.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.16.4.dist-info/RECORD,,
+secator-0.17.0.dist-info/METADATA,sha256=FPBlaaLaBXMP4i2-bz5q39-Z2i_LVn3ezeu-xNuC0Ro,17253
+secator-0.17.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+secator-0.17.0.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
+secator-0.17.0.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
+secator-0.17.0.dist-info/RECORD,,