secator 0.4.0__py3-none-any.whl → 0.4.1__py3-none-any.whl

secator/cli.py

@@ -592,6 +592,24 @@ def health(json, debug):
 		table.add_row(*row)
 	status['secator'] = info
 
+	# Check addons
+	console.print('\n:wrench: [bold gold3]Checking installed addons ...[/]')
+	table = get_health_table()
+	with Live(table, console=console):
+		for addon in ['worker', 'google', 'mongodb', 'redis', 'dev', 'trace', 'build']:
+			addon_var = ADDONS_ENABLED[addon]
+			info = {
+				'name': addon,
+				'version': None,
+				'status': 'ok' if addon_var else 'missing',
+				'latest_version': None,
+				'installed': addon_var,
+				'location': None
+			}
+			row = fmt_health_table_row(info, 'addons')
+			table.add_row(*row)
+			status['addons'][addon] = info
+
 	# Check languages
 	console.print('\n:wrench: [bold gold3]Checking installed languages ...[/]')
 	version_cmds = {'go': 'version', 'python3': '--version', 'ruby': '--version'}
@@ -616,24 +634,6 @@ def health(json, debug):
 			table.add_row(*row)
 			status['tools'][tool.__name__] = info
 
-	# # Check addons
-	console.print('\n:wrench: [bold gold3]Checking installed addons ...[/]')
-	table = get_health_table()
-	with Live(table, console=console):
-		for addon in ['worker', 'google', 'mongodb', 'redis', 'dev', 'trace', 'build']:
-			addon_var = ADDONS_ENABLED[addon]
-			info = {
-				'name': addon,
-				'version': None,
-				'status': 'ok' if addon_var else 'missing',
-				'latest_version': None,
-				'installed': addon_var,
-				'location': None
-			}
-			row = fmt_health_table_row(info, 'addons')
-			table.add_row(*row)
-			status['addons'][addon] = info
-
 	# Print JSON health
 	if json:
 		import json as _json

secator/config.py

@@ -6,11 +6,14 @@ from typing_extensions import Annotated, Self
 
 import requests
 import yaml
+from dotenv import find_dotenv, load_dotenv
 from dotmap import DotMap
 from pydantic import AfterValidator, BaseModel, model_validator, ValidationError
 
 from secator.rich import console, console_stdout
 
+load_dotenv(find_dotenv(usecwd=True), override=False)
+
 Directory = Annotated[Path, AfterValidator(lambda v: v.expanduser())]
 StrExpandHome = Annotated[str, AfterValidator(lambda v: v.replace('~', str(Path.home())))]
 
@@ -245,9 +248,9 @@ class Config(DotMap):
 				value = float(value)
 			elif isinstance(existing_value, Path):
 				value = Path(value)
-		except ValueError as e:
-			from secator.utils import debug
-			debug(f'Could not cast value {value} to expected type {type(existing_value).__name__}: {str(e)}', sub='config')
+		except ValueError:
+			# from secator.utils import debug
+			# debug(f'Could not cast value {value} to expected type {type(existing_value).__name__}: {str(e)}', sub='config')
 			pass
 		finally:
 			target[final_key] = value

secator/definitions.py

@@ -2,12 +2,10 @@
 
 import os
 
-from dotenv import find_dotenv, load_dotenv
 from importlib.metadata import version
 
 from secator.config import CONFIG, ROOT_FOLDER
 
-load_dotenv(find_dotenv(usecwd=True), override=False)
 
 # Globals
 VERSION = version('secator')
@@ -105,56 +103,30 @@ WORDLIST = 'wordlist'
 WORDS = 'words'
 
 
+def is_importable(module_to_import):
+	import importlib
+	try:
+		importlib.import_module(module_to_import)
+		return True
+	except ModuleNotFoundError:
+		return False
+	except Exception as e:
+		print(f'Failed trying to import {module_to_import}: {str(e)}')
+		return False
+
+
 ADDONS_ENABLED = {}
 
