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

secator/cli.py

@@ -1047,7 +1047,8 @@ def install_ruby():
 
 @install.command('tools')
 @click.argument('cmds', required=False)
-def install_tools(cmds):
+@click.option('--cleanup', is_flag=True, default=False)
+def install_tools(cmds, cleanup):
 	"""Install supported tools."""
 	if CONFIG.offline_mode:
 		console.print(Error(message='Cannot run this command in offline mode.'))
@@ -1069,18 +1070,19 @@ def install_tools(cmds):
 			if not status.is_ok():
 				return_code = 1
 		console.print()
-	distro = get_distro_config()
-	cleanup_cmds = [
-		'go clean -cache',
-		'go clean -modcache',
-		'pip cache purge',
-		'gem cleanup --user-install',
-		'gem clean --user-install',
-	]
-	if distro.pm_finalizer:
-		cleanup_cmds.append(f'sudo {distro.pm_finalizer}')
-	cmd = ' && '.join(cleanup_cmds)
-	Command.execute(cmd, cls_attributes={'shell': True}, quiet=False)
+	if cleanup:
+		distro = get_distro_config()
+		cleanup_cmds = [
+			'go clean -cache',
+			'go clean -modcache',
+			'pip cache purge',
+			'gem cleanup --user-install',
+			'gem clean --user-install',
+		]
+		if distro.pm_finalizer:
+			cleanup_cmds.append(f'sudo {distro.pm_finalizer}')
+		cmd = ' && '.join(cleanup_cmds)
+		Command.execute(cmd, cls_attributes={'shell': True}, quiet=False)
 	sys.exit(return_code)
 
 
@@ -1097,7 +1099,7 @@ def update(all):
 		sys.exit(1)
 
 	# Check current and latest version
-	info = get_version_info('secator', github_handle='freelabz/secator', version=VERSION)
+	info = get_version_info('secator', '-version', 'freelabz/secator', version=VERSION)
 	latest_version = info['latest_version']
 	do_update = True
 

secator/installer.py

@@ -66,6 +66,12 @@ class ToolInstaller:
 			tool_cls.install_post]):
 			return InstallerStatus.INSTALL_NOT_SUPPORTED
 
+		# Check PATH
+		path_var = os.environ.get('PATH', '')
+		if not str(CONFIG.dirs.bin) in path_var:
+			console.print(Warning(message=f'Bin directory {CONFIG.dirs.bin} not found in PATH ! Binaries installed by secator will not work'))  # noqa: E501
+			console.print(Warning(message=f'Run "export PATH=$PATH:{CONFIG.dirs.bin}" to add the binaries to your PATH'))
+
 		# Install pre-required packages
 		if tool_cls.install_pre:
 			status = PackageInstaller.install(tool_cls.install_pre)

secator/output_types/error.py

@@ -8,6 +8,7 @@ from secator.utils import rich_to_ansi, traceback_as_string, rich_escape as _s
 class Error(OutputType):
 	message: str
 	traceback: str = field(default='', compare=False)
+	traceback_title: str = field(default='', compare=False)
 	_source: str = field(default='', repr=True)
 	_type: str = field(default='error', repr=True)
 	_timestamp: int = field(default_factory=lambda: time.time(), compare=False)
@@ -31,6 +32,9 @@ class Error(OutputType):
 	def __repr__(self):
 		s = rf"\[[bold red]ERR[/]] {_s(self.message)}"
 		if self.traceback:
-			traceback_pretty = '   ' + self.traceback.replace('\n', '\n   ')
+			s += ':'
+			traceback_pretty = '   ' + _s(self.traceback).replace('\n', '\n   ')
+			if self.traceback_title:
+				traceback_pretty = f'   {self.traceback_title}:\n{traceback_pretty}'
 			s += f'\n[dim]{_s(traceback_pretty)}[/]'
 		return rich_to_ansi(s)

secator/rich.py

@@ -4,7 +4,7 @@ import yaml
 from rich.console import Console
 from rich.table import Table
 
-console = Console(stderr=True, color_system='truecolor')
+console = Console(stderr=True)
 console_stdout = Console(record=True)
 # handler = RichHandler(rich_tracebacks=True)  # TODO: add logging handler
 

secator/runners/command.py

@@ -344,7 +344,7 @@ class Command(Runner):
 
 			# Abort if no inputs
 			if len(self.inputs) == 0 and self.skip_if_no_inputs:
-				yield Info(message=f'{self.unique_name} skipped (no inputs)', _source=self.unique_name, _uuid=str(uuid.uuid4()))
+				yield Warning(message=f'{self.unique_name} skipped (no inputs)', _source=self.unique_name, _uuid=str(uuid.uuid4()))
 				return
 
 			# Yield targets
