secator 0.9.0__py3-none-any.whl → 0.9.1__py3-none-any.whl

secator/celery.py

@@ -1,4 +1,5 @@
 import gc
+import json
 import logging
 import sys
 import uuid
@@ -49,7 +50,7 @@ app.conf.update({
 
 	# Broker config
 	'broker_url': CONFIG.celery.broker_url,
-	'broker_transport_options': {
+	'broker_transport_options': json.loads(CONFIG.celery.broker_transport_options) if CONFIG.celery.broker_transport_options else {  # noqa: E501
 		'data_folder_in': CONFIG.dirs.celery_data,
 		'data_folder_out': CONFIG.dirs.celery_data,
 		'control_folder': CONFIG.dirs.celery_data,
@@ -62,17 +63,17 @@ app.conf.update({
 	# Result backend config
 	'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_backend_thread_safe': True,
 	'result_serializer': 'pickle',
-	# 'result_backend_transport_options': {'master_name': 'mymaster'}, # for Redis HA backend
 
 	# Task config
-	'task_acks_late': False,
+	'task_acks_late': CONFIG.celery.task_acks_late,
 	'task_compression': 'gzip',
 	'task_create_missing_queues': True,
 	'task_eager_propagates': False,
-	'task_reject_on_worker_lost': False,
+	'task_reject_on_worker_lost': CONFIG.celery.task_reject_on_worker_lost,
 	'task_routes': {
 		'secator.celery.run_workflow': {'queue': 'celery'},
 		'secator.celery.run_scan': {'queue': 'celery'},
@@ -85,10 +86,10 @@ app.conf.update({
 
 	# Worker config
 	# 'worker_direct': True,  # TODO: consider enabling this to allow routing to specific workers
-	'worker_max_tasks_per_child': 10,
+	'worker_max_tasks_per_child': CONFIG.celery.worker_max_tasks_per_child,
 	# 'worker_max_memory_per_child': 100000  # TODO: consider enabling this
 	'worker_pool_restarts': True,
-	'worker_prefetch_multiplier': 1,
+	'worker_prefetch_multiplier': CONFIG.celery.worker_prefetch_multiplier,
 	# 'worker_send_task_events': True,  # TODO: consider enabling this for Flower monitoring
 })
 app.autodiscover_tasks(['secator.hooks.mongodb'], related_name=None)

secator/cli.py

@@ -20,7 +20,7 @@ from secator.config import CONFIG, ROOT_FOLDER, Config, default_config, config_p
 from secator.decorators import OrderedGroup, register_runner
 from secator.definitions import ADDONS_ENABLED, ASCII, DEV_PACKAGE, OPT_NOT_SUPPORTED, VERSION, STATE_COLORS
 from secator.installer import ToolInstaller, fmt_health_table_row, get_health_table, get_version_info, get_distro_config
-from secator.output_types import FINDING_TYPES, Info, Error
+from secator.output_types import FINDING_TYPES, Info, Warning, Error
 from secator.report import Report
 from secator.rich import console
 from secator.runners import Command, Runner

secator/config.py

@@ -62,9 +62,15 @@ class Celery(StrictModel):
 	broker_pool_limit: int = 10
 	broker_connection_timeout: float = 4.0
 	broker_visibility_timeout: int = 3600
+	broker_transport_options: str = ""
 	override_default_logging: bool = True
 	result_backend: StrExpandHome = ''
+	result_backend_transport_options: str = ""
 	result_expires: int = 86400  # 1 day
+	task_acks_late: bool = False
+	task_reject_on_worker_lost: bool = False
+	worker_max_tasks_per_child: int = 20
+	worker_prefetch_multiplier: int = 1
 
 
 class Cli(StrictModel):

secator/tasks/bbot.py

@@ -194,7 +194,7 @@ class bbot(Command):
 			'_source': lambda x: 'bbot-' + x['module']
 		},
 		Port: {
-			'port': lambda x: int(x['data']['port']) if 'port' in x['data'] else x['data'].split(':')[-1],
+			'port': lambda x: int(x['data']['port']) if 'port' in x['data'] else int(x['data'].split(':')[-1]),
 			'ip': lambda x: [_ for _ in x['resolved_hosts'] if not _.startswith('::')][0],
 			'state': lambda x: 'OPEN',
 			'service_name': lambda x: x['data']['protocol'] if 'protocol' in x['data'] else '',

secator/tasks/wpscan.py

@@ -142,6 +142,7 @@ class wpscan(VulnHttp):
 					yield Vulnerability(
 						matched_at=target,
 						name=f'Wordpress theme - {slug} {number} outdated',
+						confidence='high',
 						severity='info'
 					)
 
@@ -171,5 +172,6 @@ class wpscan(VulnHttp):
 					yield Vulnerability(
 						matched_at=target,
 						name=f'Wordpress plugin - {slug} {number} outdated',
+						confidence='high',
 						severity='info'
 					)

{secator-0.9.0.dist-info → secator-0.9.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.9.0
+Version: 0.9.1
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues
@@ -295,12 +295,23 @@ secator install addons worker
 
 
 <details>
-    <summary>google</summary>
+    <summary>gdrive</summary>
 
 Add support for Google Drive exporter (`-o gdrive`).
 
 ```sh
-secator install addons google
+secator install addons gdrive
+```
+
+</details>
+
+<details>
+    <summary>gcs</summary>
+
+Add support for Google Cloud Storage driver (`-driver gcs`).
+
+```sh
+secator install addons gcs
 ```
 
 </details>
@@ -360,14 +371,6 @@ secator install addons build
 </details>
 
 
-### Install CVEs
-
-`secator` makes remote API calls to https://cve.circl.lu/ to get in-depth information about the CVEs it encounters.
-We provide a subcommand to download all known CVEs locally so that future lookups are made from disk instead:
-```sh
-secator install cves
-```
-
 ### Checking installation health
 
 To figure out which languages or tools are installed on your system (along with their version):

{secator-0.9.0.dist-info → secator-0.9.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 secator/.gitignore,sha256=da8MUc3hdb6Mo0WjZu2upn5uZMbXcBGvhdhTQ1L89HI,3093
 secator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-secator/celery.py,sha256=Ry-JYJzN9F4LFHOn4IXpSFgCzpM99esKiQRJh_TkHp8,9578
+secator/celery.py,sha256=oXpw480s5aN9NzAkOKumjr1Er58ere-vzcG9eCffH9I,9915
 secator/celery_utils.py,sha256=iIuCn_3YkPXCtpnbaYqpppU2TARzSDyTIYHkrRyt54s,7725
-secator/cli.py,sha256=K6TB619bk8stXHUR_OeNSkD03djWYbvlalRRJvg9R0M,43870
-secator/config.py,sha256=6wm2EErW1DuhrdKSuIEUvc2b3yBxJWyZKnocr7lIeZw,19267
+secator/cli.py,sha256=SX_SNUA6LLdG7ICpUs5iSiNYOp_DkQLGE0uuB_KSrXE,43879
+secator/config.py,sha256=L-4b-PAM_-LyhnyocM1Slvj7ocYNv7kIrvlL8fU46yw,19494
 secator/decorators.py,sha256=tjH7WodxJEBIf2CCbegmvOe8H9DKSFh4iPLEhDNGPCA,13784
 secator/definitions.py,sha256=gFtLT9fjNtX_1qkiCjNfQyCvYq07IhScsQzX4o20_SE,3084
 secator/installer.py,sha256=Q5qmGbxGmuhysEA9YovTpy-YY2TxxFskhrzSX44c42E,17971
@@ -81,7 +81,7 @@ secator/serializers/json.py,sha256=UJwAymRzjF-yBKOgz1MTOyBhQcdQg7fOKRXgmHIu8fo,4
 secator/serializers/regex.py,sha256=fh-fE0RGvKSGKByFtwmKsWriRpZR9PXZQsY9JybHBWI,489
 secator/tasks/__init__.py,sha256=yRIZf9E47aS7o6rpgAJLgJUpX2cug1ofZeq8QsxgyjU,192
 secator/tasks/_categories.py,sha256=IWyBprIUBZxflh7QfvK27Ix18M_bnquzlERqfTZohVs,13821
-secator/tasks/bbot.py,sha256=PXRf3KJBTRhkVirfZQ1BDeEyg33kY9zKk-iXWn3zo3k,7522
+secator/tasks/bbot.py,sha256=pvA435toxYBxP-Nr6DB70fe38FGl9tKg2S9dDWUW4Vo,7527
 secator/tasks/bup.py,sha256=4PM123Km3uOkMUwfdLY6J7pyCqIsbwMvOLYx7XYCAZc,3030
 secator/tasks/cariddi.py,sha256=7S92pp7tvihoz9fAiMpmcfPzEvxEJKMlk-IqAvVDISA,2906
 secator/tasks/dalfox.py,sha256=hHQgYuZ7AGQCQtcN8hSM9uPnzeq1DSr_cpOxnn7-660,1850
@@ -106,10 +106,10 @@ secator/tasks/nmap.py,sha256=Zu24sJHnlOf3NXLj3Ohi07-x7m-5Ajr5ULpNsUF-QT0,12546
 secator/tasks/nuclei.py,sha256=o677F5yv3mfIlYEpKY5_W6CT2Dlt315DuFOsCjHLE5c,4270
 secator/tasks/searchsploit.py,sha256=gvtLZbL2hzAZ07Cf0cSj2Qs0GvWK94XyHvoPFsetXu8,3321
 secator/tasks/subfinder.py,sha256=C6W5NnXT92OUB1aSS9IYseqdI3wDMAz70TOEl8X-o3U,1213
-secator/tasks/wpscan.py,sha256=dF6_dw-Qezd8DmpftGc9KpgrvIk3zDdVJW4mKUa7fe0,5527
+secator/tasks/wpscan.py,sha256=C8eW3vWfbSFrxm5iPzs3MgcagIfSs7u51QZiecYbT2Q,5577
 secator/workflows/__init__.py,sha256=ivpZHiYYlj4JqlXLRmB9cmAPUGdk8QcUrCRL34hIqEA,665
-secator-0.9.0.dist-info/METADATA,sha256=xW3FIft1SHj0C1_tfH0StwEqCBVplqlAu1ZeXuJ12kU,14849
-secator-0.9.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-secator-0.9.0.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.9.0.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.9.0.dist-info/RECORD,,
+secator-0.9.1.dist-info/METADATA,sha256=4iHzoh0Q7N665XY0GJpv3KfH6G86C0e8S6LsFEHPvIA,14723
+secator-0.9.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+secator-0.9.1.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
+secator-0.9.1.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
+secator-0.9.1.dist-info/RECORD,,