secator 0.8.0__py3-none-any.whl → 0.8.1__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
@@ -1095,6 +1095,18 @@ 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)
 	sys.exit(return_code)
 
 

secator/installer.py

@@ -42,9 +42,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 +120,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,7 +134,7 @@ class PackageInstaller:
 				break
 
 		# Installer cmd
-		cmd = distribution.pm_install_command
+		cmd = distribution.pm_installer
 		if getpass.getuser() != 'root':
 			cmd = f'sudo {cmd}'
 
@@ -479,7 +480,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 +489,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/tasks/msfconsole.py

@@ -49,12 +49,11 @@ class msfconsole(VulnMulti):
 		'yum|zypper': ['postgresql-devel'],
 	}
 	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/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/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-0.8.0.dist-info → secator-0.8.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.8.0
+Version: 0.8.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.8.0.dist-info → secator-0.8.1.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=I_0KnLtWPPVBkLRnkGeEsehdJWBQ90R53CBVjVbPmeA,44388
 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=vMkK6ciVtnKCxTQOnHy33jtc0g8_FvkiEu37W1Wf0TA,16579
 secator/report.py,sha256=qJkEdCFttDBXIwUNUzZqFU_sG8l0PvyTSTogZVBv1Rs,3628
 secator/rich.py,sha256=3ugCkgai7UNylQGUuOVAd7ghYWDSc73aSomrfKgKVxo,3290
 secator/template.py,sha256=Qy4RjcmlifeSA8CleWUBb9fluxuYHzxgEH0H-8qs8R4,4323
@@ -100,16 +100,16 @@ secator/tasks/httpx.py,sha256=5oI8vK7w94nsQlKs9Ve4yZsCmogbsiB5PqGarR3eIIM,5854
 secator/tasks/katana.py,sha256=yy07wReBubmjbvpmsx1nmAuKij7M8As8JovQU7_cSrM,5210
 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/msfconsole.py,sha256=Z6RXt_AzGyo_uuC2YWe2-v5GYGWxEwsxeUcddshYINg,6399
 secator/tasks/naabu.py,sha256=zbaLY4CHcmCjOmRnB8c5unMv4_wyLLyCbas-vRm44DU,2047
-secator/tasks/nmap.py,sha256=r4TsWNF6mDT6Dni94hzDwZ_TPh3s-1VOV61W8NASvVs,12520
+secator/tasks/nmap.py,sha256=Zu24sJHnlOf3NXLj3Ohi07-x7m-5Ajr5ULpNsUF-QT0,12546
 secator/tasks/nuclei.py,sha256=8VRl3C7_wTHr3n3zA2E9rDJTMWXFeU6fRM71txiGQHo,4235
-secator/tasks/searchsploit.py,sha256=OrODcBdRcbGmA9qSMJjsWTXwAcCt0nwQYXKqEBdcPbY,3280
+secator/tasks/searchsploit.py,sha256=gvtLZbL2hzAZ07Cf0cSj2Qs0GvWK94XyHvoPFsetXu8,3321
 secator/tasks/subfinder.py,sha256=C6W5NnXT92OUB1aSS9IYseqdI3wDMAz70TOEl8X-o3U,1213
 secator/tasks/wpscan.py,sha256=LGw1DmomP4U83n3V6nyuPhXTd4t99dgrym7oL54JqHE,5495
 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.1.dist-info/METADATA,sha256=0YOH6BCwG2d6Ay7_PePVtpUMZ9NdJ5pWVqQXxG50mXs,14791
+secator-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+secator-0.8.1.dist-info/entry_points.txt,sha256=lPgsqqUXWgiuGSfKy-se5gHdQlAXIwS_A46NYq7Acic,44
+secator-0.8.1.dist-info/licenses/LICENSE,sha256=19W5Jsy4WTctNkqmZIqLRV1gTDOp01S3LDj9iSgWaJ0,2867
+secator-0.8.1.dist-info/RECORD,,