@@ -507,7 +507,7 @@ class Command(Runner):
 		if self.config.name in str(exc):
 			message = 'Executable not found.'
 			if self.install_cmd:
-				message += f' Install it with [bold green4]secator install tools {self.config.name}[/].'
+				message += f' Install it with "secator install tools {self.config.name}".'
 			error = Error(message=message)
 		else:
 			error = Error.from_exception(exc)
@@ -652,12 +652,14 @@ class Command(Runner):
 			)
 
 		elif self.return_code != 0:
-			error = f'Command failed with return code {self.return_code}.'
+			error = f'Command failed with return code {self.return_code}'
 			last_lines = self.output.split('\n')
 			last_lines = last_lines[max(0, len(last_lines) - 2):]
+			last_lines = [line for line in last_lines if line != '']
 			yield Error(
 				message=error,
 				traceback='\n'.join(last_lines),
+				traceback_title='Last stdout lines',
 				_source=self.unique_name,
 				_uuid=str(uuid.uuid4())
 			)

secator/tasks/bbot.py

@@ -4,7 +4,7 @@ from secator.config import CONFIG
 from secator.decorators import task
 from secator.runners import Command
 from secator.serializers import RegexSerializer
-from secator.output_types import Vulnerability, Port, Url, Record, Ip, Tag, Error
+from secator.output_types import Vulnerability, Port, Url, Record, Ip, Tag, Info, Error
 from secator.serializers import JSONSerializer
 
 
@@ -219,7 +219,8 @@ class bbot(Command):
 		}
 	}
 	install_pre = {
-		'*': ['git', 'openssl', 'unzip', 'tar', 'chromium']
+		'apk': ['python3-dev', 'linux-headers', 'musl-dev', 'gcc', 'git', 'openssl', 'unzip', 'tar', 'chromium'],
+		'*': ['gcc', 'git', 'openssl', 'unzip', 'tar', 'chromium']
 	}
 	install_cmd = 'pipx install bbot && pipx upgrade bbot'
 	install_post = {
@@ -234,6 +235,11 @@ class bbot(Command):
 			yield item
 			return
 
+		# Set scan name and base path for output
+		if _type == 'SCAN':
+			self.scan_config = item['data']
+			return
+
 		if _type not in BBOT_MAP_TYPES:
 			self._print(f'[bold orange3]Found unsupported bbot type: {_type}.[/] [bold green]Skipping.[/]', rich=True)
 			return
@@ -278,9 +284,11 @@ class bbot(Command):
 
 		# If a screenshot was saved, move it to secator output folder
 		if item['type'] == 'WEBSCREENSHOT':
-			path = item['data']['path']
-			name = path.split('/')[-1]
+			from pathlib import Path
+			path = Path.home() / '.bbot' / 'scans' / self.scan_config['name'] / item['data']['path']
+			name = path.as_posix().split('/')[-1]
 			secator_path = f'{self.reports_folder}/.outputs/{name}'
+			yield Info(f'Copying screenshot {path} to {secator_path}')
 			shutil.copy(path, secator_path)
 			item['data']['path'] = secator_path
 

secator/tasks/httpx.py

@@ -65,6 +65,9 @@ class httpx(Http):
 	}
 	item_loaders = [JSONSerializer()]
 	output_types = [Url, Subdomain]
+	install_pre = {
+		'apk': ['chromium']
+	}
 	install_cmd = 'go install -v github.com/projectdiscovery/httpx/cmd/httpx@latest'
 	install_github_handle = 'projectdiscovery/httpx'
 	proxychains = False

secator/tasks/naabu.py

@@ -34,7 +34,7 @@ class naabu(ReconPort):
 		# 'health_check': 'hc'
 	}
 	opt_value_map = {
-		TIMEOUT: lambda x: x*1000 if x and x > 0 else None,  # convert to milliseconds
+		TIMEOUT: lambda x: int(x*1000) if x and x > 0 else None,  # convert to milliseconds
 		RETRIES: lambda x: 1 if x == 0 else x,
 		PROXY: lambda x: x.replace('socks5://', '')
 	}

secator/utils.py

