secator 0.3.0__py2.py3-none-any.whl → 0.3.1__py2.py3-none-any.whl

secator/celery.py

@@ -106,7 +106,7 @@ def void(*args, **kwargs):
 
 def revoke_task(task_id):
 	console.print(f'Revoking task {task_id}')
-	return app.control.revoke(task_id, terminate=True, signal='SIGKILL')
+	return app.control.revoke(task_id, terminate=True, signal='SIGINT')
 
 
 #--------------#

secator/cli.py

@@ -7,20 +7,20 @@ import rich_click as click
 from dotmap import DotMap
 from fp.fp import FreeProxy
 from jinja2 import Template
+from rich.live import Live
 from rich.markdown import Markdown
 from rich.rule import Rule
 
 from secator.config import ConfigLoader
 from secator.decorators import OrderedGroup, register_runner
-from secator.definitions import (ASCII, BUILD_ADDON_ENABLED, CVES_FOLDER, DATA_FOLDER, DEV_ADDON_ENABLED,  # noqa: F401
-								 DEV_PACKAGE, GOOGLE_ADDON_ENABLED, VERSION_LATEST, LIB_FOLDER, MONGODB_ADDON_ENABLED,
-								 VERSION_OBSOLETE, OPT_NOT_SUPPORTED, PAYLOADS_FOLDER, REDIS_ADDON_ENABLED, REVSHELLS_FOLDER, ROOT_FOLDER,
-								 TRACE_ADDON_ENABLED, VERSION, VERSION_STR, WORKER_ADDON_ENABLED)
-from secator.installer import ToolInstaller
+from secator.definitions import (ADDONS_ENABLED, ASCII, CVES_FOLDER, DATA_FOLDER, DEV_PACKAGE, OPT_NOT_SUPPORTED,
+								 PAYLOADS_FOLDER, REVSHELLS_FOLDER, ROOT_FOLDER, VERSION)
+from secator.installer import ToolInstaller, get_version_info, get_health_table, fmt_health_table_row
 from secator.rich import console
 from secator.runners import Command
 from secator.serializers.dataclass import loads_dataclass
-from secator.utils import debug, detect_host, discover_tasks, find_list_item, flatten, print_results_table
+from secator.utils import (debug, detect_host, discover_tasks, find_list_item, flatten,
+						   print_results_table, print_version)
 
 click.rich_click.USE_RICH_MARKUP = True
 
@@ -30,15 +30,6 @@ ALL_WORKFLOWS = ALL_CONFIGS.workflow
 ALL_SCANS = ALL_CONFIGS.scan
 
 
-def print_version():
-	console.print(f'[bold gold3]Current version[/]: {VERSION}', highlight=False)
-	console.print(f'[bold gold3]Latest version[/]: {VERSION_LATEST}', highlight=False)
-	console.print(f'[bold gold3]Python binary[/]: {sys.executable}')
-	if DEV_PACKAGE:
-		console.print(f'[bold gold3]Root folder[/]: {ROOT_FOLDER}')
-	console.print(f'[bold gold3]Lib folder[/]: {LIB_FOLDER}')
-
-
 #-----#
 # CLI #
 #-----#
@@ -49,10 +40,6 @@ def print_version():
 def cli(ctx, version):
 	"""Secator CLI."""
 	console.print(ASCII, highlight=False)
-	if VERSION_OBSOLETE:
-		console.print(
-			'[bold red]:warning: secator version is outdated: '
-			f'run "secator update" to install the newest version ({VERSION_LATEST}).\n')
 	if ctx.invoked_subcommand is None:
 		if version:
 			print_version()
@@ -119,7 +106,7 @@ for config in sorted(ALL_SCANS, key=lambda x: x['name']):
 @click.option('--show', is_flag=True, help='Show command (celery multi).')
 def worker(hostname, concurrency, reload, queue, pool, check, dev, stop, show):
 	"""Run a worker."""
-	if not WORKER_ADDON_ENABLED:
+	if not ADDONS_ENABLED['worker']:
 		console.print('[bold red]Missing worker addon: please run `secator install addons worker`[/].')
 		sys.exit(1)
 	from secator.celery import app, is_celery_worker_alive
@@ -408,7 +395,7 @@ def build():
 @build.command('pypi')
 def build_pypi():
 	"""Build secator PyPI package."""
-	if not BUILD_ADDON_ENABLED:
+	if not ADDONS_ENABLED['build']:
 		console.print('[bold red]Missing build addon: please run `secator install addons build`')
 		sys.exit(1)
 	with console.status('[bold gold3]Building PyPI package...[/]'):
@@ -444,7 +431,7 @@ def publish():
 @publish.command('pypi')
 def publish_pypi():
 	"""Publish secator PyPI package."""
-	if not BUILD_ADDON_ENABLED:
+	if not ADDONS_ENABLED['build']:
 		console.print('[bold red]Missing build addon: please run `secator install addons build`')
 		sys.exit(1)
 	os.environ['HATCH_INDEX_USER'] = '__token__'
@@ -526,114 +513,64 @@ def report_show(json_path, exclude_fields):
 # HEALTH #
 #--------#
 
-
-def which(command):
-	"""Run which on a command.
-
-	Args:
-		command (str): Command to check.
-
-	Returns:
-		secator.Command: Command instance.
-	"""
-	return Command.execute(f'which {command}', quiet=True, print_errors=False)
-
-
-def get_version_cls(cls):
-	"""Get version for a Command.
-
-	Args:
-		cls: Command class.
-
-	Returns:
-		string: Version string or 'n/a' if not found.
-	"""
-	base_cmd = cls.cmd.split(' ')[0]
-	if cls.version_flag == OPT_NOT_SUPPORTED:
-		return 'N/A'
-	version_flag = cls.version_flag or f'{cls.opt_prefix}version'
-	version_cmd = f'{base_cmd} {version_flag}'
-	return get_version(version_cmd)
-
-
-def get_version(version_cmd):
-	"""Run version command and match first version number found.
-
-	Args:
-		version_cmd (str): Command to get the version.
-
-	Returns:
-		str: Version string.
-	"""
-	regex = r'[0-9]+\.[0-9]+\.?[0-9]*\.?[a-zA-Z]*'
-	ret = Command.execute(version_cmd, quiet=True, print_errors=False)
-	match = re.findall(regex, ret.output)
-	if not match:
-		return 'n/a'
-	return match[0]
-
-
 @cli.command(name='health')
 @click.option('--json', '-json', is_flag=True, default=False, help='JSON lines output')
 @click.option('--debug', '-debug', is_flag=True, default=False, help='Debug health output')
 def health(json, debug):
 	"""[dim]Get health status.[/]"""
