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

secator/cli.py

@@ -19,7 +19,7 @@ from rich.table import Table
 from secator.config import CONFIG, ROOT_FOLDER, Config, default_config, config_path
 from secator.decorators import OrderedGroup, register_runner
 from secator.definitions import ADDONS_ENABLED, ASCII, DEV_PACKAGE, OPT_NOT_SUPPORTED, VERSION, STATE_COLORS
-from secator.installer import ToolInstaller, fmt_health_table_row, get_health_table, get_version_info
+from secator.installer import ToolInstaller, fmt_health_table_row, get_health_table, get_version_info, get_distro_config
 from secator.output_types import FINDING_TYPES, Info, Error
 from secator.report import Report
 from secator.rich import console
@@ -127,7 +127,7 @@ def worker(hostname, concurrency, reload, queue, pool, check, dev, stop, show):
 
 	# Check Celery addon is installed
 	if not ADDONS_ENABLED['worker']:
-		console.print('[bold red]Missing worker addon: please run [bold green4]secator install addons worker[/][/].')
+		console.print(Error(message='Missing worker addon: please run "secator install addons worker".'))
 		sys.exit(1)
 
 	# Check broken / backend addon is installed
@@ -135,7 +135,7 @@ def worker(hostname, concurrency, reload, queue, pool, check, dev, stop, show):
 	backend_protocol = CONFIG.celery.result_backend.split('://')[0]
 	if CONFIG.celery.broker_url:
 		if (broker_protocol == 'redis' or backend_protocol == 'redis') and not ADDONS_ENABLED['redis']:
-			console.print('[bold red]Missing `redis` addon: please run [bold green4]secator install addons redis[/][/].')
+			console.print(Error(message='Missing redis addon: please run "secator install addons redis".'))
 			sys.exit(1)
 
 	# Debug Celery config
@@ -214,7 +214,7 @@ def revshell(name, host, port, interface, listen, force):
 			console.print(Error(message=f'Interface "{interface}" could not be found. Run "ifconfig" to see the list of available interfaces'))  # noqa: E501
 			return
 		else:
-			console.print(Info(message=f'Detected host IP: [bold orange1]{host}[/]'))
+			console.print(Info(message=f'Detected host IP: {host}'))
 
 	# Download reverse shells JSON from repo
 	revshells_json = f'{CONFIG.dirs.revshells}/revshells.json'
@@ -389,84 +389,54 @@ def record(record_name, script, interactive, width, height, output_dir):
 		console.print(Info(message=f'Generated {output_gif_path}'))
 
 
-@util.group('build')
-def build():
-	"""Build secator."""
+@util.command('build')
+@click.option('--version', type=str, help='Override version specified in pyproject.toml')
+def build(version):
+	"""Build secator PyPI package."""
 	if not DEV_PACKAGE:
 		console.print(Error(message='You MUST use a development version of secator to make builds'))
 		sys.exit(1)
-	pass
-
-
-@build.command('pypi')
-def build_pypi():
-	"""Build secator PyPI package."""
 	if not ADDONS_ENABLED['build']:
-		console.print(Error(message='Missing build addon: please run [bold green4]secator install addons build[/]'))
+		console.print(Error(message='Missing build addon: please run "secator install addons build"'))
 		sys.exit(1)
-	with console.status('[bold gold3]Building PyPI package...[/]'):
-		ret = Command.execute(f'{sys.executable} -m hatch build', name='hatch build', cwd=ROOT_FOLDER)
-		sys.exit(ret.return_code)
 
+	# Update version in pyproject.toml if --version is explicitely passed
+	if version:
+		pyproject_toml_path = Path.cwd() / 'pyproject.toml'
+		if not pyproject_toml_path.exists():
+			console.print(Error(message='You must be in the secator root directory to make builds with --version'))
+			sys.exit(1)
+		console.print(Info(message=f'Updating version in pyproject.toml to {version}'))
+		with open(pyproject_toml_path, "r") as file:
+			content = file.read()
+		updated_content = re.sub(r'^\s*version\s*=\s*".*?"', f'version = "{version}"', content, flags=re.MULTILINE)
+		with open(pyproject_toml_path, "w") as file:
+			file.write(updated_content)
 