@@ -373,7 +373,7 @@ def rich_to_ansi(text):
 		str: Converted text (ANSI).
 	"""
 	from rich.console import Console
-	tmp_console = Console(file=None, highlight=False, color_system='truecolor')
+	tmp_console = Console(file=None, highlight=False)
 	with tmp_console.capture() as capture:
 		tmp_console.print(text, end='', soft_wrap=True)
 	return capture.get()

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.8.2
+Version: 0.9.0
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues
@@ -66,7 +66,6 @@ Requires-Dist: pyinstrument<5; extra == 'trace'
 Provides-Extra: worker
 Requires-Dist: eventlet<1; extra == 'worker'
 Requires-Dist: flower<3; extra == 'worker'
-Requires-Dist: gevent<25; extra == 'worker'
 Description-Content-Type: text/markdown
 
 <h1 align="center">
@@ -165,6 +164,7 @@ check that the tool complies with our selection criterias before doing so. If it
 ```sh
 pipx install secator
 ```
+***Note:** Make sure to have [pipx](https://pipx.pypa.io/stable/installation/) installed.*
 
 </details>
 
@@ -178,7 +178,7 @@ pip install secator
 </details>
 
 <details>
-  <summary>Bash</summary>
+  <summary>Bash (uses apt)</summary>
 
 ```sh
 wget -O - https://raw.githubusercontent.com/freelabz/secator/main/scripts/install.sh | sh

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

@@ -2,16 +2,16 @@ secator/.gitignore,sha256=da8MUc3hdb6Mo0WjZu2upn5uZMbXcBGvhdhTQ1L89HI,3093
 secator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 secator/celery.py,sha256=Ry-JYJzN9F4LFHOn4IXpSFgCzpM99esKiQRJh_TkHp8,9578
 secator/celery_utils.py,sha256=iIuCn_3YkPXCtpnbaYqpppU2TARzSDyTIYHkrRyt54s,7725
-secator/cli.py,sha256=rBExC1Lfzkgepwbhvad3XAlY8L_X5s_2uDw-w0kl1_0,43782
+secator/cli.py,sha256=K6TB619bk8stXHUR_OeNSkD03djWYbvlalRRJvg9R0M,43870
 secator/config.py,sha256=6wm2EErW1DuhrdKSuIEUvc2b3yBxJWyZKnocr7lIeZw,19267
 secator/decorators.py,sha256=tjH7WodxJEBIf2CCbegmvOe8H9DKSFh4iPLEhDNGPCA,13784
 secator/definitions.py,sha256=gFtLT9fjNtX_1qkiCjNfQyCvYq07IhScsQzX4o20_SE,3084
-secator/installer.py,sha256=3Ay9BTxdpOFOBxZud6bv7ozrTJi5ckZra4S0Qv0dLjo,17611
+secator/installer.py,sha256=Q5qmGbxGmuhysEA9YovTpy-YY2TxxFskhrzSX44c42E,17971
 secator/report.py,sha256=qJkEdCFttDBXIwUNUzZqFU_sG8l0PvyTSTogZVBv1Rs,3628
-secator/rich.py,sha256=3ugCkgai7UNylQGUuOVAd7ghYWDSc73aSomrfKgKVxo,3290
+secator/rich.py,sha256=owmuLcTTUt8xYBTE3_SqWTkPeAomcU_8bPdW_V-U8VM,3264
 secator/template.py,sha256=Qy4RjcmlifeSA8CleWUBb9fluxuYHzxgEH0H-8qs8R4,4323
 secator/thread.py,sha256=rgRgEtcMgs2wyfLWVlCTUCLWeg6jsMo5iKpyyrON5rY,655
-secator/utils.py,sha256=mwRZWSoYDskleNvDBHjRIGoygK2DsBMeIdllABvD4vw,21237
+secator/utils.py,sha256=HMw0Q4omL-a5VcbvUhATC30oOSEKxTVLANgVRfWKnkc,21211
 secator/utils_test.py,sha256=ArHwkWW89t0IDqxO4HjJWd_tm7tp1illP4pu3nLq5yo,6559
 secator/configs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 secator/configs/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -51,7 +51,7 @@ secator/hooks/gcs.py,sha256=MIhntyWYz9BZdTXhWl5JznaczSq1_7fl3TVqPufuTSo,1490
 secator/hooks/mongodb.py,sha256=HyjtpJSoxvSZ6aG8uBf1RFLNKGXCBDQL5eEh4xzDonA,7545
 secator/output_types/__init__.py,sha256=LxCW0K1f2vdgUapc4pIEsUpBfC0TQVvqo7T57rGuZGk,1159
 secator/output_types/_base.py,sha256=OgS6ICt66TzPsqo1JZwRIIwbng2HRX1i_u5qbUECgNk,2820
-secator/output_types/error.py,sha256=A2m4YUAAf8z42MMew9XtM24OOZYoYKJzcfB2RWsQmlc,1231
+secator/output_types/error.py,sha256=QjiJ5RoN3-utHqAyvgL2jlmZp7-u7emgUQpvLpYammU,1405
 secator/output_types/exploit.py,sha256=-BKTqPBg94rVgjw8YSmcYuBCI2x-73WwMd9ITP9qr3Y,1750
 secator/output_types/info.py,sha256=R8xeiD3ocNOsvkJPhrQgsx6q-Ea1G0eTAqyuh5JrAR0,843
 secator/output_types/ip.py,sha256=CyE3qkp55Kmj5YRl0CZGS4XrHX8N5apWrLN3OMzaK0U,1127
@@ -70,7 +70,7 @@ secator/runners/__init__.py,sha256=EBbOk37vkBy9p8Hhrbi-2VtM_rTwQ3b-0ggTyiD22cE,2
 secator/runners/_base.py,sha256=tcTsL35dAHsIMfgcclTtvDk2kQM4Hhu-8IZTyHJgqTs,28973
 secator/runners/_helpers.py,sha256=FGogmmdHfCWmIyq7wRprwU1oOSxesOu3Y0N4GyAgiGw,2000
 secator/runners/celery.py,sha256=bqvDTTdoHiGRCt0FRvlgFHQ_nsjKMP5P0PzGbwfCj_0,425
-secator/runners/command.py,sha256=YDnPnEe7R_kemjPd13dRPKLYDPWqMiSI27K6l7Ag7ss,24992
+secator/runners/command.py,sha256=fk5JzdrZ_2T2X8BqU7d0MeVfjmteUYtaRM9MJE5HHPw,25081
 secator/runners/scan.py,sha256=tuPuqwL6fIS4UbCoy5WPKthYWm_LL-vCPRD2qK58HZE,1232
 secator/runners/task.py,sha256=JXlwo3DyQnu69RbQ8xvJnXu6y0rDYN-3iT4q4gy39tI,2004
 secator/runners/workflow.py,sha256=vry_MZFx6dRrorTrdsUqvhMZGOLPCdzpxkvN6fnt62w,3783
@@ -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=EBLOsI79nRxOdqL57OKJUTY9QXKKHOeqWA3gbQsMyWA,7128
+secator/tasks/bbot.py,sha256=PXRf3KJBTRhkVirfZQ1BDeEyg33kY9zKk-iXWn3zo3k,7522
 secator/tasks/bup.py,sha256=4PM123Km3uOkMUwfdLY6J7pyCqIsbwMvOLYx7XYCAZc,3030
 secator/tasks/cariddi.py,sha256=7S92pp7tvihoz9fAiMpmcfPzEvxEJKMlk-IqAvVDISA,2906
 secator/tasks/dalfox.py,sha256=hHQgYuZ7AGQCQtcN8hSM9uPnzeq1DSr_cpOxnn7-660,1850
@@ -96,20 +96,20 @@ secator/tasks/gf.py,sha256=y8Fc0sRLGqNuwUjTBgLk3HEw3ZOnh09nB_GTufGErNA,962
 secator/tasks/gospider.py,sha256=KGINm9kxrq546xi1yN8_OwNCNDxSW9vVRYDAlvNajBs,2303
 secator/tasks/grype.py,sha256=xoOuldnHCrS0O1Y4IzjbSVvoX5eX-fLSZ74THdRC2so,2447
 secator/tasks/h8mail.py,sha256=wNukV-aB-bXPZNq7WL8n1nFgH5b5tGh6vOF80Yna33I,1934
-secator/tasks/httpx.py,sha256=5oI8vK7w94nsQlKs9Ve4yZsCmogbsiB5PqGarR3eIIM,5854
+secator/tasks/httpx.py,sha256=SyJFjMwl8Z9BpG60wk27-X5nI13cp5BJumYWjb0Sefc,5896
 secator/tasks/katana.py,sha256=A0nnjKKT-A34LBtEuG25lWh5Ria4nwgo4Ti31403E-Q,5256
 secator/tasks/maigret.py,sha256=6anhBzB4lEM90Lk23cAD_ku7I_ghTpj0W0i3h6HARD8,2088
 secator/tasks/mapcidr.py,sha256=56ocbaDmB5_C_ns-773CgZXGOKOtkI9q9xJs2Rlfqio,990
 secator/tasks/msfconsole.py,sha256=TXVrvzSWw9Ncv2h9QJtaEinTMbps_z0zX1PFirERVho,6430
-secator/tasks/naabu.py,sha256=29qFob5NOmoFC9gedG03Ogi7uc0dAXgl3azmcWlMbcI,2084
+secator/tasks/naabu.py,sha256=aAEkQ10ma3Log8OVj8wHY1zUWmjpVQ5pehAMQLJQEV0,2089
 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/workflows/__init__.py,sha256=ivpZHiYYlj4JqlXLRmB9cmAPUGdk8QcUrCRL34hIqEA,665
-secator-0.8.2.dist-info/METADATA,sha256=aUam1K6ZPF68PNsnFaHWl_uPZroANXRxg2fBWxy5cvQ,14791
-secator-0.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-secator-0.8.2.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.8.2.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.8.2.dist-info/RECORD,,
+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,,