secator 0.13.0__tar.gz → 0.14.0__tar.gz

{secator-0.13.0 → secator-0.14.0}/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.14.0](https://github.com/freelabz/secator/compare/v0.13.0...v0.14.0) (2025-04-30)
+
+
+### Features
+
+* add support for profiles ([#532](https://github.com/freelabz/secator/issues/532)) ([6f499b7](https://github.com/freelabz/secator/commit/6f499b72ec18dddde717e00318be4e2b53cc0478))
+
+
+### Bug Fixes
+
+* **cli:** restore --unified option, delete port_scan workflow ([#606](https://github.com/freelabz/secator/issues/606)) ([6dc647d](https://github.com/freelabz/secator/commit/6dc647d7205d15faa1c675485af441549d798118))
+
 ## [0.13.0](https://github.com/freelabz/secator/compare/v0.12.0...v0.13.0) (2025-04-29)
 
 

{secator-0.13.0 → secator-0.14.0}/PKG-INFO

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

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

{secator-0.13.0 → secator-0.14.0}/secator/cli.py

@@ -36,6 +36,7 @@ click.rich_click.USE_RICH_MARKUP = True
 ALL_TASKS = discover_tasks()
 ALL_WORKFLOWS = [t for t in TEMPLATES if t.type == 'workflow']
 ALL_SCANS = [t for t in TEMPLATES if t.type == 'scan']
+ALL_PROFILES = [t for t in TEMPLATES if t.type == 'profile']
 FINDING_TYPES_LOWER = [c.__name__.lower() for c in FINDING_TYPES]
 CONTEXT_SETTINGS = dict(help_option_names=['-h', '-help', '--help'])
 
@@ -125,6 +126,25 @@ for config in sorted(ALL_SCANS, key=lambda x: x['name']):
 	register_runner(scan, config)
 
 
+@cli.group(aliases=['p'])
+@click.pass_context
+def profile(ctx):
+	"""Show profiles"""
+	pass
+
+
+@profile.command('list')
+def profile_list():
+	table = Table()
+	table.add_column("Profile name", style="bold gold3")
+	table.add_column("Description", overflow='fold')
+	table.add_column("Options", overflow='fold')
+	for profile in ALL_PROFILES:
+		opts_str = ','.join(f'{k}={v}' for k, v in profile.opts.items())
+		table.add_row(profile.name, profile.description, opts_str)
+	console.print(table)
+
+
 #--------#
 # WORKER #
 #--------#
@@ -685,7 +705,7 @@ def report_show(report_query, output, runner_type, time_delta, type, query, work
 					all_results.extend(runner.results)
 					continue
 				report = Report(runner, title=f"Consolidated report - {current}", exporters=exporters)
-				report.build(extractors=extractors if not unified else [])
+				report.build(extractors=extractors if not unified else [], dedupe=unified)
 				file_date = get_file_date(path)
 				runner_name = data['info']['name']
 				console.print(
@@ -1423,6 +1443,16 @@ def task(name, verbose, check):
 	task = task[0]
 	task_name = task.__name__
 
+	# Check task command is set
+	check_test(
+		task.cmd,
+		'Check task command is set (cls.cmd)',
+		'Task has no cmd attribute.',
+		errors
+	)
+	if errors:
+		sys.exit(0)
+
 	# Run install
 	cmd = f'secator install tools {task_name}'
 	ret_code = Command.execute(cmd, name='install', quiet=not verbose, cwd=ROOT_FOLDER)
@@ -1437,7 +1467,7 @@ def task(name, verbose, check):
 		errors
 	)
 	check_test(
-		any(cmd for cmd in [task.install_cmd, task.install_github_handle]),
+		any(cmd for cmd in [task.install_pre, task.install_cmd, task.install_github_handle]),
 		'Check task installation command is defined',
 		'Task has no installation command. Please define one or more of the following class attributes: `install_pre`, `install_cmd`, `install_post`, `install_github_handle`.',  # noqa: E501
 		errors
@@ -1471,12 +1501,6 @@ def task(name, verbose, check):
 		'Task has no description (class docstring).',
 		errors
 	)
-	check_test(
-		task.cmd,
-		'Check task command is set (cls.cmd)',
-		'Task has no cmd attribute.',
-		errors
-	)
 	check_test(
 		task.input_type,
 		'Check task input type is set (cls.input_type)',

secator-0.14.0/secator/configs/profiles/aggressive.yaml

@@ -0,0 +1,8 @@
+type: profile
+name: aggressive
+description: "Internal networks or time-sensitive scans"
+opts:
+    rate_limit: 10000
+    delay: 0
+    timeout: 1
+    retries: 1

secator-0.14.0/secator/configs/profiles/default.yaml

@@ -0,0 +1,8 @@
+type: profile
+name: default
+description: "General scanning"
+opts:
+    rate_limit: 1000
+    delay: 0
+    timeout: 5
+    retries: 3

secator-0.14.0/secator/configs/profiles/insane.yaml

@@ -0,0 +1,8 @@
+type: profile
+name: insane
+description: "Local LAN scanning or stress scanning"
+opts:
+    rate_limit: 100000
+    delay: 0
+    timeout: 1
+    retries: 0

secator-0.14.0/secator/configs/profiles/paranoid.yaml

@@ -0,0 +1,8 @@
+type: profile
+name: paranoid
+description: "Maximum stealth"
+opts:
+    rate_limit: 5
+    delay: 5
+    timeout: 15
+    retries: 5

secator-0.14.0/secator/configs/profiles/polite.yaml

@@ -0,0 +1,8 @@
+type: profile
+name: polite
+description: "Avoid overloading network"
+opts:
+    rate_limit: 100
+    delay: 0
+    timeout: 10
+    retries: 5

secator-0.14.0/secator/configs/profiles/sneaky.yaml

@@ -0,0 +1,8 @@
+type: profile
+name: sneaky
+description: "IDS/IPS evasion, sensitive networks"
+opts:
+    rate_limit: 10
+    delay: 2
+    timeout: 15
+    retries: 5

secator-0.14.0/secator/configs/profiles/tor.yaml

@@ -0,0 +1,5 @@
+type: profile
+name: tor
+description: "Anonymous scan using Tor network"
+opts:
+  proxy: tor

{secator-0.13.0 → secator-0.14.0}/secator/decorators.py

@@ -13,6 +13,7 @@ from secator.utils import (deduplicate, expand_input, get_command_category)
 
 RUNNER_OPTS = {
 	'output': {'type': str, 'default': None, 'help': 'Output options (-o table,json,csv,gdrive)', 'short': 'o'},
+	'profiles': {'type': str, 'default': 'default', 'help': 'Profiles', 'short': 'pf'},
 	'workspace': {'type': str, 'default': 'default', 'help': 'Workspace', 'short': 'ws'},
 	'print_json': {'is_flag': True, 'short': 'json', 'default': False, 'help': 'Print items as JSON lines'},
 	'print_raw': {'is_flag': True, 'short': 'raw', 'default': False, 'help': 'Print items in raw format'},

{secator-0.13.0 → secator-0.14.0}/secator/report.py

@@ -55,7 +55,7 @@ class Report:
 					f'{str(e)}[/]\n[dim]{traceback_as_string(e)}[/]',
 				)
 
-	def build(self, extractors=[], dedupe=False):
+	def build(self, extractors=[], dedupe=CONFIG.runners.remove_duplicates):
 		# Trim options
 		from secator.decorators import DEFAULT_CLI_OPTIONS
 		opts = merge_opts(self.runner.config.options, self.runner.run_opts)
@@ -97,7 +97,7 @@ class Report:
 			if items:
 				if sort_by and all(sort_by):
 					items = sorted(items, key=operator.attrgetter(*sort_by))
-				if dedupe and CONFIG.runners.remove_duplicates:
+				if dedupe:
 					items = remove_duplicates(items)
 					# items = [item for item in items if not item._duplicate and item not in dedupe_from]
 				for extractor in extractors:

{secator-0.13.0 → secator-0.14.0}/secator/runners/_base.py

@@ -138,6 +138,10 @@ class Runner:
 		self.debug('Run opts', obj={k: v for k, v in self.run_opts.items() if v is not None}, sub='init')
 		self.debug('Print opts', obj={k: v for k, v in self.print_opts.items() if v is not None}, sub='init')
 
+		# Load profiles
+		profiles_str = run_opts.get('profiles', [])
+		self.load_profiles(profiles_str)
+
 		# Determine exporters
 		exporters_str = self.run_opts.get('output') or self.default_exporters
 		self.exporters = self.resolve_exporters(exporters_str)
@@ -953,6 +957,32 @@ class Runner:
 		]
 		return [cls for cls in classes if cls]
 
+	def load_profiles(self, profiles):
+		"""Load profiles and update run options.
+
+		Args:
+			profiles (list[str]): List of profile names to resolve.
+
+		Returns:
+			list: List of profiles.
+		"""
+		from secator.cli import ALL_PROFILES
+		if isinstance(profiles, str):
+			profiles = profiles.split(',')
+		templates = []
+		for pname in profiles:
+			matches = [p for p in ALL_PROFILES if p.name == pname]
+			if not matches:
+				self._print(Warning(message=f'Profile "{pname}" was not found'), rich=True)
+			else:
+				templates.append(matches[0])
+		opts = {}
+		for profile in templates:
+			self._print(Info(message=f'Loaded profile {profile.name} ({profile.description})'), rich=True)
+			opts.update(profile.opts)
+		opts = {k: v for k, v in opts.items() if k not in self.run_opts}
+		self.run_opts.update(opts)
+
 	@classmethod
 	def get_func_path(cls, func):
 		"""Get the full symbolic path of a function or method, including staticmethods, using function and method

{secator-0.13.0 → secator-0.14.0}/secator/runners/scan.py

@@ -33,6 +33,7 @@ class Scan(Runner):
 		sigs = []
 		for name, workflow_opts in self.config.workflows.items():
 			run_opts = self.run_opts.copy()
+			run_opts.pop('profiles', None)
 			run_opts['no_poll'] = True
 			run_opts['caller'] = 'Scan'
 			opts = merge_opts(scan_opts, workflow_opts, run_opts)

{secator-0.13.0 → secator-0.14.0}/secator/runners/task.py

@@ -32,6 +32,7 @@ class Task(Runner):
 		# Run opts
 		opts = self.run_opts.copy()
 		opts.pop('output', None)
+		opts.pop('profiles', None)
 		opts.pop('no_poll', False)
 
 		# Set output types

{secator-0.13.0 → secator-0.14.0}/secator/template.py

@@ -64,7 +64,7 @@ class TemplateLoader(DotMap):
 		_path = config.pop('_path', None)
 		if _path:
 			console.print(f'[italic green]{_path}[/]\n')
-		yaml_str = yaml.dump(config, indent=4)
+		yaml_str = yaml.dump(config, indent=4, sort_keys=False)
 		from rich.syntax import Syntax
 		yaml_highlight = Syntax(yaml_str, 'yaml', line_numbers=True)
 		console.print(yaml_highlight)

secator-0.13.0/secator/configs/profiles/aggressive.yaml

@@ -1,7 +0,0 @@
-type: profile
-name: aggressive
-options:
-  rate_limit: 100000
-  delay: 0
-  proxy: random
-  user_agent: random

secator-0.13.0/secator/configs/profiles/default.yaml

@@ -1,9 +0,0 @@
-type: profile
-name: default
-options:
-  rate_limit: 1000
-  delay: 1
-  proxy: null
-  user_agent: 'Mozilla ...'
-  nuclei.retries: 5
-  nuclei.timeout: 15

secator-0.13.0/secator/configs/profiles/stealth.yaml

@@ -1,7 +0,0 @@
-type: profile
-name: stealth
-options:
-  rate_limit: 100
-  delay: 1
-  proxy: proxychains
-  user_agent: random

secator-0.13.0/secator/configs/workflows/port_scan.yaml

@@ -1,39 +0,0 @@
-type: workflow
-name: port_scan
-alias: pscan
-description: Port scan
-tags: [recon, network, http, vuln]
-input_types:
-  - host
-  - cidr_range
-tasks:
-  naabu:
-    description: Find open ports
-    skip_host_discovery: True
-    ports: "-"  # scan all ports
-  nmap:
-    description: Search for vulnerabilities on open ports
-    skip_host_discovery: True
-    version_detection: True
-    targets_: port.host
-    ports_: port.port
-  _group:
-    searchsploit:
-      description: Search for related exploits
-      targets_:
-      - type: port
-        field: '{host}~{service_name}'
-        condition: item._source.startswith('nmap') and len(item.service_name.split('/')) > 1
-    httpx:
-      description: Probe HTTP services on open ports
-      targets_:
-        - type: port
-          field: '{host}:{port}'
-          condition: item._source.startswith('nmap')
-results:
-  - type: port
-
-  - type: url
-    condition: item.status_code != 0
-
-  - type: vulnerability