secator 0.4.0__tar.gz → 0.4.1__tar.gz

{secator-0.4.0 → secator-0.4.1}/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.4.1](https://github.com/freelabz/secator/compare/v0.4.0...v0.4.1) (2024-04-30)
+
+
+### Bug Fixes
+
+* failed addons import ([#368](https://github.com/freelabz/secator/issues/368)) ([aee7ede](https://github.com/freelabz/secator/commit/aee7edeee1e96292e637b9161034f0d628a1f386))
+* load dotenv before config import ([#370](https://github.com/freelabz/secator/issues/370)) ([ba2ea8e](https://github.com/freelabz/secator/commit/ba2ea8e3624dda7268d3788c0541fc0d37195358))
+
 ## [0.4.0](https://github.com/freelabz/secator/compare/v0.3.6...v0.4.0) (2024-04-27)
 
 

{secator-0.4.0 → secator-0.4.1}/PKG-INFO

@@ -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 → secator-0.4.1}/pyproject.toml

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

{secator-0.4.0 → secator-0.4.1}/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-0.4.0 → secator-0.4.1}/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-0.4.0 → secator-0.4.1}/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'):