-@build.command('docker')
-@click.option('--tag', '-t', type=str, default=None, help='Specific tag')
-@click.option('--latest', '-l', is_flag=True, default=False, help='Latest tag')
-def build_docker(tag, latest):
-	"""Build secator Docker image."""
-	if not tag:
-		tag = VERSION if latest else 'dev'
-	cmd = f'docker build -t freelabz/secator:{tag}'
-	if latest:
-		cmd += ' -t freelabz/secator:latest'
-	cmd += ' .'
-	with console.status('[bold gold3]Building Docker image...[/]'):
-		ret = Command.execute(cmd, name='docker build', cwd=ROOT_FOLDER)
+	with console.status('[bold gold3]Building PyPI package...[/]'):
+		ret = Command.execute(f'{sys.executable} -m hatch build', name='hatch build', cwd=ROOT_FOLDER)
 		sys.exit(ret.return_code)
 
 
-@util.group('publish')
+@util.command('publish')
 def publish():
-	"""Publish secator."""
+	"""Publish secator PyPI package."""
 	if not DEV_PACKAGE:
-		console.print('[bold red]You MUST use a development version of secator to publish builds.[/]')
+		console.print(Error(message='You MUST use a development version of secator to publish builds.'))
 		sys.exit(1)
-	pass
-
-
-@publish.command('pypi')
-def publish_pypi():
-	"""Publish secator PyPI package."""
 	if not ADDONS_ENABLED['build']:
-		console.print('[bold red]Missing build addon: please run [bold green4]secator install addons build[/][/]')
+		console.print(Error(message='Missing build addon: please run "secator install addons build"'))
 		sys.exit(1)
 	os.environ['HATCH_INDEX_USER'] = '__token__'
 	hatch_token = os.environ.get('HATCH_INDEX_AUTH')
 	if not hatch_token:
-		console.print('[bold red]Missing PyPI auth token (HATCH_INDEX_AUTH env variable).')
+		console.print(Error(message='Missing PyPI auth token (HATCH_INDEX_AUTH env variable).'))
 		sys.exit(1)
 	with console.status('[bold gold3]Publishing PyPI package...[/]'):
 		ret = Command.execute(f'{sys.executable} -m hatch publish', name='hatch publish', cwd=ROOT_FOLDER)
 		sys.exit(ret.return_code)
 
 
-@publish.command('docker')
-@click.option('--tag', '-t', default=None, help='Specific tag')
-@click.option('--latest', '-l', is_flag=True, default=False, help='Latest tag')
-def publish_docker(tag, latest):
-	"""Publish secator Docker image."""
-	if not tag:
-		tag = VERSION if latest else 'dev'
-	cmd = f'docker push freelabz/secator:{tag}'
-	cmd2 = 'docker push freelabz/secator:latest'
-	with console.status(f'[bold gold3]Publishing Docker image {tag}...[/]'):
-		ret = Command.execute(cmd, name=f'docker push ({tag})', cwd=ROOT_FOLDER)
-		if latest:
-			ret2 = Command.execute(cmd2, name='docker push (latest)')
-			sys.exit(max(ret.return_code, ret2.return_code))
-		sys.exit(ret.return_code)
-
-
 #--------#
 # CONFIG #
 #--------#
@@ -503,7 +473,7 @@ def config_set(key, value):
 			return
 		console.print(f'[bold green]:tada: Saved config to [/]{CONFIG._path}')
 	else:
-		console.print('[bold red]:x: Invalid config, not saving it.')
+		console.print(Error(message='Invalid config, not saving it.'))
 
 
 @config.command('edit')
@@ -699,13 +669,13 @@ def report_show(report_query, output, runner_type, time_delta, type, query, work
 					f'\n{path} ([bold blue]{runner_name}[/] [dim]{runner_type}[/]) ([dim]{file_date}[/]):')
 				if report.is_empty():
 					if len(paths) == 1:
-						console.print('[bold orange4]No results in report.[/]')
+						console.print(Warning(message='No results in report.'))
 					else:
-						console.print('[bold orange4]No new results since previous scan.[/]')
+						console.print(Warning(message='No new results since previous scan.'))
 					continue
 				report.send()
 			except json.decoder.JSONDecodeError as e:
-				console.print(f'[bold red]Could not load {path}: {str(e)}')
+				console.print(Error(message=f'Could not load {path}: {str(e)}'))
 
 	if unified:
 		console.print(f'\n:wrench: [bold gold3]Building report by crunching {len(all_results)} results ...[/]')
@@ -759,12 +729,12 @@ def report_list(workspace, runner_type, time_delta):
 				f"[{status_color}]{data['status']}[/]"
 			)
 		except json.JSONDecodeError as e:
-			console.print(f'[bold red]Could not load {path}: {str(e)}')
+			console.print(Error(message=f'Could not load {path}: {str(e)}'))
 
 	if len(paths) > 0:
 		console.print(table)
 	else:
-		console.print('[bold red]No results found.')
+		console.print(Error(message='No results found.'))
 
 
 @report.command('export')
@@ -888,7 +858,7 @@ def health(json, debug, strict):
 		error = False
 		for tool, info in status['tools'].items():
 			if not info['installed']:
-				console.print(Error(message=f'{tool} not installed and strict mode is enabled.[/]'))
+				console.print(Error(message=f'{tool} not installed and strict mode is enabled.'))
 				error = True
 		if error:
 			sys.exit(1)
@@ -902,7 +872,7 @@ def health(json, debug, strict):
 
 def run_install(title=None, cmd=None, packages=None, next_steps=None):
 	if CONFIG.offline_mode:
-		console.print('[bold red]Cannot run this command in offline mode.[/]')
+		console.print(Error(message='Cannot run this command in offline mode.'))
 		return
 	with console.status(f'[bold yellow] Installing {title}...'):
 		if cmd:
@@ -1089,12 +1059,28 @@ def install_tools(cmds):
 		tools = ALL_TASKS
 	tools.sort(key=lambda x: x.__name__)
 	return_code = 0
+	if not tools:
+		cmd_str = ' '.join(cmds)
+		console.print(Error(message=f'No tools found for {cmd_str}.'))
+		return
 	for ix, cls in enumerate(tools):
 		with console.status(f'[bold yellow][{ix + 1}/{len(tools)}] Installing {cls.__name__} ...'):
 			status = ToolInstaller.install(cls)
 			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)
 	sys.exit(return_code)
 
 
@@ -1253,7 +1239,7 @@ def test():
 		console.print(Error(message='You MUST use a development version of secator to run tests.'))
 		sys.exit(1)
 	if not ADDONS_ENABLED['dev']:
-		console.print(Error(message='Missing dev addon: please run [bold green4]secator install addons dev[/]'))
+		console.print(Error(message='Missing dev addon: please run "secator install addons dev"'))
 		sys.exit(1)
 	pass
 

secator/installer.py

@@ -18,6 +18,7 @@ import requests
 from rich.table import Table
 
 from secator.config import CONFIG
+from secator.celery import IN_CELERY_WORKER_PROCESS
 from secator.definitions import OPT_NOT_SUPPORTED
 from secator.output_types import Info, Warning, Error
 from secator.rich import console
@@ -42,9 +43,10 @@ class InstallerStatus(Enum):
 
 @dataclass
 class Distribution:
-	pm_install_command: str
-	pm_name: str
 	name: str
+	pm_name: str
+	pm_installer: str
+	pm_finalizer: str
 
 
 class ToolInstaller:
@@ -119,7 +121,7 @@ class PackageInstaller:
 		"""
 		# Init status
 		distribution = get_distro_config()
-		if distribution.pm_install_command == 'unknown':
+		if not distribution.pm_installer:
 			return InstallerStatus.UNKNOWN_DISTRIBUTION
 
 		console.print(
@@ -133,20 +135,24 @@ class PackageInstaller:
 				break
 
 		# Installer cmd
-		cmd = distribution.pm_install_command
+		cmd = distribution.pm_installer
+		if CONFIG.security.autoinstall_commands and IN_CELERY_WORKER_PROCESS:
+			cmd = f'flock /tmp/install.lock {cmd}'
 		if getpass.getuser() != 'root':
 			cmd = f'sudo {cmd}'
 
 		if pkg_list:
+			pkg_str = ''
 			for pkg in pkg_list:
 				if ':' in pkg:
 					pdistro, pkg = pkg.split(':')
 					if pdistro != distribution.name:
 						continue
-				console.print(Info(message=f'Installing package {pkg}'))
-				status = SourceInstaller.install(f'{cmd} {pkg}')
-				if not status.is_ok():
-					return status
+				pkg_str += f'{pkg} '
+			console.print(Info(message=f'Installing packages {pkg_str}'))
+			status = SourceInstaller.install(f'{cmd} {pkg_str}', install_prereqs=False)
+			if not status.is_ok():
+				return status
 		return InstallerStatus.SUCCESS
 
 
@@ -154,7 +160,7 @@ class SourceInstaller:
 	"""Install a tool from source."""
 
 	@classmethod
-	def install(cls, config):
+	def install(cls, config, install_prereqs=True):
 		"""Install from source.
 
 		Args:
@@ -175,6 +181,23 @@ class SourceInstaller:
 					break
 		if not install_cmd:
 			return InstallerStatus.INSTALL_SKIPPED_OK
+
+		# Install build dependencies if needed
+		if install_prereqs:
+			if 'go ' in install_cmd:
+				status = PackageInstaller.install({'apt': ['golang-go'], '*': ['go']})
+				if not status.is_ok():
+					return status
+			if 'gem ' in install_cmd:
+				status = PackageInstaller.install({'apk': ['ruby', 'ruby-dev'], 'pacman': ['ruby', 'rubygems'], 'apt': ['ruby-full', 'rubygems']})  # noqa: E501
+				if not status.is_ok():
+					return status
+			if 'git ' in install_cmd or 'git+' in install_cmd:
+				status = PackageInstaller.install({'*': ['git']})
+				if not status.is_ok():
+					return status
+
+		# Run command
 		ret = Command.execute(install_cmd, cls_attributes={'shell': True}, quiet=False)
 		return InstallerStatus.SUCCESS if ret.return_code == 0 else InstallerStatus.INSTALL_FAILED
 
@@ -312,6 +335,7 @@ class GithubInstaller:
 		temp_dir = os.path.join("/tmp", f'{repo_name}_{date_str}')
 		os.makedirs(temp_dir, exist_ok=True)
 
+		console.print(Info(message=f'Extracting binary to {temp_dir}...'))
 		if url.endswith('.zip'):
 			with zipfile.ZipFile(io.BytesIO(response.content)) as zip_ref:
 				zip_ref.extractall(temp_dir)
@@ -323,7 +347,9 @@ class GithubInstaller:
 		binary_path = cls._find_binary_in_directory(temp_dir, repo_name)
 		if binary_path:
 			os.chmod(binary_path, 0o755)  # Make it executable
-			shutil.move(binary_path, os.path.join(destination, repo_name))  # Move the binary
+			destination = os.path.join(destination, repo_name)
+			console.print(Info(message=f'Moving binary to {destination}...'))
+			shutil.move(binary_path, destination)  # Move the binary
 			return InstallerStatus.SUCCESS
 		else:
 			console.print(Error(message='Binary matching the repository name was not found in the archive.'))
@@ -479,7 +505,8 @@ def get_distro_config():
 	package_manager_variable = os.environ.get('SECATOR_PACKAGE_MANAGER')
 	if package_manager_variable:
 		return package_manager_variable
-	cmd = "unknown"
+	installer = None
+	finalizer = None
 	system = platform.system()
 	distrib = system
 
@@ -487,32 +514,37 @@ def get_distro_config():
 		distrib = distro.id()
 
 		if distrib in ["ubuntu", "debian", "linuxmint", "popos", "kali"]:
-			cmd = "apt install -y"
+			installer = "apt install -y --no-install-recommends"
+			finalizer = "rm -rf /var/lib/apt/lists/*"
 		elif distrib in ["arch", "manjaro", "endeavouros"]:
-			cmd = "pacman -S --noconfirm"
+			installer = "pacman -S --noconfirm --needed"
 		elif distrib in ["alpine"]:
-			cmd = "apk add"
+			installer = "apk add --no-cache"
 		elif distrib in ["fedora"]:
-			cmd = "dnf install -y"
+			installer = "dnf install -y"
+			finalizer = "dnf clean all"
 		elif distrib in ["centos", "rhel", "rocky", "alma"]:
-			cmd = "yum -y"
+			installer = "yum -y"
+			finalizer = "yum clean all"
 		elif distrib in ["opensuse", "sles"]:
-			cmd = "zypper -n"
+			installer = "zypper -n"
+			finalizer = "zypper clean --all"
 
 	elif system == "Darwin":  # macOS
-		cmd = "brew install"
+		installer = "brew install"
 
 	elif system == "Windows":
 		if shutil.which("winget"):
-			cmd = "winget install --disable-interactivity"
+			installer = "winget install --disable-interactivity"
 		elif shutil.which("choco"):
-			cmd = "choco install"
+			installer = "choco install -y --no-progress"
 		else:
-			cmd = "scoop"  # Alternative package manager for Windows
+			installer = "scoop"  # Alternative package manager for Windows
 
-	manager = cmd.split(' ')[0]
+	manager = installer.split(' ')[0]
 	config = Distribution(
-		pm_install_command=cmd,
+		pm_installer=installer,
+		pm_finalizer=finalizer,
 		pm_name=manager,
 		name=distrib
 	)