-	tools = [cls for cls in ALL_TASKS]
-	status = {'tools': {}, 'languages': {}, 'secator': {}}
-
-	def print_status(cmd, return_code, version=None, bin=None, category=None):
-		s = '[bold green]ok      [/]' if return_code == 0 else '[bold red]missing [/]'
-		s = f'[bold magenta]{cmd:<15}[/] {s} '
-		if return_code == 0 and version:
-			if version == 'N/A':
-				s += f'[dim blue]{version:<12}[/]'
-			else:
-				s += f'[bold blue]{version:<12}[/]'
-		elif category:
-			s += ' '*12 + f'[dim]# secator install {category} {cmd}'
-		if bin:
-			s += f'[dim gold3]{bin}[/]'
-		console.print(s, highlight=False)
+	tools = ALL_TASKS
+	status = {'secator': {}, 'languages': {}, 'tools': {}, 'addons': {}}
 
 	# Check secator
-	if not json:
-		console.print(':wrench: [bold gold3]Checking secator ...[/]')
-	ret = which('secator')
-	if not json:
-		print_status('secator', ret.return_code, VERSION, ret.output, None)
-	status['secator'] = {'installed': ret.return_code == 0, 'version': VERSION}
+	console.print(':wrench: [bold gold3]Checking secator ...[/]')
+	info = get_version_info('secator', '-version', 'freelabz/secator')
+	table = get_health_table()
+	with Live(table, console=console):
+		row = fmt_health_table_row(info)
+		table.add_row(*row)
+	status['secator'] = info
 
 	# Check languages
-	if not json:
-		console.print('\n:wrench: [bold gold3]Checking installed languages ...[/]')
+	console.print('\n:wrench: [bold gold3]Checking installed languages ...[/]')
 	version_cmds = {'go': 'version', 'python3': '--version', 'ruby': '--version'}
-	for lang, version_flag in version_cmds.items():
-		ret = which(lang)
-		version = get_version(f'{lang} {version_flag}')
-		if not json:
-			print_status(lang, ret.return_code, version, ret.output, 'langs')
-		status['languages'][lang] = {'installed': ret.return_code == 0, 'version': version}
+	table = get_health_table()
+	with Live(table, console=console):
+		for lang, version_flag in version_cmds.items():
+			info = get_version_info(lang, version_flag)
+			row = fmt_health_table_row(info, 'langs')
+			table.add_row(*row)
+			status['languages'][lang] = info
 
 	# Check tools
