secator 0.8.0__tar.gz → 0.8.2a0__tar.gz

{secator-0.8.0 → secator-0.8.2a0}/.docker/Dockerfile.alpine

@@ -1,27 +1,18 @@
 FROM alpine:latest
 
+ARG flavor=full
 ENV PATH="${PATH}:/root/.local/bin"
 ENV GOBIN="/root/.local/bin"
-ENV TERM="dumb"
+ENV TERM="xterm-256color"
 RUN apk add --no-cache \
-	bash \
-	build-base \
-	chromium \
-	curl \
+	flock \
 	gcc \
-	git \
-	go \
+	musl-dev \
 	linux-headers \
-    openssl \
 	pipx \
-	proxychains-ng \
-	python3 \
 	python3-dev \
 	py3-pip \
-	ruby \
-	ruby-dev \
-	sudo \
-	unzip
+	sudo
 COPY . /code
 WORKDIR /code
 RUN pipx install . && \
@@ -31,6 +22,5 @@ RUN pipx install . && \
 	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
+RUN if [ "$flavor" != "lite" ]; then secator install tools; fi
 ENTRYPOINT ["secator"]

{secator-0.8.0 → secator-0.8.2a0}/.docker/Dockerfile.arch

@@ -6,13 +6,10 @@ RUN pacman -Syu --noconfirm && \
     pacman -S --noconfirm \
 	base-devel \
 	bash \
-	chromium \
 	curl \
-	gcc \
 	git \
 	go \
     jq \
-    make \
     openssl \
 	proxychains \
 	proxychains-ng \
@@ -21,6 +18,7 @@ RUN pacman -Syu --noconfirm && \
 	python-pipx \
 	ruby \
 	rubygems \
+	sudo \
 	unzip \
 	vim \
     wget

{secator-0.8.0 → secator-0.8.2a0}/.docker/Dockerfile.debian

@@ -6,22 +6,19 @@ RUN apt update -y && \
     apt install -y \
 	bash \
 	build-essential \
-	chromium \
 	curl \
-	gcc \
 	git \
 	golang-go \
     jq \
-    make \
     openssl \
 	pipx \
 	python3 \
 	python3-pip \
 	python3-venv \
-	ruby-full \
-	rubygems \
 	proxychains \
 	proxychains-ng \
+	ruby-full \
+	rubygems \
 	sudo \
 	unzip \
 	vim \

{secator-0.8.0 → secator-0.8.2a0}/.docker/Dockerfile.kali

@@ -6,23 +6,20 @@ RUN apt update -y && \
     apt install -y \
 	bash \
 	build-essential \
-	chromium \
 	curl \
-	gcc \
 	git \
 	golang-go \
     jq \
-    make \
     openssl \
 	pipx \
 	python3 \
 	python3-pip \
 	python3-venv \
+	proxychains \
+	proxychains-ng \
 	ruby-full \
 	rubygems \
 	sudo \
-	proxychains \
-	proxychains-ng \
 	unzip \
 	vim \
     wget

{secator-0.8.0 → secator-0.8.2a0}/.docker/Dockerfile.osx

@@ -9,13 +9,10 @@ RUN sudo pacman -Syu --noconfirm && \
     sudo pacman -S --noconfirm -y \
 	base-devel \
 	bash \
-	chromium \
 	curl \
-	gcc \
 	git \
 	go \
     jq \
-    make \
     openssl \
 	proxychains \
 	proxychains-ng \
@@ -24,6 +21,7 @@ RUN sudo pacman -Syu --noconfirm && \
 	python-pipx \
 	ruby \
 	rubygems \
+	sudo \
 	unzip \
 	vim \
     wget

{secator-0.8.0 → secator-0.8.2a0}/.docker/Dockerfile.ubuntu

@@ -6,22 +6,19 @@ RUN apt update -y && \
     apt install -y \
 	bash \
 	build-essential \
-	chromium \
 	curl \
-	gcc \
 	git \
 	golang-go \
     jq \
-    make \
     openssl \
 	pipx \
 	python3 \
 	python3-pip \
 	python3-venv \
-	ruby-full \
-	rubygems \
 	proxychains \
 	proxychains-ng \
+	ruby-full \
+	rubygems \
 	sudo \
 	unzip \
 	vim \

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

@@ -134,3 +134,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# Git
+.git/

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

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.8.1](https://github.com/freelabz/secator/compare/v0.8.0...v0.8.1) (2025-02-07)
+
+
+### Bug Fixes
+
+* reduce docker image size ([#516](https://github.com/freelabz/secator/issues/516)) ([28d8fa3](https://github.com/freelabz/secator/commit/28d8fa379a88a1af73df7edfda28c0270f521bb4))
+
 ## [0.8.0](https://github.com/freelabz/secator/compare/v0.7.0...v0.8.0) (2025-02-06)
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.8.0
+Version: 0.8.2a0
 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 → secator-0.8.2a0}/pyproject.toml

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

{secator-0.8.0 → secator-0.8.2a0}/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-0.8.0 → secator-0.8.2a0}/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-0.8.0 → secator-0.8.2a0}/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-0.8.0 → secator-0.8.2a0}/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
 
@@ -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