secator 0.3.4__tar.gz → 0.3.6__tar.gz

{secator-0.3.4 → secator-0.3.6}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.3.6](https://github.com/freelabz/secator/compare/v0.3.5...v0.3.6) (2024-04-17)
+
+
+### Bug Fixes
+
+* broken reports folder on remote workers ([#307](https://github.com/freelabz/secator/issues/307)) ([9a7a1f1](https://github.com/freelabz/secator/commit/9a7a1f1c449c688701b02be66e98d3434073bbb0))
+* searchsploit install ([#306](https://github.com/freelabz/secator/issues/306)) ([040cfaf](https://github.com/freelabz/secator/commit/040cfaf6968ae120241fdd6a74a9a6cd5fa0631d))
+
+## [0.3.5](https://github.com/freelabz/secator/compare/v0.3.4...v0.3.5) (2024-04-17)
+
+
+### Bug Fixes
+
+* Celery control folder ([#298](https://github.com/freelabz/secator/issues/298)) ([3cbc0a3](https://github.com/freelabz/secator/commit/3cbc0a37d06c9b3a20eb0005b1cb68b484d22d15))
+* remove pkg_resources in favor of packaging ([#304](https://github.com/freelabz/secator/issues/304)) ([6cf478c](https://github.com/freelabz/secator/commit/6cf478c1f1c4b7363d1710e634686ede8a209594))
+* typo in `requires-python` in pyproject.toml ([#303](https://github.com/freelabz/secator/issues/303)) ([7a7766c](https://github.com/freelabz/secator/commit/7a7766caba0faa98406764fa1bb5ad2eae346302))
+
+
+### Documentation
+
+* update README.md ([8f1b1c1](https://github.com/freelabz/secator/commit/8f1b1c1cb852a88d80aa15379962aaa36afc7635))
+* update SECURITY.md ([6518dd6](https://github.com/freelabz/secator/commit/6518dd646c0358e661e186edf28b4fb0494bf712))
+
 ## [0.3.4](https://github.com/freelabz/secator/compare/v0.3.3...v0.3.4) (2024-04-15)
 
 

{secator-0.3.4 → secator-0.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: secator
-Version: 0.3.4
+Version: 0.3.6
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues
@@ -18,6 +18,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.8
 Requires-Dist: bs4<1
 Requires-Dist: celery<6
 Requires-Dist: cpe<2
@@ -27,6 +28,7 @@ Requires-Dist: furl<3
 Requires-Dist: humanize<5
 Requires-Dist: ifaddr<1
 Requires-Dist: jinja2<4
+Requires-Dist: packaging<25
 Requires-Dist: python-dotenv<2
 Requires-Dist: pyyaml<7
 Requires-Dist: requests<3
@@ -175,14 +177,14 @@ wget -O - https://raw.githubusercontent.com/freelabz/secator/main/scripts/instal
 	<summary>Docker</summary>
 
 ```sh
-docker run -it --rm --net=host freelabz/secator -v "$HOME/.secator:/root/.secator" --help
+docker run -it --rm --net=host -v $HOME/.secator:/root/.secator freelabz/secator --help
 ```
 
 The volume mount `-v` is necessary to save all `secator` reports to your host machine.
 
 You can set up an alias to facilitate running `secator` from Docker:
 ```sh
-alias secator="docker run -it --rm --net=host freelabz/secator -v $HOME/.secator:/root/.secator"
+alias secator="docker run -it --rm --net=host -v $HOME/.secator:/root/.secator freelabz/secator"
 secator --help
 ```
 

{secator-0.3.4 → secator-0.3.6}/README.md

@@ -116,14 +116,14 @@ wget -O - https://raw.githubusercontent.com/freelabz/secator/main/scripts/instal
 	<summary>Docker</summary>
 
 ```sh
-docker run -it --rm --net=host freelabz/secator -v "$HOME/.secator:/root/.secator" --help
+docker run -it --rm --net=host -v $HOME/.secator:/root/.secator freelabz/secator --help
 ```
 
 The volume mount `-v` is necessary to save all `secator` reports to your host machine.
 
 You can set up an alias to facilitate running `secator` from Docker:
 ```sh
-alias secator="docker run -it --rm --net=host freelabz/secator -v $HOME/.secator:/root/.secator"
+alias secator="docker run -it --rm --net=host -v $HOME/.secator:/root/.secator freelabz/secator"
 secator --help
 ```
 

secator-0.3.6/SECURITY.md

@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.0.x   | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+To report a new vulnerability, please open an issue with the title "security: report <issue_name>".

{secator-0.3.4 → secator-0.3.6}/pyproject.toml

@@ -4,11 +4,11 @@ build-backend = "hatchling.build"
 
 [project]
 name = "secator"
-version = "0.3.4"
+version = "0.3.6"
 authors = [{ name = "FreeLabz", email = "sales@freelabz.com" }]
 readme = "README.md"
 description = "The pentester's swiss knife."
-requires_python = ">=3.8"
+requires-python = ">=3.8"
 keywords = [
   'cybersecurity',
   'recon',
@@ -39,6 +39,7 @@ dependencies = [
   "humanize < 5",
   "ifaddr < 1",
   "jinja2 < 4",
+  "packaging < 25",
   "python-dotenv < 2",
   "pyyaml < 7",
   "requests < 3",

{secator-0.3.4 → secator-0.3.6}/secator/celery.py

@@ -53,6 +53,7 @@ app.conf.update({
 	'broker_transport_options': {
 		'data_folder_in': CELERY_DATA_FOLDER,
 		'data_folder_out': CELERY_DATA_FOLDER,
+		'control_folder': CELERY_DATA_FOLDER,
 		'visibility_timeout': CELERY_BROKER_VISIBILITY_TIMEOUT,
 	},
 	'broker_connection_retry_on_startup': True,
@@ -416,6 +417,6 @@ def is_celery_worker_alive():
 	result = bool(result)
 	if result:
 		console.print('Celery worker is alive !', style='bold green')
-	# else:
-		# console.print('No Celery worker alive.', style='bold red')
+	else:
+		console.print('No Celery worker alive.', style='bold orange1')
 	return result

{secator-0.3.4 → secator-0.3.6}/secator/decorators.py

@@ -24,7 +24,6 @@ RUNNER_OPTS = {
 
 RUNNER_GLOBAL_OPTS = {
 	'sync': {'is_flag': True, 'help': 'Run tasks synchronously (automatic if no worker is alive)'},
-	'worker': {'is_flag': True, 'help': 'Run tasks in worker (automatic if worker is alive)'},
 	'proxy': {'type': str, 'help': 'HTTP proxy'},
 	'driver': {'type': str, 'help': 'Export real-time results. E.g: "mongodb"'}
 	# 'debug': {'type': int, 'default': 0, 'help': 'Debug mode'},
@@ -264,7 +263,6 @@ def register_runner(cli_endpoint, config):
 	def func(ctx, **opts):
 		opts.update(fmt_opts)
 		sync = opts['sync']
-		worker = opts['worker']
 		# debug = opts['debug']
 		ws = opts.pop('workspace')
 		driver = opts.pop('driver', '')
@@ -275,13 +273,22 @@ def register_runner(cli_endpoint, config):
 		# opts.update(unknown_opts)
 		targets = opts.pop(input_type)
 		targets = expand_input(targets)
-		if sync or show or not ADDONS_ENABLED['worker']:
+		if sync or show:
 			sync = True
-		elif worker:
-			sync = False
-		else:  # automatically run in worker if it's alive
+		else:
 			from secator.celery import is_celery_worker_alive
-			sync = not is_celery_worker_alive()
+			worker_alive = is_celery_worker_alive()
+			if not worker_alive:
+				sync = True
+			else:
+				sync = False
+				from secator.definitions import CELERY_BROKER_URL, CELERY_RESULT_BACKEND
+				broker_protocol = CELERY_BROKER_URL.split('://')[0]
+				backend_protocol = CELERY_RESULT_BACKEND.split('://')[0]
+				if CELERY_BROKER_URL:
+					if (broker_protocol == 'redis' or backend_protocol == 'redis') and not ADDONS_ENABLED['redis']:
+						_get_rich_console().print('[bold red]Missing `redis` addon: please run `secator install addons redis`[/].')
+						sys.exit(1)
 		opts['sync'] = sync
 		opts.update({
 			'print_item': not sync,
@@ -293,8 +300,8 @@ def register_runner(cli_endpoint, config):
 		# Build hooks from driver name
 		hooks = {}
 		if driver == 'mongodb':
-			if not ADDONS_ENABLED['mongo']:
-				_get_rich_console().print('[bold red]Missing MongoDB dependencies: please run `secator install addons mongodb`[/].')
+			if not ADDONS_ENABLED['mongodb']:
+				_get_rich_console().print('[bold red]Missing `mongodb` addon: please run `secator install addons mongodb`[/].')
 				sys.exit(1)
 			from secator.hooks.mongodb import MONGODB_HOOKS
 			hooks = MONGODB_HOOKS

{secator-0.3.4 → secator-0.3.6}/secator/definitions.py

@@ -4,14 +4,14 @@ import os
 import requests
 
 from dotenv import find_dotenv, load_dotenv
-from pkg_resources import get_distribution
+from importlib.metadata import version
 
 from secator.rich import console
 
 load_dotenv(find_dotenv(usecwd=True), override=False)
 
 # Globals
-VERSION = get_distribution('secator').version
+VERSION = version('secator')
 ASCII = f"""
 			 __            
    ________  _________ _/ /_____  _____

{secator-0.3.4 → secator-0.3.6}/secator/installer.py

@@ -259,7 +259,7 @@ def get_version_info(name, version_flag=None, github_handle=None, version=None):
 	Return:
 		dict: Version info.
 	"""
-	from pkg_resources import parse_version
+	from packaging import version as _version
 	from secator.installer import GithubInstaller
 	info = {
 		'name': name,
@@ -287,7 +287,7 @@ def get_version_info(name, version_flag=None, github_handle=None, version=None):
 	if location:
 		info['installed'] = True
 		if version and latest_version:
-			if parse_version(version) < parse_version(latest_version):
+			if _version.parse(version) < _version.parse(latest_version):
 				info['status'] = 'outdated'
 			else:
 				info['status'] = 'latest'

{secator-0.3.4 → secator-0.3.6}/secator/runners/_base.py

@@ -111,8 +111,7 @@ class Runner:
 		# Determine report folder
 		default_reports_folder_base = f'{REPORTS_FOLDER}/{self.workspace_name}/{self.config.type}s'
 		_id = get_task_folder_id(default_reports_folder_base)
-		default_report_folder = f'{default_reports_folder_base}/{_id}'
-		self.reports_folder = run_opts.get('reports_folder') or default_report_folder
+		self.reports_folder = f'{default_reports_folder_base}/{_id}'
 
 		# Make reports folders
 		os.makedirs(self.reports_folder, exist_ok=True)

{secator-0.3.4 → secator-0.3.6}/secator/runners/scan.py

@@ -44,7 +44,6 @@ class Scan(Runner):
 
 			# Workflow opts
 			run_opts = self.run_opts.copy()
-			run_opts['reports_folder'] = self.reports_folder
 			fmt_opts = {
 				'json': run_opts.get('json', False),
 				'print_item': False,

{secator-0.3.4 → secator-0.3.6}/secator/runners/task.py

@@ -52,7 +52,6 @@ class Task(Runner):
 		hooks = {task_cls: self.hooks}
 		run_opts['hooks'] = hooks
 		run_opts['context'] = self.context
-		run_opts['reports_folder'] = self.reports_folder
 
 		# Run task
 		if self.sync:

{secator-0.3.4 → secator-0.3.6}/secator/runners/workflow.py

@@ -47,7 +47,6 @@ class Workflow(Runner):
 
 		# Construct run opts
 		task_run_opts['hooks'] = self._hooks.get(Task, {})
-		task_run_opts['reports_folder'] = self.reports_folder
 		task_run_opts.update(task_fmt_opts)
 
 		# Build Celery workflow

{secator-0.3.4 → secator-0.3.6}/secator/tasks/searchsploit.py

@@ -28,7 +28,6 @@ class searchsploit(Command):
 		}
 	}
 	install_cmd = 'sudo git clone https://gitlab.com/exploit-database/exploitdb.git /opt/exploitdb || true && sudo ln -sf /opt/exploitdb/searchsploit /usr/local/bin/searchsploit'  # noqa: E501
-	install_github_handle = 'rad10/SearchSploit.py'
 	proxychains = False
 	proxy_socks5 = False
 	proxy_http = False

{secator-0.3.4 → secator-0.3.6}/secator/utils.py

@@ -1,4 +1,3 @@
-import importlib
 import inspect
 import itertools
 import logging
@@ -195,7 +194,7 @@ def import_dynamic(cls_path, cls_root='Command'):
 	"""
 	try:
 		package, name = cls_path.rsplit(".", maxsplit=1)
-		cls = getattr(importlib.import_module(package), name)
+		cls = getattr(import_module(package), name)
 		root_cls = inspect.getmro(cls)[-2]
 		if root_cls.__name__ == cls_root:
 			return cls

secator-0.3.4/SECURITY.md

@@ -1,21 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-Use this section to tell people how to report a vulnerability.
-
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.