secator/runners/_base.py

@@ -630,7 +630,7 @@ class Runner:
 			return
 		remote_str = 'starting' if self.sync else 'sent to Celery worker'
 		runner_name = self.__class__.__name__
-		info = Info(message=f'{runner_name} [bold magenta]{self.config.name}[/] {remote_str}...', _source=self.unique_name)
+		info = Info(message=f'{runner_name} {self.config.name} {remote_str}...', _source=self.unique_name)
 		self._print_item(info)
 
 	def log_results(self):

secator/runners/command.py

@@ -146,6 +146,9 @@ class Command(Runner):
 			validators=validators,
 			context=context)
 
+		# Cmd name
+		self.cmd_name = self.__class__.cmd.split(' ')[0]
+
 		# Inputs path
 		self.inputs_path = None
 
@@ -298,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
@@ -308,7 +311,7 @@ class Command(Runner):
 
 		if proxy != 'proxychains' and self.proxy and not proxy:
 			self._print(
-				f'[bold red]Ignoring proxy "{self.proxy}" for {self.__class__.__name__} (not supported).[/]', rich=True)
+				f'[bold red]Ignoring proxy "{self.proxy}" for {self.cmd_name} (not supported).[/]', rich=True)
 
 	#----------#
 	# Internal #
@@ -373,7 +376,7 @@ class Command(Runner):
 					status = ToolInstaller.install(self.__class__)
 					if not status.is_ok():
 						yield Error(
-							message=f'Failed installing {self.name}',
+							message=f'Failed installing {self.cmd_name}',
 							_source=self.unique_name,
 							_uuid=str(uuid.uuid4())
 						)
