secator 0.8.2a0__tar.gz → 0.9.0__tar.gz

{secator-0.8.2a0 → secator-0.9.0}/.gitignore

@@ -135,5 +135,7 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# Git
-.git/
+# Project
+.git/
+.docker/
+images/

{secator-0.8.2a0 → secator-0.9.0}/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.9.0](https://github.com/freelabz/secator/compare/v0.8.2...v0.9.0) (2025-02-21)
+
+
+### Features
+
+* add cleanup option to secator install tools ([#530](https://github.com/freelabz/secator/issues/530)) ([bcc11c2](https://github.com/freelabz/secator/commit/bcc11c24e628b527111b1890b3810bf60be14448))
+* add warning if bin dir is not in path ([#528](https://github.com/freelabz/secator/issues/528)) ([59ca31e](https://github.com/freelabz/secator/commit/59ca31e3e4bb07680762213d6f5722afb9586519))
+* improve dockerfile size with multi-stage build ([#534](https://github.com/freelabz/secator/issues/534)) ([ceb3652](https://github.com/freelabz/secator/commit/ceb3652371669bfce525a5e26c38e88e9e03356f))
+
+
+### Bug Fixes
+
+* bbot screenshots copy ([#540](https://github.com/freelabz/secator/issues/540)) ([2cea982](https://github.com/freelabz/secator/commit/2cea9825cf73fb97546c38793c7f280db7c99822))
+* install chromium in httpx ([#541](https://github.com/freelabz/secator/issues/541)) ([1965619](https://github.com/freelabz/secator/commit/19656198351fc0b40f71aeb7fb20035db6b89a37))
+* miscellaneous bugfixes ([#533](https://github.com/freelabz/secator/issues/533)) ([b8c0edf](https://github.com/freelabz/secator/commit/b8c0edf30882bb030dbb6b376e264850d3905307))
+* restore colors to rich defaults to honor TERM and NO_COLOR ([#524](https://github.com/freelabz/secator/issues/524)) ([982fc55](https://github.com/freelabz/secator/commit/982fc55a60c03d03bf871727fafdf6840dab0908))
+* secator update command ([#538](https://github.com/freelabz/secator/issues/538)) ([cf73def](https://github.com/freelabz/secator/commit/cf73def36de7e9e8522d795922daae02252792fd))
+
+## [0.8.2](https://github.com/freelabz/secator/compare/v0.8.1...v0.8.2) (2025-02-10)
+
+
+### Bug Fixes
+
+* random proxy bug ([#433](https://github.com/freelabz/secator/issues/433)) ([a437684](https://github.com/freelabz/secator/commit/a4376844b7dea55e8951fe578d5631688728e503))
+
 ## [0.8.1](https://github.com/freelabz/secator/compare/v0.8.0...v0.8.1) (2025-02-07)
 
 

{secator-0.8.2a0 → secator-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.8.2a0
+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.2a0 → secator-0.9.0}/README.md

@@ -94,6 +94,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>
 
@@ -107,7 +108,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.2a0 → secator-0.9.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'hatchling.build'
 
 [project]
 name = 'secator'
-version = "0.8.2-alpha0"
+version = "0.9.0"
 authors = [{ name = 'FreeLabz', email = 'sales@freelabz.com' }]
 readme = 'README.md'
 description = "The pentester's swiss knife."
@@ -72,7 +72,6 @@ trace = [
   'pyinstrument < 5',
 ]
 worker = [
-  'gevent < 25',
   'eventlet < 1',
   'flower < 3',
 ]

{secator-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/secator/runners/command.py

@@ -301,7 +301,7 @@ class Command(Runner):
 				proxy = CONFIG.http.socks5_proxy
 			elif self.proxy in ['auto', 'http'] and self.proxy_http and CONFIG.http.http_proxy:
 				proxy = CONFIG.http.http_proxy
-			elif self.proxy == 'random':
+			elif self.proxy == 'random' and self.proxy_http:
 				proxy = FreeProxy(timeout=CONFIG.http.freeproxy_timeout, rand=True, anonym=True).get()
 			elif self.proxy.startswith(('http://', 'socks5://')):
 				proxy = self.proxy
@@ -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-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/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-0.8.2a0 → secator-0.9.0}/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.2a0/.docker/Dockerfile.alpine

@@ -1,26 +0,0 @@
-FROM alpine:latest
-
-ARG flavor=full
-ENV PATH="${PATH}:/root/.local/bin"
-ENV GOBIN="/root/.local/bin"
-ENV TERM="xterm-256color"
-RUN apk add --no-cache \
-	flock \
-	gcc \
-	musl-dev \
-	linux-headers \
-	pipx \
-	python3-dev \
-	py3-pip \
-	sudo
-COPY . /code
-WORKDIR /code
-RUN pipx install . && \
-	secator install addons worker && \
-	secator install addons gdrive && \
-	secator install addons gcs && \
-	secator install addons mongodb && \
-	secator install addons redis && \
-	secator install addons dev
-RUN if [ "$flavor" != "lite" ]; then secator install tools; fi
-ENTRYPOINT ["secator"]

secator-0.8.2a0/.docker/Dockerfile.arch

@@ -1,36 +0,0 @@
-FROM archlinux:latest
-
-ENV PATH="${PATH}:/root/.local/bin"
-ENV GOBIN="/root/.local/bin"
-RUN pacman -Syu --noconfirm && \
-    pacman -S --noconfirm \
-	base-devel \
-	bash \
-	curl \
-	git \
-	go \
-    jq \
-    openssl \
-	proxychains \
-	proxychains-ng \
-	python \
-	python-pip \
-	python-pipx \
-	ruby \
-	rubygems \
-	sudo \
-	unzip \
-	vim \
-    wget
-COPY . /code
-WORKDIR /code
-RUN pipx install . && \
-	secator install addons worker && \
-	secator install addons gdrive && \
-	secator install addons gcs && \
-	secator install addons mongodb && \
-	secator install addons redis && \
-	secator install addons dev
-RUN secator config set security.force_source_install true
-RUN secator install tools
-ENTRYPOINT ["secator"]

secator-0.8.2a0/.docker/Dockerfile.debian

@@ -1,38 +0,0 @@
-FROM debian:latest
-
-ENV PATH="${PATH}:/root/.local/bin"
-ENV GOBIN="/root/.local/bin"
-RUN apt update -y && \
-    apt install -y \
-	bash \
-	build-essential \
-	curl \
-	git \
-	golang-go \
-    jq \
-    openssl \
-	pipx \
-	python3 \
-	python3-pip \
-	python3-venv \
-	proxychains \
-	proxychains-ng \
-	ruby-full \
-	rubygems \
-	sudo \
-	unzip \
-	vim \
-    wget
-COPY . /code
-WORKDIR /code
-RUN pipx install . && \
-	secator install addons worker && \
-	secator install addons gdrive && \
-	secator install addons gcs && \
-	secator install addons mongodb && \
-	secator install addons redis && \
-	secator install addons dev
-RUN secator install langs go
-RUN secator config set security.force_source_install true
-RUN secator install tools
-ENTRYPOINT ["secator"]

secator-0.8.2a0/.docker/Dockerfile.kali

@@ -1,37 +0,0 @@
-FROM kalilinux/kali-rolling:latest
-
-ENV PATH="${PATH}:/root/.local/bin"
-ENV GOBIN="/root/.local/bin"
-RUN apt update -y && \
-    apt install -y \
-	bash \
-	build-essential \
-	curl \
-	git \
-	golang-go \
-    jq \
-    openssl \
-	pipx \
-	python3 \
-	python3-pip \
-	python3-venv \
-	proxychains \
-	proxychains-ng \
-	ruby-full \
-	rubygems \
-	sudo \
-	unzip \
-	vim \
-    wget
-COPY . /code
-WORKDIR /code
-RUN pipx install . && \
-	secator install addons worker && \
-	secator install addons gdrive && \
-	secator install addons gcs && \
-	secator install addons mongodb && \
-	secator install addons redis && \
-	secator install addons dev
-RUN secator config set security.force_source_install true
-RUN secator install tools
-ENTRYPOINT ["secator"]

secator-0.8.2a0/.docker/Dockerfile.osx

@@ -1,40 +0,0 @@
-FROM sickcodes/docker-osx:latest
-
-ENV PATH="${PATH}:/home/arch/.local/bin"
-ENV GOBIN="/home/arch/.local/bin"
-RUN /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-RUN echo >> /home/arch/.bashrc
-RUN echo 'eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"' >> /home/arch/.bashrc
-RUN sudo pacman -Syu --noconfirm && \
-    sudo pacman -S --noconfirm -y \
-	base-devel \
-	bash \
-	curl \
-	git \
-	go \
-    jq \
-    openssl \
-	proxychains \
-	proxychains-ng \
-	python \
-	python-pip \
-	python-pipx \
-	ruby \
-	rubygems \
-	sudo \
-	unzip \
-	vim \
-    wget
-COPY . /code
-WORKDIR /code
-USER arch
-RUN pipx install . && \
-	secator install addons worker && \
-	secator install addons gdrive && \
-	secator install addons gcs && \
-	secator install addons mongodb && \
-	secator install addons redis && \
-	secator install addons dev
-RUN secator config set security.force_source_install true
-RUN secator install tools
-ENTRYPOINT ["secator"]

secator-0.8.2a0/.docker/Dockerfile.ubuntu

@@ -1,37 +0,0 @@
-FROM ubuntu:latest
-
-ENV PATH="${PATH}:/root/.local/bin"
-ENV GOBIN="/root/.local/bin"
-RUN apt update -y && \
-    apt install -y \
-	bash \
-	build-essential \
-	curl \
-	git \
-	golang-go \
-    jq \
-    openssl \
-	pipx \
-	python3 \
-	python3-pip \
-	python3-venv \
-	proxychains \
-	proxychains-ng \
-	ruby-full \
-	rubygems \
-	sudo \
-	unzip \
-	vim \
-    wget
-COPY . /code
-WORKDIR /code
-RUN pipx install . && \
-	secator install addons worker && \
-	secator install addons gdrive && \
-	secator install addons gcs && \
-	secator install addons mongodb && \
-	secator install addons redis && \
-	secator install addons dev
-RUN secator config set security.force_source_install true
-RUN secator install tools
-ENTRYPOINT ["secator"]

secator-0.8.2a0/.docker/build_all.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Define an array of distributions
-DISTROS=("alpine" "arch" "debian" "kali" "osx" "ubuntu")
-
-# Function to build an image
-build_image() {
-    local DISTRO=$1
-    local DOCKERFILE=".docker/Dockerfile.${DISTRO}"
-    local IMAGE_NAME="secator-${DISTRO}"
-
-    if [ -f "$DOCKERFILE" ]; then
-        echo "🚀 Building $IMAGE_NAME using $DOCKERFILE..."
-        docker build -t "$IMAGE_NAME" -f "$DOCKERFILE" . && \
-        echo "✅ Successfully built $IMAGE_NAME" || \
-        echo "❌ Failed to build $IMAGE_NAME"
-    else
-        echo "⚠️ Dockerfile $DOCKERFILE not found, skipping..."
-    fi
-}
-
-# Iterate through the distributions and build in parallel
-for DISTRO in "${DISTROS[@]}"; do
-    build_image "$DISTRO" &
-done
-
-# Wait for all background jobs to finish
-wait
-
-echo "🎉 All parallel builds completed!"