-	if not json:
-		console.print('\n:wrench: [bold gold3]Checking installed tools ...[/]')
-	for tool in tools:
-		cmd = tool.cmd.split(' ')[0]
-		ret = which(cmd)
-		version = get_version_cls(tool)
-		if not json:
-			print_status(tool.__name__, ret.return_code, version, ret.output, 'tools')
-		status['tools'][tool.__name__] = {'installed': ret.return_code == 0, 'version': version}
-
-	# Check addons
-	if not json:
-		console.print('\n:wrench: [bold gold3]Checking installed addons ...[/]')
-	for addon in ['google', 'mongodb', 'redis', 'dev', 'trace', 'build']:
-		addon_var = globals()[f'{addon.upper()}_ADDON_ENABLED']
-		ret = 0 if addon_var == 1 else 1
-		bin = None if addon_var == 0 else ' '
-		if not json:
-			print_status(addon, ret, 'N/A', bin, 'addons')
+	console.print('\n:wrench: [bold gold3]Checking installed tools ...[/]')
+	table = get_health_table()
+	with Live(table, console=console):
+		for tool in tools:
+			cmd = tool.cmd.split(' ')[0]
+			version_flag = tool.version_flag or f'{tool.opt_prefix}version'
+			version_flag = None if tool.version_flag == OPT_NOT_SUPPORTED else version_flag
+			info = get_version_info(cmd, version_flag, tool.install_github_handle)
+			row = fmt_health_table_row(info, 'tools')
+			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 ['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:
@@ -842,13 +779,16 @@ def install_cves(force):
 @cli.command('update')
 def update():
 	"""[dim]Update to latest version.[/]"""
-	if not VERSION_OBSOLETE:
-		console.print(f'[bold green]secator is already at the newest version {VERSION_LATEST}[/]')
-	console.print(f'[bold gold3]:wrench: Updating secator from {VERSION} to {VERSION_LATEST} ...[/]')
+	info = get_version_info('secator', github_handle='freelabz/secator', version=VERSION)
+	latest_version = info['latest_version']
+	if info['status'] == 'latest':
+		console.print(f'[bold green]secator is already at the newest version {latest_version}[/] !')
+		sys.exit(0)
+	console.print(f'[bold gold3]:wrench: Updating secator from {VERSION} to {latest_version} ...[/]')
 	if 'pipx' in sys.executable:
-		Command.execute(f'pipx install secator=={VERSION_LATEST} --force')
+		Command.execute(f'pipx install secator=={latest_version} --force')
 	else:
-		Command.execute(f'pip install secator=={VERSION_LATEST}')
+		Command.execute(f'pip install secator=={latest_version}')
 
 
 #-------#
@@ -953,7 +893,7 @@ def test():
 	if not DEV_PACKAGE:
 		console.print('[bold red]You MUST use a development version of secator to run tests.[/]')
 		sys.exit(1)
-	if not DEV_ADDON_ENABLED:
+	if not ADDONS_ENABLED['dev']:
 		console.print('[bold red]Missing dev addon: please run `secator install addons dev`')
 		sys.exit(1)
 	pass

secator/decorators.py

@@ -5,8 +5,7 @@ import rich_click as click
 from rich_click.rich_click import _get_rich_console
 from rich_click.rich_group import RichGroup
 
-from secator.definitions import (MONGODB_ADDON_ENABLED, OPT_NOT_SUPPORTED,
-								 WORKER_ADDON_ENABLED)
+from secator.definitions import ADDONS_ENABLED, OPT_NOT_SUPPORTED
 from secator.runners import Scan, Task, Workflow
 from secator.utils import (deduplicate, expand_input, get_command_category,
 						   get_command_cls)
@@ -276,7 +275,7 @@ 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 WORKER_ADDON_ENABLED:
+		if sync or show or not ADDONS_ENABLED['worker']:
 			sync = True
 		elif worker:
 			sync = False
@@ -294,7 +293,7 @@ def register_runner(cli_endpoint, config):
 		# Build hooks from driver name
 		hooks = {}
 		if driver == 'mongodb':
-			if not MONGODB_ADDON_ENABLED:
+			if not ADDONS_ENABLED['mongo']:
 				_get_rich_console().print('[bold red]Missing MongoDB dependencies: please run `secator install addons mongodb`[/].')
 				sys.exit(1)
 			from secator.hooks.mongodb import MONGODB_HOOKS

secator/definitions.py

@@ -4,34 +4,20 @@ import os
 import requests
 
 from dotenv import find_dotenv, load_dotenv
-from pkg_resources import get_distribution, parse_version
-
-load_dotenv(find_dotenv(usecwd=True), override=False)
+from pkg_resources import get_distribution
 
+from secator.rich import console
 
-def get_latest_version():
-	"""Get latest secator version from GitHub API."""
-	try:
-		resp = requests.get('https://api.github.com/repos/freelabz/secator/releases/latest', timeout=2)
-		resp.raise_for_status()
-		latest_version = resp.json()['name'].lstrip('v')
-		return latest_version
-	except (requests.exceptions.RequestException):
-		return None
-
+load_dotenv(find_dotenv(usecwd=True), override=False)
 
 # Globals
 VERSION = get_distribution('secator').version
-VERSION_LATEST = get_latest_version()
-VERSION_OBSOLETE = parse_version(VERSION_LATEST) > parse_version(VERSION) if VERSION_LATEST else False
-VERSION_STR = f'{VERSION} [bold red](outdated)[/]' if VERSION_OBSOLETE else VERSION
-
 ASCII = f"""
 			 __            
    ________  _________ _/ /_____  _____
   / ___/ _ \/ ___/ __ `/ __/ __ \/ ___/
  (__  /  __/ /__/ /_/ / /_/ /_/ / /    
-/____/\___/\___/\__,_/\__/\____/_/     v{VERSION_STR}
+/____/\___/\___/\__,_/\__/\____/_/     v{VERSION}
 
 			freelabz.com
 """  # noqa: W605,W291
@@ -50,20 +36,10 @@ CVES_FOLDER = f'{DATA_FOLDER}/cves'
 PAYLOADS_FOLDER = f'{DATA_FOLDER}/payloads'
 REVSHELLS_FOLDER = f'{DATA_FOLDER}/revshells'
 TESTS_FOLDER = f'{ROOT_FOLDER}/tests'
-os.makedirs(BIN_FOLDER, exist_ok=True)
-os.makedirs(DATA_FOLDER, exist_ok=True)
-os.makedirs(REPORTS_FOLDER, exist_ok=True)
-os.makedirs(WORDLISTS_FOLDER, exist_ok=True)
-os.makedirs(SCRIPTS_FOLDER, exist_ok=True)
-os.makedirs(CVES_FOLDER, exist_ok=True)
-os.makedirs(PAYLOADS_FOLDER, exist_ok=True)
-os.makedirs(REVSHELLS_FOLDER, exist_ok=True)
 
 # Celery local fs folders
 CELERY_DATA_FOLDER = f'{DATA_FOLDER}/celery/data'
 CELERY_RESULTS_FOLDER = f'{DATA_FOLDER}/celery/results'
-os.makedirs(CELERY_DATA_FOLDER, exist_ok=True)
-os.makedirs(CELERY_RESULTS_FOLDER, exist_ok=True)
 
 # Environment variables
 DEBUG = int(os.environ.get('DEBUG', '0'))
@@ -99,8 +75,10 @@ DEFAULT_PROGRESS_UPDATE_FREQUENCY = int(os.environ.get('DEFAULT_PROGRESS_UPDATE_
 DEFAULT_SKIP_CVE_SEARCH = bool(int(os.environ.get('DEFAULT_SKIP_CVE_SEARCH', 0)))
 
 # Default wordlists
-DEFAULT_HTTP_WORDLIST = os.environ.get('DEFAULT_HTTP_WORDLIST', f'{WORDLISTS_FOLDER}/Fuzzing/fuzz-Bo0oM.txt')
-DEFAULT_DNS_WORDLIST = os.environ.get('DEFAULT_DNS_WORDLIST', f'{WORDLISTS_FOLDER}/Discovery/DNS/combined_subdomains.txt')  # noqa:E501
+DEFAULT_HTTP_WORDLIST = os.environ.get('DEFAULT_HTTP_WORDLIST', f'{WORDLISTS_FOLDER}/fuzz-Bo0oM.txt')
+DEFAULT_HTTP_WORDLIST_URL = 'https://raw.githubusercontent.com/Bo0oM/fuzz.txt/master/fuzz.txt'
+DEFAULT_DNS_WORDLIST = os.environ.get('DEFAULT_DNS_WORDLIST', f'{WORDLISTS_FOLDER}/combined_subdomains.txt')
+DEFAULT_DNS_WORDLIST_URL = 'https://raw.githubusercontent.com/danielmiessler/SecLists/master/Discovery/DNS/combined_subdomains.txt'  # noqa: E501
 
 # Constants
 OPT_NOT_SUPPORTED = -1
@@ -175,57 +153,84 @@ WEBSERVER = 'webserver'
 WORDLIST = 'wordlist'
 WORDS = 'words'
 
+
+# Create all folders
+for folder in [BIN_FOLDER, DATA_FOLDER, REPORTS_FOLDER, WORDLISTS_FOLDER, SCRIPTS_FOLDER, CVES_FOLDER, PAYLOADS_FOLDER,
+			   REVSHELLS_FOLDER, CELERY_DATA_FOLDER, CELERY_RESULTS_FOLDER]:
+	if not os.path.exists(folder):
+		console.print(f'[bold turquoise4]Creating folder {folder} ...[/] ', end='')
+		os.makedirs(folder)
+		console.print('[bold green]ok.[/]')
+
+
+# Download default wordlists
+for wordlist in ['HTTP', 'DNS']:
+	wordlist_path = globals()[f'DEFAULT_{wordlist}_WORDLIST']
+	wordlist_url = globals()[f'DEFAULT_{wordlist}_WORDLIST_URL']
+	if not os.path.exists(wordlist_path):
+		try:
+			console.print(f'[bold turquoise4]Downloading default {wordlist} wordlist {wordlist_path} ...[/] ', end='')
+			resp = requests.get(wordlist_url)
+			with open(wordlist_path, 'w') as f:
+				f.write(resp.text)
+			console.print('[bold green]ok.[/]')
+		except requests.exceptions.RequestException as e:
+			console.print(f'[bold green]failed ({type(e).__name__}).[/]')
+			pass
+
+ADDONS_ENABLED = {}
+
 # Check worker addon
 try:
 	import eventlet  # noqa: F401
-	WORKER_ADDON_ENABLED = 1
+	ADDONS_ENABLED['worker'] = True
 except ModuleNotFoundError:
-	WORKER_ADDON_ENABLED = 0
+	ADDONS_ENABLED['worker'] = False
 
 # Check google addon
 try:
 	import gspread  # noqa: F401
-	GOOGLE_ADDON_ENABLED = 1
+	ADDONS_ENABLED['google'] = True
 except ModuleNotFoundError:
-	GOOGLE_ADDON_ENABLED = 0
+	ADDONS_ENABLED['google'] = False
 
 # Check mongodb addon
 try:
 	import pymongo  # noqa: F401
-	MONGODB_ADDON_ENABLED = 1
+	ADDONS_ENABLED['mongodb'] = True
 except ModuleNotFoundError:
-	MONGODB_ADDON_ENABLED = 0
+	ADDONS_ENABLED['mongodb'] = False
 
 # Check redis addon
 try:
 	import redis  # noqa: F401
-	REDIS_ADDON_ENABLED = 1
+	ADDONS_ENABLED['redis'] = True
 except ModuleNotFoundError:
-	REDIS_ADDON_ENABLED = 0
+	ADDONS_ENABLED['redis'] = False
 
 # Check dev addon
 try:
 	import flake8  # noqa: F401
-	DEV_ADDON_ENABLED = 1
+	ADDONS_ENABLED['dev'] = True
 except ModuleNotFoundError:
-	DEV_ADDON_ENABLED = 0
+	ADDONS_ENABLED['dev'] = False
 
 # Check build addon
 try:
 	import hatch  # noqa: F401
-	BUILD_ADDON_ENABLED = 1
+	ADDONS_ENABLED['build'] = True
 except ModuleNotFoundError:
-	BUILD_ADDON_ENABLED = 0
+	ADDONS_ENABLED['build'] = False
 
 # Check trace addon
 try:
 	import memray  # noqa: F401
-	TRACE_ADDON_ENABLED = 1
+	ADDONS_ENABLED['trace'] = True
 except ModuleNotFoundError:
-	TRACE_ADDON_ENABLED = 0
+	ADDONS_ENABLED['trace'] = False
 
 # Check dev package
 if os.path.exists(f'{ROOT_FOLDER}/pyproject.toml'):
-	DEV_PACKAGE = 1
+	DEV_PACKAGE = True
 else:
-	DEV_PACKAGE = 0
+	DEV_PACKAGE = False

secator/installer.py

@@ -7,6 +7,8 @@ import tarfile
 import zipfile
 import io
 
+from rich.table import Table
+
 from secator.rich import console
 from secator.runners import Command
 from secator.definitions import BIN_FOLDER, GITHUB_TOKEN
@@ -77,25 +79,14 @@ class GithubInstaller:
 			github_handle (str): A GitHub handle {user}/{repo}
 
 		Returns:
-			bool: True if install is successful,, False otherwise.
+			bool: True if install is successful, False otherwise.
 		"""
-		owner, repo = tuple(github_handle.split('/'))
-		releases_url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
-
-		# Query latest release endpoint
-		headers = {}
-		if GITHUB_TOKEN:
-			headers['Authorization'] = f'Bearer {GITHUB_TOKEN}'
-		response = requests.get(releases_url, headers=headers)
-		if response.status_code == 403:
-			console.print('[bold red]Rate-limited by GitHub API. Retry later or set a GITHUB_TOKEN.')
-			return False
-		elif response.status_code == 404:
-			console.print('[dim red]No GitHub releases found.')
+		_, repo = tuple(github_handle.split('/'))
+		latest_release = cls.get_latest_release(github_handle)
+		if not latest_release:
 			return False
 
 		# Find the right asset to download
-		latest_release = response.json()
 		os_identifiers, arch_identifiers = cls._get_platform_identifier()
 		download_url = cls._find_matching_asset(latest_release['assets'], os_identifiers, arch_identifiers)
 		if not download_url:
@@ -107,6 +98,39 @@ class GithubInstaller:
 		cls._download_and_unpack(download_url, BIN_FOLDER, repo)
 		return True
 
+	@classmethod
+	def get_latest_release(cls, github_handle):
+		"""Get latest release from GitHub.
+
+		Args:
+			github_handle (str): A GitHub handle {user}/{repo}.
+
+		Returns:
+			dict: Latest release JSON from GitHub releases.
+		"""
+		if not github_handle:
+			return False
+		owner, repo = tuple(github_handle.split('/'))
+		url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
+		headers = {}
+		if GITHUB_TOKEN:
+			headers['Authorization'] = f'Bearer {GITHUB_TOKEN}'
+		try:
+			response = requests.get(url, headers=headers, timeout=5)
+			response.raise_for_status()
+			latest_release = response.json()
+			return latest_release
+		except requests.RequestException as e:
+			console.print(f'Failed to fetch latest release for {github_handle}: {str(e)}')
+			return None
+
+	@classmethod
+	def get_latest_version(cls, github_handle):
+		latest_release = cls.get_latest_release(github_handle)
+		if not latest_release:
+			return None
+		return latest_release['tag_name'].lstrip('v')
+
 	@classmethod
 	def _get_platform_identifier(cls):
 		"""Generate lists of possible identifiers for the current platform."""
@@ -159,7 +183,7 @@ class GithubInstaller:
 	def _download_and_unpack(cls, url, destination, repo_name):
 		"""Download and unpack a release asset."""
 		console.print(f'Downloading and unpacking to {destination}...')
-		response = requests.get(url)
+		response = requests.get(url, timeout=5)
 		response.raise_for_status()
 
 		# Create a temporary directory to extract the archive
@@ -190,3 +214,122 @@ class GithubInstaller:
 				if file == binary_name:
 					return os.path.join(root, file)
 		return None
+
+
+def which(command):
+	"""Run which on a command.
+
+	Args:
+		command (str): Command to check.
+
+	Returns:
+		secator.Command: Command instance.
+	"""
+	return Command.execute(f'which {command}', quiet=True, print_errors=False)
+
+
+def get_version(version_cmd):
+	"""Run version command and match first version number found.
+
+	Args:
+		version_cmd (str): Command to get the version.
+
+	Returns:
+		str: Version string.
+	"""
+	from secator.runners import Command
+	import re
+	regex = r'[0-9]+\.[0-9]+\.?[0-9]*\.?[a-zA-Z]*'
+	ret = Command.execute(version_cmd, quiet=True, print_errors=False)
+	match = re.findall(regex, ret.output)
+	if not match:
+		return ''
+	return match[0]
+
+
+def get_version_info(name, version_flag=None, github_handle=None, version=None):
+	"""Get version info for a command.
+
+	Args:
+		name (str): Command name.
+		version_flag (str): Version flag.
+		github_handle (str): Github handle.
+		version (str): Existing version.
+
+	Return:
+		dict: Version info.
+	"""
+	from pkg_resources import parse_version
+	from secator.installer import GithubInstaller
+	info = {
+		'name': name,
+		'installed': False,
+		'version': version,
+		'latest_version': None,
+		'location': None,
+		'status': ''
+	}
+
+	# Get binary path
+	location = which(name).output
+	info['location'] = location
+
+	# Get current version
+	if version_flag:
+		version_cmd = f'{name} {version_flag}'
+		version = get_version(version_cmd)
+		info['version'] = version
+
+	# Get latest version
+	latest_version = GithubInstaller.get_latest_version(github_handle)
+	info['latest_version'] = latest_version
+
+	if location:
+		info['installed'] = True
+		if version and latest_version:
+			if parse_version(version) < parse_version(latest_version):
+				info['status'] = 'outdated'
+			else:
+				info['status'] = 'latest'
+		elif not version:
+			info['status'] = 'current unknown'
+		elif not latest_version:
+			info['status'] = 'latest unknown'
+	else:
+		info['status'] = 'missing'
+
+	return info
+
+
+def fmt_health_table_row(version_info, category=None):
+	name = version_info['name']
+	version = version_info['version']
+	status = version_info['status']
+	installed = version_info['installed']
+	name_str = f'[magenta]{name}[/]'
+
+	# Format version row
+	_version = version or ''
+	_version = f'[bold green]{_version:<10}[/]'
+	if status == 'latest':
+		_version += ' [bold green](latest)[/]'
+	elif status == 'outdated':
+		_version += ' [bold red](outdated)[/]'
+	elif status == 'missing':
+		_version = '[bold red]missing[/]'
+	elif status == 'ok':
+		_version = '[bold green]ok        [/]'
+	elif status:
+		if not version and installed:
+			_version = '[bold green]ok        [/]'
+		_version += f' [dim]({status}[/])'
+
+	row = (name_str, _version)
+	return row
+
+
+def get_health_table():
+	table = Table(box=None, show_header=False)
+	for col in ['name', 'version']:
+		table.add_column(col)
+	return table

secator/rich.py

@@ -1,19 +1,13 @@
 import operator
 
-import click
-import rich_click
 import yaml
 from rich import box
 from rich.console import Console
 from rich.table import Table
-from rich.traceback import install
 
-from secator.definitions import DEBUG, RECORD
-
-console = Console(stderr=True, record=RECORD, color_system='truecolor')
+console = Console(stderr=True, color_system='truecolor')
 console_stdout = Console(record=True)
 # handler = RichHandler(rich_tracebacks=True)  # TODO: add logging handler
-install(show_locals=DEBUG > 2, suppress=[click, rich_click])
 
 
 def criticity_to_color(value):
@@ -73,7 +67,7 @@ def build_table(items, output_fields=[], exclude_fields=[], sort_by=None):
 		items = sorted(items, key=operator.attrgetter(*sort_by))
 
 	# Create rich table
-	box_style = box.DOUBLE if RECORD else box.ROUNDED
+	box_style = box.ROUNDED
 	table = Table(show_lines=True, box=box_style)
 
 	# Get table schema if any, default to first item keys

secator/runners/_base.py

@@ -106,7 +106,7 @@ class Runner:
 		self.context = context
 		self.delay = run_opts.get('delay', False)
 		self.uuids = []
-		self.result = None
+		self.celery_result = None
 
 		# Determine report folder
 		default_reports_folder_base = f'{REPORTS_FOLDER}/{self.workspace_name}/{self.config.type}s'
@@ -159,19 +159,19 @@ class Runner:
 		for key in self.hooks:
 
 			# Register class specific hooks
-			instance_func = getattr(self, key, None)
-			if instance_func:
+			class_hook = getattr(self, key, None)
+			if class_hook:
 				name = f'{self.__class__.__name__}.{key}'
-				fun = f'{instance_func.__module__}.{instance_func.__name__}'
+				fun = self.get_func_path(class_hook)
 				debug('', obj={name + ' [dim yellow]->[/] ' + fun: 'registered'}, sub='hooks', level=3)
-				self.hooks[key].append(instance_func)
+				self.hooks[key].append(class_hook)
 
 			# Register user hooks
 			user_hooks = hooks.get(self.__class__, {}).get(key, [])
 			user_hooks.extend(hooks.get(key, []))
 			for hook in user_hooks:
 				name = f'{self.__class__.__name__}.{key}'
-				fun = f'{hook.__module__}.{hook.__name__}'
+				fun = self.get_func_path(hook)
 				debug('', obj={name + ' [dim yellow]->[/] ' + fun: 'registered (user)'}, sub='hooks', level=3)
 			self.hooks[key].extend(user_hooks)
 
@@ -280,9 +280,9 @@ class Runner:
 
 		except KeyboardInterrupt:
 			self._print('Process was killed manually (CTRL+C / CTRL+X).', color='bold red', rich=True)
-			if self.result:
+			if self.celery_result:
 				self._print('Revoking remote Celery tasks ...', color='bold red', rich=True)
-				self.stop_live_tasks(self.result)
+				self.stop_live_tasks(self.celery_result)
 
 		# Filter results and log info
 		self.mark_duplicates()
@@ -291,9 +291,10 @@ class Runner:
 		self.run_hooks('on_end')
 
 	def mark_duplicates(self):
-		debug('duplicate check', id=self.config.name, sub='runner.mark_duplicates')
+		debug('running duplicate check', id=self.config.name, sub='runner.mark_duplicates')
+		dupe_count = 0
 		for item in self.results:
-			debug('duplicate check', obj=item.toDict(), obj_breaklines=True, sub='runner.mark_duplicates', level=2)
+			debug('running duplicate check', obj=item.toDict(), obj_breaklines=True, sub='runner.mark_duplicates', level=5)
 			others = [f for f in self.results if f == item and f._uuid != item._uuid]
 			if others:
 				main = max(item, *others)
@@ -313,13 +314,16 @@ class Runner:
 					if not dupe._duplicate:
 						debug(
 							'found new duplicate', obj=dupe.toDict(), obj_breaklines=True,
-							sub='runner.mark_duplicates', level=2)
+							sub='runner.mark_duplicates', level=5)
+						dupe_count += 1
 						dupe._duplicate = True
 						dupe = self.run_hooks('on_duplicate', dupe)
 
-		debug('Duplicates:', sub='runner.mark_duplicates', level=2)
-		debug('\n\t'.join([repr(i) for i in self.results if i._duplicate]), sub='runner.mark_duplicates', level=2)
-		debug('duplicate check completed', id=self.config.name, sub='runner.mark_duplicates')
+		duplicates = [repr(i) for i in self.results if i._duplicate]
+		if duplicates:
+			duplicates_str = '\n\t'.join(duplicates)
+			debug(f'Duplicates ({dupe_count}):\n\t{duplicates_str}', sub='runner.mark_duplicates', level=5)
+		debug(f'duplicate check completed: {dupe_count} found', id=self.config.name, sub='runner.mark_duplicates')
 
 	def yielder(self):
 		raise NotImplementedError()
@@ -356,7 +360,7 @@ class Runner:
 			return result
 		for hook in self.hooks[hook_type]:
 			name = f'{self.__class__.__name__}.{hook_type}'
-			fun = f'{hook.__module__}.{hook.__name__}'
+			fun = self.get_func_path(hook)
 			try:
 				_id = self.context.get('task_id', '') or self.context.get('workflow_id', '') or self.context.get('scan_id', '')
 				debug('', obj={name + ' [dim yellow]->[/] ' + fun: 'started'}, id=_id, sub='hooks', level=3)
@@ -871,3 +875,31 @@ class Runner:
 		elif isinstance(item, OutputType):
 			item = repr(item)
 		return item
+
+	@classmethod
+	def get_func_path(cls, func):
+		"""
+		Get the full symbolic path of a function or method, including staticmethods,
+		using function and method attributes.
+
+		Args:
+			func (function, method, or staticmethod): A function or method object.
+		"""
+		if hasattr(func, '__self__'):
+			if func.__self__ is not None:
+				# It's a method bound to an instance
+				class_name = func.__self__.__class__.__name__
+				return f"{func.__module__}.{class_name}.{func.__name__}"
+			else:
+				# It's a method bound to a class (class method)
+				class_name = func.__qualname__.rsplit('.', 1)[0]
+				return f"{func.__module__}.{class_name}.{func.__name__}"
+		else:
+			# Handle static and regular functions
+			if '.' in func.__qualname__:
+				# Static method or a function defined inside a class
+				class_name, func_name = func.__qualname__.rsplit('.', 1)
+				return f"{func.__module__}.{class_name}.{func_name}"
+			else:
+				# Regular function not attached to a class
+				return f"{func.__module__}.{func.__name__}"

secator/runners/task.py

@@ -39,7 +39,8 @@ class Task(Runner):
 			'print_input_file': DEBUG > 0,
 			'print_item': True,
 			'print_item_count': not self.sync and not dry_run,
-			'print_line': self.sync and not self.output_quiet,
+			'print_line': True
+			# 'print_line': self.sync and not self.output_quiet,
 		}
 		# self.print_item = not self.sync  # enable print_item for base Task only if running remote
 		run_opts.update(fmt_opts)
@@ -59,9 +60,9 @@ class Task(Runner):
 			if dry_run:  # don't run
 				return
 		else:
-			result = task_cls.delay(self.targets, **run_opts)
+			self.celery_result = task_cls.delay(self.targets, **run_opts)
 			task = self.process_live_tasks(
-				result,
+				self.celery_result,
 				description=False,
 				results_only=True,
 				print_remote_status=self.print_remote_status)

secator/runners/workflow.py

@@ -58,7 +58,7 @@ class Workflow(Runner):
 			results = workflow.apply().get()
 		else:
 			result = workflow()
-			self.result = result
+			self.celery_result = result
 			results = self.process_live_tasks(result, results_only=True, print_remote_status=self.print_remote_status)
 
 		# Get workflow results

secator/tasks/_categories.py

@@ -6,17 +6,12 @@ import requests
 from bs4 import BeautifulSoup
 from cpe import CPE
 
-from secator.definitions import (CIDR_RANGE, CONFIDENCE, CVSS_SCORE,
-							   DEFAULT_HTTP_WORDLIST, DEFAULT_SKIP_CVE_SEARCH, DELAY, DEPTH, DESCRIPTION,
-							   FILTER_CODES, FILTER_REGEX, FILTER_SIZE,
-							   FILTER_WORDS, FOLLOW_REDIRECT, HEADER, HOST, ID,
-							   MATCH_CODES, MATCH_REGEX, MATCH_SIZE,
-							   MATCH_WORDS, METHOD, NAME, PATH, PROVIDER,
-							   PROXY, RATE_LIMIT, REFERENCES, RETRIES,
-							   SEVERITY, TAGS, DATA_FOLDER, THREADS, TIMEOUT,
-							   URL, USER_AGENT, USERNAME, WORDLIST)
-from secator.output_types import (Ip, Port, Subdomain, Tag, Url, UserAccount,
-								Vulnerability)
+from secator.definitions import (CIDR_RANGE, CONFIDENCE, CVSS_SCORE, DATA_FOLDER, DEFAULT_HTTP_WORDLIST,
+								 DEFAULT_SKIP_CVE_SEARCH, DELAY, DEPTH, DESCRIPTION, FILTER_CODES, FILTER_REGEX,
+								 FILTER_SIZE, FILTER_WORDS, FOLLOW_REDIRECT, HEADER, HOST, ID, MATCH_CODES, MATCH_REGEX,
+								 MATCH_SIZE, MATCH_WORDS, METHOD, NAME, PATH, PROVIDER, PROXY, RATE_LIMIT, REFERENCES,
+								 RETRIES, SEVERITY, TAGS, THREADS, TIMEOUT, URL, USER_AGENT, USERNAME, WORDLIST)
+from secator.output_types import Ip, Port, Subdomain, Tag, Url, UserAccount, Vulnerability
 from secator.rich import console
 from secator.runners import Command
 

secator/tasks/searchsploit.py

@@ -28,6 +28,7 @@ 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/utils.py

@@ -15,11 +15,13 @@ from pathlib import Path
 from pkgutil import iter_modules
 from urllib.parse import urlparse, quote
 
+
 import ifaddr
 import yaml
 from rich.markdown import Markdown
 
-from secator.definitions import DEBUG, DEBUG_COMPONENT, DEFAULT_STDIN_TIMEOUT
+from secator.definitions import (DEBUG, DEBUG_COMPONENT, DEFAULT_STDIN_TIMEOUT, VERSION, DEV_PACKAGE, ROOT_FOLDER,
+								 LIB_FOLDER)
 from secator.rich import console
 
 logger = logging.getLogger(__name__)
@@ -402,3 +404,23 @@ def escape_mongodb_url(url):
 		user, password = quote(user), quote(password)
 		return f'mongodb://{user}:{password}@{url}'
 	return url
+
+
+def print_version():
+	"""Print secator version information."""
+	from secator.installer import get_version_info
+	console.print(f'[bold gold3]Current version[/]: {VERSION}', highlight=False, end='')
+	info = get_version_info('secator', github_handle='freelabz/secator', version=VERSION)
+	latest_version = info['latest_version']
+	status = info['status']
+	location = info['location']
+	if status == 'outdated':
+		console.print('[bold red] (outdated)[/]')
+	console.print(f'[bold gold3]Latest version[/]: {latest_version}', highlight=False)
+	console.print(f'[bold gold3]Location[/]: {location}')
+	console.print(f'[bold gold3]Python binary[/]: {sys.executable}')
+	if DEV_PACKAGE:
+		console.print(f'[bold gold3]Root folder[/]: {ROOT_FOLDER}')
+	console.print(f'[bold gold3]Lib folder[/]: {LIB_FOLDER}')
+	if status == 'outdated':
+		console.print('[bold red]secator is outdated, run "secator update" to install the latest version.')

{secator-0.3.0.dist-info → secator-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: secator
-Version: 0.3.0
+Version: 0.3.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.3.0.dist-info → secator-0.3.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
 secator/.gitignore,sha256=da8MUc3hdb6Mo0WjZu2upn5uZMbXcBGvhdhTQ1L89HI,3093
 secator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-secator/celery.py,sha256=zXjg7EKneWjErBTNrJCHOXCJzs-P5jBi5gYqrSqjW4k,12227
-secator/cli.py,sha256=MmB7KpOm7w0JA1ZMD15yE_zLTAZtGypc5rKN7-3i8gw,33245
+secator/celery.py,sha256=QQlDblcCMfs7r2l0DhB2X8miLCtHE5MdC-XiGMK8IcA,12226
+secator/cli.py,sha256=ipkIGc5NBY-SLWENhdeueYmpOnDP2eGURX4xBIcSNic,31531
 secator/config.py,sha256=iOeRzq7u1rvR1-Oq5v9wGxQYB613X0xKGLIcrfhEGc4,3693
-secator/decorators.py,sha256=Ueti-ppprM4e2vnx-QY9U_hpll990hkSxbMFPfbq6MY,10524
-secator/definitions.py,sha256=DNxiXCtTqpg6wYory2E9J_Cpop7_9iyGn0GMcFuGwnY,7306
-secator/installer.py,sha256=FEYHgdt5yS8_pJ8tvDBaOByB-47aL21oE8cOBm-dHA8,5943
+secator/decorators.py,sha256=ZlrdUQ5kpisaNRI4-csQWwbrB4oXs6SXijramNMVqfE,10490
+secator/definitions.py,sha256=JxoqbhkFH6jj5UwaMnrueimZOb6Zi3qksWuLC5O15oI,7636
+secator/installer.py,sha256=pvyTVoG3prZm9V48CFCnIPjJQF7SdV9yU3sARnI12sI,9321
 secator/report.py,sha256=g0stVCcx9klbUS01uKvWcxNE9MJfNFMexYA2SoDIWJU,2596
-secator/rich.py,sha256=7-uKJrQWiCKM0gPNIr_cr1c9KrcJSVd2ht-DgLXhBro,3392
-secator/utils.py,sha256=oJEEls4Z8SfTxiG6keCfqLMMWA97ftS5aiABhBPRduU,9964
+secator/rich.py,sha256=W4PipeZfIVnERfW3ySeWSvnZ90jhCFiABBoERYy_6kM,3177
+secator/utils.py,sha256=i9nnkOuRQIZbWRfyOS1dsT4wfJ7vvaJeZ3IZPwX3vKM,10945
 secator/utils_test.py,sha256=xVF9RH1-p3X0TdmODJi4k62H7Xth96Ib7qnUZ4vAJs8,5043
 secator/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 secator/configs/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -57,18 +57,18 @@ secator/output_types/url.py,sha256=yDozBXCuPfuybH1iX_xGmbCJPXO6Ei14C8Hp5CnzNbE,2
 secator/output_types/user_account.py,sha256=EiT2BFl2LTCdqHF1meoMEKVhjKGroyf8-JoWHPuBOTc,1378
 secator/output_types/vulnerability.py,sha256=p0DTbr5w7Vv5D3dgbdnvsG5qXzqVVk4YPOPWYS1lxmM,2843
 secator/runners/__init__.py,sha256=EBbOk37vkBy9p8Hhrbi-2VtM_rTwQ3b-0ggTyiD22cE,290
-secator/runners/_base.py,sha256=Or9bDSsxcwYTUeW6G7-Pmag82_yGUtREuzSZWj9IgHY,27268
+secator/runners/_base.py,sha256=wPCGBNEbTLSeFhYgQvTglo7gLA9ptM5Qa_vQSfe23Xk,28372
 secator/runners/_helpers.py,sha256=7UUboSsr4b6srIOOHtSSYhJ9Jxq_qaMVbbF2gVEBnR4,3703
 secator/runners/command.py,sha256=JzdwhbvsDujOyE-i_XgBGH-g6jaEoDNwL7CU2BIZ-Ng,18737
 secator/runners/scan.py,sha256=FjmlL_zkraqhS3rBwy5jHnGsKt2n7Hb2gi4qhgeGenw,1727
-secator/runners/task.py,sha256=JS8JPCW6v3_f_jbFV1-robR53epPPDj0PdxqAtXKmEs,2775
-secator/runners/workflow.py,sha256=Mz8Q4OT48B-o-iQHgZ84WpZfwaECQOp8KRdIirg3He0,3766
+secator/runners/task.py,sha256=PWFRFaI_GdKtgyNx9f7iiCUUUtl0XiinHD7rurspTvc,2823
+secator/runners/workflow.py,sha256=90QvSJXNXTIS3_RecCnzMWYplG6gT-wc82b214XIivE,3773
 secator/serializers/__init__.py,sha256=OP5cmFl77ovgSCW_IDcZ21St2mUt5UK4QHfrsK2KvH8,248
 secator/serializers/dataclass.py,sha256=g5gMT4NwndjhGcGbFuYEs07AZW_Q_m9orov_edVEGlI,792
 secator/serializers/json.py,sha256=XwuSQOBwrOAs16F5HtY-Q-rAGAxfNvlq3z-Nb2gwigE,304
 secator/serializers/regex.py,sha256=hGJ_1JSOv9xPtfn_umHlsjnR_alnsDFv-UmjYCC3vwU,314
 secator/tasks/__init__.py,sha256=Wp2QF5QS2e_BlVygsIEFbmYPTfTg7v_Vd3LQJeXTC7I,344
-secator/tasks/_categories.py,sha256=RuN483yhmzOPg_eR1-djR8MQe96lH4d8UVvaKvcXmiI,9069
+secator/tasks/_categories.py,sha256=w4vxKffTQFJEHNzi6BV5DslGpnSAlKEN0K7H6slG3Vg,9015
 secator/tasks/cariddi.py,sha256=Np9QPMpuqGtsLGHANfcbNaYjoQaqjkFXX9Dbtbtcgu4,3109
 secator/tasks/dalfox.py,sha256=nrLkIbTNz_J7LgUy_3kBgzhTUbQi3RmiSJhc9HWa05c,1744
 secator/tasks/dirsearch.py,sha256=2hJeJZJwaAl3-UAjBwlmjW1w9bxjVWxxwfcaTTxqClc,2387
@@ -90,11 +90,11 @@ secator/tasks/msfconsole.py,sha256=VlhEzsdYMHb6eJy4HBRdXMtRKhdzf5KtQGh7qZqO9Rs,6
 secator/tasks/naabu.py,sha256=RNs4NCZXgKhPqzR78l6l61tau0mGHuj6C3If7fimpgs,1594
 secator/tasks/nmap.py,sha256=LS5FBo-vFxbHVK4DxF5x-O2cAvAK3zL1pROT1GddX9E,9459
 secator/tasks/nuclei.py,sha256=7MlTygHd4EVz81ndrVwP5y6PZ-4j-Y8Oxuk3G3ayHPI,3343
-secator/tasks/searchsploit.py,sha256=RD2uv3GFI3Eb-DiTzJp59jyXnvAZRACq-WjDI1NgFM0,1664
+secator/tasks/searchsploit.py,sha256=l0uNj5Jzax3lVMiMDxC8V3-bQ05y-FPaOhVdro1ibV4,1713
 secator/tasks/subfinder.py,sha256=cpFyFCpVaDZ3QAjNId26ezOwntn3CA5Uk-AC2l0mo0E,1087
 secator/tasks/wpscan.py,sha256=OgFCWEPOjOVdFreBXZDLBRc-PrFmTUv97UaXmaAS9yc,5413
-secator-0.3.0.dist-info/METADATA,sha256=D13Fu1aoN5q5jlvpWnlvtdDAPI39Q1NHW1245e3qU18,13553
-secator-0.3.0.dist-info/WHEEL,sha256=wpsUbWzR9la66_V7_eWTdyvs6WD26tazKT2BBEAC-EM,105
-secator-0.3.0.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.3.0.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.3.0.dist-info/RECORD,,
+secator-0.3.1.dist-info/METADATA,sha256=-y1zHhBhLVGECVIisVgjr7FEJQ_nIlrRGGJ0XxKZQ4s,13553
+secator-0.3.1.dist-info/WHEEL,sha256=wpsUbWzR9la66_V7_eWTdyvs6WD26tazKT2BBEAC-EM,105
+secator-0.3.1.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
+secator-0.3.1.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
+secator-0.3.1.dist-info/RECORD,,