@@ -433,7 +436,7 @@ class Command(Runner):
 		Returns:
 			bool: True if the command is installed, False otherwise.
 		"""
-		result = subprocess.Popen(["which", self.cmd.split(' ')[0]], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+		result = subprocess.Popen(["which", self.cmd_name], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 		result.communicate()
 		return result.returncode == 0
 

secator/tasks/bbot.py

@@ -1,5 +1,6 @@
 import shutil
 
+from secator.config import CONFIG
 from secator.decorators import task
 from secator.runners import Command
 from secator.serializers import RegexSerializer
@@ -217,7 +218,13 @@ class bbot(Command):
 			'message': 'message'
 		}
 	}
+	install_pre = {
+		'*': ['git', 'openssl', 'unzip', 'tar', 'chromium']
+	}
 	install_cmd = 'pipx install bbot && pipx upgrade bbot'
+	install_post = {
+		'*': f'rm -fr {CONFIG.dirs.share}/pipx/venvs/bbot/lib/python3.12/site-packages/ansible_collections/*'
+	}
 
 	@staticmethod
 	def on_json_loaded(self, item):
@@ -228,7 +235,7 @@ class bbot(Command):
 			return
 
 		if _type not in BBOT_MAP_TYPES:
-			self._print(f'[bold orange3]Found unsupported bbot type: {_type}.[/] [bold green]Skipping.[/]')
+			self._print(f'[bold orange3]Found unsupported bbot type: {_type}.[/] [bold green]Skipping.[/]', rich=True)
 			return
 
 		if isinstance(item['data'], str):

secator/tasks/feroxbuster.py

@@ -59,6 +59,9 @@ class feroxbuster(HttpFuzzer):
 			WORDS: 'word_count'
 		}
 	}
+	install_pre = {
+		'*': ['curl', 'bash']
+	}
 	install_cmd = (
 		f'cd /tmp && curl -sL https://raw.githubusercontent.com/epi052/feroxbuster/master/install-nix.sh | bash -s {CONFIG.dirs.bin}'  # noqa: E501
 	)

secator/tasks/gau.py

@@ -41,6 +41,9 @@ class gau(HttpCrawler):
 		USER_AGENT: OPT_NOT_SUPPORTED,
 	}
 	item_loaders = [JSONSerializer()]
+	install_pre = {
+		'apk': ['libc6-compat']
+	}
 	install_cmd = 'go install -v github.com/lc/gau/v2/cmd/gau@latest'
 	install_github_handle = 'lc/gau'
 	proxychains = False

secator/tasks/grype.py

@@ -27,6 +27,9 @@ class grype(VulnCode):
 		USER_AGENT: OPT_NOT_SUPPORTED
 	}
 	output_types = [Vulnerability]
+	install_pre = {
+		'*': ['curl']
+	}
 	install_cmd = (
 		f'curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b {CONFIG.dirs.bin}'
 	)

secator/tasks/katana.py

@@ -74,6 +74,9 @@ class katana(HttpCrawler):
 			# TAGS: lambda x: x['response'].get('server')
 		}
 	}
+	install_pre = {
+		'apk': ['libc6-compat']
+	}
 	install_cmd = 'go install -v github.com/projectdiscovery/katana/cmd/katana@latest'
 	install_github_handle = 'projectdiscovery/katana'
 	proxychains = False

secator/tasks/mapcidr.py

@@ -13,6 +13,9 @@ class mapcidr(ReconIp):
 	cmd = 'mapcidr -silent'
 	input_flag = '-cidr'
 	file_flag = '-cl'
+	install_pre = {
+		'apk': ['libc6-compat']
+	}
 	install_cmd = 'go install -v github.com/projectdiscovery/mapcidr/cmd/mapcidr@latest'
 	install_github_handle = 'projectdiscovery/mapcidr'
 	input_type = CIDR_RANGE

secator/tasks/msfconsole.py

@@ -44,17 +44,16 @@ class msfconsole(VulnMulti):
 	encoding = 'ansi'
 	ignore_return_code = True
 	install_pre = {
-		'apt|apk': ['libpq-dev', 'libpcap-dev', 'libffi-dev'],
-		'pacman': ['ruby-erb', 'postgresql-libs'],
-		'yum|zypper': ['postgresql-devel'],
+		'apt|apk': ['libpq-dev', 'libpcap-dev', 'libffi-dev', 'g++', 'make'],
+		'pacman': ['ruby-erb', 'postgresql-libs', 'make'],
+		'yum|zypper': ['postgresql-devel', 'make'],
 	}
 	install_cmd = (
-		f'git clone https://github.com/rapid7/metasploit-framework.git {CONFIG.dirs.share}/metasploit-framework || true && '
+		f'git clone --depth 1 --single-branch https://github.com/rapid7/metasploit-framework.git {CONFIG.dirs.share}/metasploit-framework || true && '  # noqa: E501
 		f'cd {CONFIG.dirs.share}/metasploit-framework && '
 		f'gem install bundler --user-install -n {CONFIG.dirs.bin} && '
-		f'gem install xmlrpc --user-install -n {CONFIG.dirs.bin} && '
 		f'bundle config set --local path "{CONFIG.dirs.share}" && '
-		'bundle update --bundler && '
+		'bundle lock --normalize-platforms &&'
 		'bundle install && '
 		f'ln -sf $HOME/.local/share/metasploit-framework/msfconsole {CONFIG.dirs.bin}/msfconsole'
 	)

secator/tasks/naabu.py

@@ -49,8 +49,8 @@ class naabu(ReconPort):
 	output_types = [Port]
 	install_cmd = 'go install -v github.com/projectdiscovery/naabu/v2/cmd/naabu@latest'
 	install_github_handle = 'projectdiscovery/naabu'
-	install_pre = {'apt|apk': ['libpcap-dev'], 'pacman|brew': ['libpcap']}
-	install_post = {'arch|alpine': 'sudo ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.0.8'}
+	install_pre = {'apt': ['libpcap-dev'], 'apk': ['libpcap-dev', 'libc6-compat'], 'pacman|brew': ['libpcap']}
+	install_post = {'arch|alpine': 'sudo ln -sf /usr/lib/libpcap.so /usr/lib/libpcap.so.0.8'}
 	proxychains = False
 	proxy_socks5 = True
 	proxy_http = False

secator/tasks/nmap.py

@@ -68,7 +68,7 @@ class nmap(VulnMulti):
 		'apk': ['nmap', 'nmap-scripts'],
 	}
 	install_cmd = (
-		'sudo git clone https://github.com/scipag/vulscan /opt/scipag_vulscan || true && '
+		'sudo git clone --depth 1 --single-branch https://github.com/scipag/vulscan /opt/scipag_vulscan || true && '
 		'sudo ln -s /opt/scipag_vulscan /usr/share/nmap/scripts/vulscan || true'
 	)
 	proxychains = True

secator/tasks/nuclei.py

@@ -74,6 +74,9 @@ class nuclei(VulnMulti):
 		}
 	}
 	ignore_return_code = True
+	install_pre = {
+		'*': ['git']
+	}
 	install_cmd = 'go install -v github.com/projectdiscovery/nuclei/v2/cmd/nuclei@latest'
 	install_github_handle = 'projectdiscovery/nuclei'
 	install_post = {

secator/tasks/searchsploit.py

@@ -42,7 +42,7 @@ class searchsploit(Command):
 		'apk': ['ncurses']
 	}
 	install_cmd = (
-		f'git clone https://gitlab.com/exploit-database/exploitdb.git {CONFIG.dirs.share}/exploitdb || true && '
+		f'git clone  --depth 1 --single-branch https://gitlab.com/exploit-database/exploitdb.git {CONFIG.dirs.share}/exploitdb || true && '  # noqa: E501
 		f'ln -sf $HOME/.local/share/exploitdb/searchsploit {CONFIG.dirs.bin}/searchsploit'
 	)
 	proxychains = False

secator/tasks/wpscan.py

@@ -68,8 +68,9 @@ class wpscan(VulnHttp):
 	}
 	output_types = [Vulnerability, Tag]
 	install_pre = {
-		'apt': ['kali:libcurl4t64', 'libffi-dev'],
-		'pacman': ['ruby-erb'],
+		'apt': ['make', 'kali:libcurl4t64', 'libffi-dev'],
+		'pacman': ['make', 'ruby-erb'],
+		'*': ['make']
 	}
 	install_cmd = f'gem install wpscan --user-install -n {CONFIG.dirs.bin}'
 	install_post = {

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.8.0
+Version: 0.8.2
 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.8.0.dist-info → secator-0.8.2.dist-info}/RECORD

@@ -2,11 +2,11 @@ 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=gIob9JjQJLtBhYYBErUpWucNqcd_LMEdMHMCurbITic,44012
+secator/cli.py,sha256=rBExC1Lfzkgepwbhvad3XAlY8L_X5s_2uDw-w0kl1_0,43782
 secator/config.py,sha256=6wm2EErW1DuhrdKSuIEUvc2b3yBxJWyZKnocr7lIeZw,19267
 secator/decorators.py,sha256=tjH7WodxJEBIf2CCbegmvOe8H9DKSFh4iPLEhDNGPCA,13784
 secator/definitions.py,sha256=gFtLT9fjNtX_1qkiCjNfQyCvYq07IhScsQzX4o20_SE,3084
-secator/installer.py,sha256=ZK6iEc7cjaYn2lSpbSUkcLWwuu8cpGzhpnlgP-dGYiI,16272
+secator/installer.py,sha256=3Ay9BTxdpOFOBxZud6bv7ozrTJi5ckZra4S0Qv0dLjo,17611
 secator/report.py,sha256=qJkEdCFttDBXIwUNUzZqFU_sG8l0PvyTSTogZVBv1Rs,3628
 secator/rich.py,sha256=3ugCkgai7UNylQGUuOVAd7ghYWDSc73aSomrfKgKVxo,3290
 secator/template.py,sha256=Qy4RjcmlifeSA8CleWUBb9fluxuYHzxgEH0H-8qs8R4,4323
@@ -67,10 +67,10 @@ secator/output_types/user_account.py,sha256=rm10somxyu30JHjj629IkR15Nhahylud_fVO
 secator/output_types/vulnerability.py,sha256=nF7OT9zGez8sZvLrkhjBOORjVi8hCqfCYUFq3eZ_ywo,2870
 secator/output_types/warning.py,sha256=47GtmG083GqGPb_R5JDFmARJ9Mqrme58UxwJhgdGPuI,853
 secator/runners/__init__.py,sha256=EBbOk37vkBy9p8Hhrbi-2VtM_rTwQ3b-0ggTyiD22cE,290
-secator/runners/_base.py,sha256=loCWdCiiP9CUUZlNu1hwropTCud7DwSGcnpgoS3drz8,28990
+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=-2rqSfbPz2Q12otzshm3SIb4BVosIDpbvwh2KScoJ_M,24922
+secator/runners/command.py,sha256=YDnPnEe7R_kemjPd13dRPKLYDPWqMiSI27K6l7Ag7ss,24992
 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,35 +81,35 @@ 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=RLI7fh8t16vxD0fwDY5HFDa5oneitrWH9ZkoN107bAQ,6884
+secator/tasks/bbot.py,sha256=EBLOsI79nRxOdqL57OKJUTY9QXKKHOeqWA3gbQsMyWA,7128
 secator/tasks/bup.py,sha256=4PM123Km3uOkMUwfdLY6J7pyCqIsbwMvOLYx7XYCAZc,3030
 secator/tasks/cariddi.py,sha256=7S92pp7tvihoz9fAiMpmcfPzEvxEJKMlk-IqAvVDISA,2906
 secator/tasks/dalfox.py,sha256=hHQgYuZ7AGQCQtcN8hSM9uPnzeq1DSr_cpOxnn7-660,1850
 secator/tasks/dirsearch.py,sha256=DF-yXHANHb3ARgMOUbqpRuHc8-mE3bteHwTkFpXQtKc,2205
 secator/tasks/dnsx.py,sha256=nK14_DeyX0QTpAMdIP0LSSEOEu5_tQemyFW0XPjA2f8,2266
 secator/tasks/dnsxbrute.py,sha256=R2Fkc_OkO7vc-EyyvgRqvPCf9s11lHJE1TPEplsh_Pw,1423
-secator/tasks/feroxbuster.py,sha256=B1zbMGhanyziSWk5PonR7jDSP8oLKvJ-_DJFhj08xnM,2730
+secator/tasks/feroxbuster.py,sha256=Hh2iNg-lwcvYQhCZuAiejFiAREYu46ebMfNIlZWcxsE,2774
 secator/tasks/ffuf.py,sha256=VGrtjFgSX6Q1I8h1wjPO5XwBFCfZXmn0DQsn9gxEUXc,2468
 secator/tasks/fping.py,sha256=m7eSXFU5yIeDD_kWh-h208ufSZAm4SpQzD34Ko0yCu8,1116
-secator/tasks/gau.py,sha256=MzgnImbkRjB_wI-7YPUnTgyMYbyKcderLagTO_20gPw,1602
+secator/tasks/gau.py,sha256=1Qt0I_FqTh-QyJ0YR8I7i_T80HehWSvem_SS-TQKVm0,1648
 secator/tasks/gf.py,sha256=y8Fc0sRLGqNuwUjTBgLk3HEw3ZOnh09nB_GTufGErNA,962
 secator/tasks/gospider.py,sha256=KGINm9kxrq546xi1yN8_OwNCNDxSW9vVRYDAlvNajBs,2303
-secator/tasks/grype.py,sha256=8iTjI1ZTj-DQgozg-UoBfL-45Lt3Sz4wS4s9jBI-tE0,2411
+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/katana.py,sha256=yy07wReBubmjbvpmsx1nmAuKij7M8As8JovQU7_cSrM,5210
+secator/tasks/katana.py,sha256=A0nnjKKT-A34LBtEuG25lWh5Ria4nwgo4Ti31403E-Q,5256
 secator/tasks/maigret.py,sha256=6anhBzB4lEM90Lk23cAD_ku7I_ghTpj0W0i3h6HARD8,2088
-secator/tasks/mapcidr.py,sha256=zYIlbjJadQY_g2X8hS5vK_789O_XfI2mkIH-Cs8y6hk,944
-secator/tasks/msfconsole.py,sha256=t3fo_Q47YEQE116j_2MNWqcHsxw4afZxxs_ThinjzGc,6414
-secator/tasks/naabu.py,sha256=zbaLY4CHcmCjOmRnB8c5unMv4_wyLLyCbas-vRm44DU,2047
-secator/tasks/nmap.py,sha256=r4TsWNF6mDT6Dni94hzDwZ_TPh3s-1VOV61W8NASvVs,12520
-secator/tasks/nuclei.py,sha256=8VRl3C7_wTHr3n3zA2E9rDJTMWXFeU6fRM71txiGQHo,4235
-secator/tasks/searchsploit.py,sha256=OrODcBdRcbGmA9qSMJjsWTXwAcCt0nwQYXKqEBdcPbY,3280
+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/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=LGw1DmomP4U83n3V6nyuPhXTd4t99dgrym7oL54JqHE,5495
+secator/tasks/wpscan.py,sha256=dF6_dw-Qezd8DmpftGc9KpgrvIk3zDdVJW4mKUa7fe0,5527
 secator/workflows/__init__.py,sha256=ivpZHiYYlj4JqlXLRmB9cmAPUGdk8QcUrCRL34hIqEA,665
-secator-0.8.0.dist-info/METADATA,sha256=eZbs-L8h3DFG-A0iRlMl9WX2RIBz9u6THDukf0KuRCY,14791
-secator-0.8.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-secator-0.8.0.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
-secator-0.8.0.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
-secator-0.8.0.dist-info/RECORD,,
+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,,