-# Check worker addon
-try:
-	import eventlet  # noqa: F401
-	ADDONS_ENABLED['worker'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['worker'] = False
-
-# Check google addon
-try:
-	import gspread  # noqa: F401
-	ADDONS_ENABLED['google'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['google'] = False
-
-# Check mongodb addon
-try:
-	import pymongo  # noqa: F401
-	ADDONS_ENABLED['mongodb'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['mongodb'] = False
-
-# Check redis addon
-try:
-	import redis  # noqa: F401
-	ADDONS_ENABLED['redis'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['redis'] = False
-
-# Check dev addon
-try:
-	import flake8  # noqa: F401
-	ADDONS_ENABLED['dev'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['dev'] = False
-
-# Check build addon
-try:
-	import hatch  # noqa: F401
-	ADDONS_ENABLED['build'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['build'] = False
-
-# Check trace addon
-try:
-	import memray  # noqa: F401
-	ADDONS_ENABLED['trace'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['trace'] = False
+for addon, module in [
+	('worker', 'eventlet'),
+	('google', 'gspread'),
+	('mongodb', 'pymongo'),
+	('redis', 'redis'),
+	('dev', 'flake8'),
+	('trace', 'memray'),
+	('build', 'hatch')
+]:
+	ADDONS_ENABLED[addon] = is_importable(module)
 
 # Check dev package
 if os.path.exists(f'{ROOT_FOLDER}/pyproject.toml'):

{secator-0.4.0.dist-info → secator-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: secator
-Version: 0.4.0
+Version: 0.4.1
 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.4.0.dist-info → secator-0.4.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
 secator/.gitignore,sha256=da8MUc3hdb6Mo0WjZu2upn5uZMbXcBGvhdhTQ1L89HI,3093
 secator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 secator/celery.py,sha256=5Raua1rDFJACdmP4b1HLS15kx3ObcUrVConQ0UcopTc,12135
-secator/cli.py,sha256=-B3Hjy8I1z7Jc6fiPYQPCt0DX6TVrNZ98aU-8oN_RQM,34150
-secator/config.py,sha256=-PdJgIesb7T1N2s38iHHeIquxBHoW1Cmd04gQr9PnnY,17403
+secator/cli.py,sha256=qf55GtYARFcCqOTumq3N5_dne3twxRkExolMrUI5UiU,34148
+secator/config.py,sha256=Mzubha9pSzmpJnwA6f87OUScKrYo-szf8i9PJvKkz8w,17501
 secator/decorators.py,sha256=SIS_32SbeN9iTx82mvy9F9vLpjofRYspOOLCXytIO2g,10764
-secator/definitions.py,sha256=lGhuBw2oBvSjtpxCPm0EwoAZLxcf2rwDEpcU8yfxVUA,3689
+secator/definitions.py,sha256=Spr62Nc0TweBAa84iRGSwNkIvXlKofPxtIi795gqTjc,3047
 secator/installer.py,sha256=fpjf5fbA5M5zDQVP4Fdr51sLoMwtoGZTe3mXh7DvD6s,9466
 secator/report.py,sha256=g0stVCcx9klbUS01uKvWcxNE9MJfNFMexYA2SoDIWJU,2596
 secator/rich.py,sha256=W4PipeZfIVnERfW3ySeWSvnZ90jhCFiABBoERYy_6kM,3177
@@ -94,8 +94,8 @@ secator/tasks/nuclei.py,sha256=lKZYPVcnCYomd830-ZCOz4fyc8xAKjNDuKayyz0BPek,3507
 secator/tasks/searchsploit.py,sha256=RD2uv3GFI3Eb-DiTzJp59jyXnvAZRACq-WjDI1NgFM0,1664
 secator/tasks/subfinder.py,sha256=cpFyFCpVaDZ3QAjNId26ezOwntn3CA5Uk-AC2l0mo0E,1087
 secator/tasks/wpscan.py,sha256=UVWnBPOQ1RDB2wzMswWR6vc6cucYgHtuJ8pLZoqCM40,5434
-secator-0.4.0.dist-info/METADATA,sha256=sG5y-7z5TSaCkO2_BehY8co5v_ieePZfv2EV9k9K8pc,14095
-secator-0.4.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-secator-0.4.0.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.4.0.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.4.0.dist-info/RECORD,,
+secator-0.4.1.dist-info/METADATA,sha256=UWWDy4InD1uQ9MovLFt6zeSRKBj0b3Od9AwfX4cdoFY,14095
+secator-0.4.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+secator-0.4.1.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
+secator-0.4.1.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
+secator-0.4.1.dist-info/RECORD,,