secator 0.12.0__py3-none-any.whl → 0.13.0__py3-none-any.whl

secator/cli.py

@@ -37,7 +37,7 @@ 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']
 FINDING_TYPES_LOWER = [c.__name__.lower() for c in FINDING_TYPES]
-CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
+CONTEXT_SETTINGS = dict(help_option_names=['-h', '-help', '--help'])
 
 
 #-----#
@@ -46,15 +46,16 @@ CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 
 
 @click.group(cls=OrderedGroup, invoke_without_command=True, context_settings=CONTEXT_SETTINGS)
-@click.option('--version', '-version', is_flag=True, default=False)
+@click.option('--version', '-version', '-v', is_flag=True, default=False)
+@click.option('--quiet', '-quiet', '-q', is_flag=True, default=False)
 @click.pass_context
-def cli(ctx, version):
+def cli(ctx, version, quiet):
 	"""Secator CLI."""
 	ctx.obj = {
 		'piped_input': S_ISFIFO(os.fstat(0).st_mode),
 		'piped_output': not sys.stdout.isatty()
 	}
-	if not ctx.obj['piped_output']:
+	if not ctx.obj['piped_output'] and not quiet:
 		console.print(ASCII, highlight=False)
 	if ctx.invoked_subcommand is None:
 		if version:
@@ -67,11 +68,16 @@ def cli(ctx, version):
 # TASK #
 #------#
 
-@cli.group(aliases=['x', 't'])
+@cli.group(aliases=['x', 't'], invoke_without_command=True)
+@click.option('--list', '-list', is_flag=True, default=False)
 @click.pass_context
-def task(ctx):
+def task(ctx, list=False):
 	"""Run a task."""
-	pass
+	if list:
+		print("\n".join(sorted([t.__name__ for t in ALL_TASKS])))
+		return
+	if ctx.invoked_subcommand is None:
+		ctx.get_help()
 
 
 for cls in ALL_TASKS:
@@ -83,11 +89,16 @@ for cls in ALL_TASKS:
 #----------#
 
 
-@cli.group(cls=OrderedGroup, aliases=['w'])
+@cli.group(cls=OrderedGroup, aliases=['w'], invoke_without_command=True)
+@click.option('--list', '-list', is_flag=True, default=False)
 @click.pass_context
-def workflow(ctx):
+def workflow(ctx, list=False):
 	"""Run a workflow."""
-	pass
+	if list:
+		print("\n".join(sorted([t.name for t in ALL_WORKFLOWS])))
+		return
+	if ctx.invoked_subcommand is None:
+		ctx.get_help()
 
 
 for config in sorted(ALL_WORKFLOWS, key=lambda x: x['name']):
@@ -98,11 +109,16 @@ for config in sorted(ALL_WORKFLOWS, key=lambda x: x['name']):
 # SCAN #
 #------#
 
-@cli.group(cls=OrderedGroup, aliases=['s'])
+@cli.group(cls=OrderedGroup, aliases=['s'], invoke_without_command=True)
+@click.option('--list', '-list', is_flag=True, default=False)
 @click.pass_context
-def scan(ctx):
+def scan(ctx, list=False):
 	"""Run a scan."""
-	pass
+	if list:
+		print("\n".join(sorted([t.name for t in ALL_SCANS])))
+		return
+	if ctx.invoked_subcommand is None:
+		ctx.get_help()
 
 
 for config in sorted(ALL_SCANS, key=lambda x: x['name']):
@@ -860,13 +876,21 @@ def health(json, debug, strict):
 		import json as _json
 		print(_json.dumps(status))
 
+	# Print errors and warnings
+	error = False
+	for tool, info in status['tools'].items():
+		if not info['installed']:
+			console.print(Warning(message=f'{tool} is not installed.'))
+			error = True
+		elif info['outdated']:
+			message = (
+				f'{tool} is outdated (current:{info["version"]}, latest:{info["latest_version"]}).'
+				f' Run `secator install tools {tool}` to update it.'
+			)
+			console.print(Warning(message=message))
+
 	# Strict mode
 	if strict:
-		error = False
-		for tool, info in status['tools'].items():
-			if not info['installed']:
-				console.print(Error(message=f'{tool} is not installed.'))
-				error = True
 		if error:
 			sys.exit(1)
 		console.print(Info(message='Strict healthcheck passed !'))
@@ -1061,16 +1085,27 @@ def install_tools(cmds, cleanup, fail_fast):
 	if CONFIG.offline_mode:
 		console.print(Error(message='Cannot run this command in offline mode.'))
 		return
+	tools = []
 	if cmds is not None:
 		cmds = cmds.split(',')
-		tools = [cls for cls in ALL_TASKS if cls.__name__ in cmds]
+		for cmd in cmds:
+			if '==' in cmd:
+				cmd, version = tuple(cmd.split('=='))
+			else:
+				cmd, version = cmd, None
+			cls = next((cls for cls in ALL_TASKS if cls.__name__ == cmd), None)
+			if cls:
+				if version:
+					cls.install_version = version
+				tools.append(cls)
+			else:
+				console.print(Warning(message=f'Tool {cmd} is not supported or inexistent.'))
 	else:
 		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}.'))
+		console.print(Error(message='No tools found for installing.'))
 		return
 	for ix, cls in enumerate(tools):
 		# with console.status(f'[bold yellow][{ix + 1}/{len(tools)}] Installing {cls.__name__} ...'):
@@ -1140,7 +1175,7 @@ def update(all):
 			cmd = cls.cmd.split(' ')[0]
 			version_flag = cls.get_version_flag()
 			info = get_version_info(cmd, version_flag, cls.install_github_handle)
-			if not info['installed'] or info['status'] == 'outdated' or not info['latest_version']:
+			if not info['installed'] or info['outdated'] or not info['latest_version']:
 				# with console.status(f'[bold yellow]Installing {cls.__name__} ...'):
 				status = ToolInstaller.install(cls)
 				if not status.is_ok():
@@ -1375,73 +1410,147 @@ def performance(tasks, workflows, scans, test):
 @test.command()
 @click.argument('name', type=str)
 @click.option('--verbose', '-v', is_flag=True, default=False, help='Print verbose output')
-def task(name, verbose):
-	"""Test task."""
+@click.option('--check', '-c', is_flag=True, default=False, help='Check task semantics only (no unit + integration tests)')  # noqa: E501
+def task(name, verbose, check):
+	"""Test a single task for semantics errors, and run unit + integration tests."""
+	console.print(f'[bold gold3]:wrench: Testing task {name} ...[/]')
 	task = [task for task in ALL_TASKS if task.__name__ == name]
 	warnings = []
+	errors = []
 	exit_code = 0
 
 	# Check if task is correctly registered
-	check_error(task, 'Check task is registered', 'Task is not registered. Make sure there is no syntax errors in the task class definition.', warnings)  # noqa: E501
 	task = task[0]
 	task_name = task.__name__
 
 	# Run install
-	console.print(f'\n[bold gold3]:wrench: Running install tests for task {name} ...[/]') if verbose else None
 	cmd = f'secator install tools {task_name}'
 	ret_code = Command.execute(cmd, name='install', quiet=not verbose, cwd=ROOT_FOLDER)
 	version_info = task.get_version_info()
-	check_error(version_info['installed'], 'Check task is installed', 'Failed to install command. Fix your installation command.', warnings)  # noqa: E501
-	check_error(any(cmd for cmd in [task.install_cmd, task.install_github_handle]), 'Check task installation command is defined', 'Task has no installation command. Please define a `install_cmd` or `install_github_handle` class attribute.', warnings)  # noqa: E501
-	check_error(version_info['version'], 'Check task version can be fetched', 'Failed to detect version info. Fix your `version_flag` class attribute.', warnings)  # noqa: E501
+	if verbose:
+		console.print(f'Version info:\n{version_info}')
+	status = version_info['status']
+	check_test(
+		version_info['installed'],
+		'Check task is installed',
+		'Failed to install command. Fix your installation command.',
+		errors
+	)
+	check_test(
+		any(cmd for cmd in [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
+	)
+	check_test(
+		version_info['version'],
+		'Check task version can be fetched',
+		'Failed to detect current version. Consider updating your `version_flag` class attribute.',
+		warnings,
+		warn=True
+	)
+	check_test(
+		status != 'latest unknown',
+		'Check latest version',
+		'Failed to detect latest version.',
+		warnings,
+		warn=True
+	)
+	check_test(
+		not version_info['outdated'],
+		'Check task version is up to date',
+		f'Task is not up to date (current version: {version_info["version"]}, latest: {version_info["latest_version"]}). Consider updating your `install_version` class attribute.',  # noqa: E501
+		warnings,
+		warn=True
+	)
 
 	# Run task-specific tests
-	console.print(f'\n[bold gold3]:wrench: Running task-specific tests for {name} ...[/]') if verbose else None
-	check_error(task.__doc__, 'Check task description is set (cls.__doc__)', 'Task has no description (class docstring).', warnings)  # noqa: E501
-	check_error(task.cmd, 'Check task command is set (cls.cmd)', 'Task has no cmd attribute.', warnings)
-	check_error(task.input_type, 'Check task input type is set (cls.input_type)', 'Task has no input_type attribute.', warnings)  # noqa: E501
-	check_error(task.output_types, 'Check task output types is set (cls.output_types)', 'Task has no output_types attribute.', warnings)  # noqa: E501
-
-	# Print all warnings
-	exit_code = 1 if len(warnings) > 0 else 0
-	if exit_code == 1:
-		console.print()
-		console.print("[bold red]Issues:[/]")
-		for warning in warnings:
-			console.print(warning)
-		console.print()
-		console.print(Info(message=f'Skipping unit and integration tests for {name} due to previous errors.'))
-		console.print(Error(message=f'Task {name} tests failed. Please fix the issues above before making a PR.'))
-		sys.exit(exit_code)
-
-	# Run unit tests
-	console.print(f'\n[bold gold3]:wrench: Running unit tests for {name} ...[/]') if verbose else None
-	cmd = f'secator test unit --tasks {name}'
-	ret_code = run_test(cmd, exit=False, verbose=verbose)
-	check_error(ret_code == 0, 'Check unit tests pass', 'Unit tests failed.', warnings)
-
-	# Run integration tests
-	console.print(f'\n[bold gold3]:wrench: Running integration tests for {name} ...[/]') if verbose else None
-	cmd = f'secator test integration --tasks {name}'
-	ret_code = run_test(cmd, exit=False, verbose=verbose)
-	check_error(ret_code == 0, 'Check integration tests pass', 'Integration tests failed.', warnings)
+	check_test(
+		task.__doc__,
+		'Check task description is set (cls.__doc__)',
+		'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)',
+		'Task has no input_type attribute.',
+		warnings,
+		warn=True
+	)
+	check_test(
+		task.output_types,
+		'Check task output types is set (cls.output_types)',
+		'Task has no output_types attribute. Consider setting some so that secator can load your task outputs.',
+		warnings,
+		warn=True
+	)
+	check_test(
+		task.install_version,
+		'Check task install_version is set (cls.install_version)',
+		'Task has no install_version attribute. Consider setting it to pin the tool version and ensure it does not break in the future.',  # noqa: E501
+		warnings,
+		warn=True
+	)
+
+	if not check:
+
+		# Run unit tests
+		cmd = f'secator test unit --tasks {name}'
+		ret_code = run_test(cmd, exit=False, verbose=verbose)
+		check_test(
+			ret_code == 0,
+			'Check unit tests pass',
+			'Unit tests failed.',
+			errors
+		)
+
+		# Run integration tests
+		cmd = f'secator test integration --tasks {name}'
+		ret_code = run_test(cmd, exit=False, verbose=verbose)
+		check_test(
+			ret_code == 0,
+			'Check integration tests pass',
+			'Integration tests failed.',
+			errors
+		)
 
 	# Exit with exit code
-	exit_code = 1 if len(warnings) > 0 else 0
+	exit_code = 1 if len(errors) > 0 else 0
 	if exit_code == 0:
-		console.print(f':tada: Task {name} tests passed ! You are free to make a PR.', style='bold green')
+		console.print(f':tada: Task {name} tests passed !', style='bold green')
 	else:
-		console.print(Error(message=f'Task {name} tests failed. Please fix the issues above before making a PR.'))
+		console.print('\n[bold gold3]Errors:[/]')
+		for error in errors:
+			console.print(error)
+		console.print(Error(message=f'Task {name} tests failed. Please fix the issues above.'))
 
+	if warnings:
+		console.print('\n[bold gold3]Warnings:[/]')
+		for warning in warnings:
+			console.print(warning)
+
+	console.print("\n")
 	sys.exit(exit_code)
 
 
-def check_error(condition, message, error, warnings=[]):
+def check_test(condition, message, fail_message, results=[], warn=False):
 	console.print(f'[bold magenta]:zap: {message} ...[/]', end='')
 	if not condition:
-		warning = Warning(message=error)
-		warnings.append(warning)
-		console.print(' [bold red]FAILED[/]', style='dim')
+		if not warn:
+			error = Error(message=fail_message)
+			console.print(' [bold red]FAILED[/]', style='dim')
+			results.append(error)
+		else:
+			warning = Warning(message=fail_message)
+			console.print(' [bold yellow]WARNING[/]', style='dim')
+			results.append(warning)
 	else:
 		console.print(' [bold green]OK[/]', style='dim')
 	return True

secator/configs/workflows/host_recon.yaml

@@ -7,10 +7,19 @@ input_types:
   - host
   - cidr_range
 tasks:
+  naabu:
+    description: Find open ports
+    ports: "-"  # scan all ports
   nmap:
     description: Search for vulnerabilities on open ports
-    skip_host_discovery: True
-    ports: "-"  # scan all ports
+    version_detection: True
+    script: vulners
+    targets_:
+    - port.host
+    - target.name
+    ports_:
+    - port.port
+    ports: "-"  # default if no port found by naabu
   _group/1:
     httpx:
       description: Probe HTTP services on open ports

secator/configs/workflows/port_scan.yaml

@@ -0,0 +1,39 @@
+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

secator/configs/workflows/url_dirsearch.yaml

@@ -14,6 +14,11 @@ tasks:
         field: '{name}/FUZZ'
   cariddi:
     description: Crawl HTTP directories for content
+    info: True
+    secrets: True
+    errors: True
+    juicy_extensions: 1
+    juicy_endpoints: True
     targets_:
       - target.name
       - url.url

secator/definitions.py

@@ -23,10 +23,6 @@ ASCII = rf"""
 DEBUG = CONFIG.debug.level
 DEBUG_COMPONENT = CONFIG.debug.component.split(',')
 
-# Default tasks settings
-DEFAULT_NUCLEI_FLAGS = os.environ.get('DEFAULT_NUCLEI_FLAGS', '-stats -sj -si 20 -hm -or')
-DEFAULT_FEROXBUSTER_FLAGS = os.environ.get('DEFAULT_FEROXBUSTER_FLAGS', '--auto-bail --no-state')
-
 # Constants
 OPT_NOT_SUPPORTED = -1
 OPT_PIPE_INPUT = -1

secator/installer.py

@@ -31,8 +31,10 @@ class InstallerStatus(Enum):
 	INSTALL_FAILED = 'INSTALL_FAILED'
 	INSTALL_NOT_SUPPORTED = 'INSTALL_NOT_SUPPORTED'
 	INSTALL_SKIPPED_OK = 'INSTALL_SKIPPED_OK'
+	INSTALL_VERSION_NOT_SPECIFIED = 'INSTALL_VERSION_NOT_SPECIFIED'
 	GITHUB_LATEST_RELEASE_NOT_FOUND = 'GITHUB_LATEST_RELEASE_NOT_FOUND'
 	GITHUB_RELEASE_NOT_FOUND = 'RELEASE_NOT_FOUND'
+	GITHUB_RELEASE_UNMATCHED_DISTRIBUTION = 'RELEASE_UNMATCHED_DISTRIBUTION'
 	GITHUB_RELEASE_FAILED_DOWNLOAD = 'GITHUB_RELEASE_FAILED_DOWNLOAD'
 	GITHUB_BINARY_NOT_FOUND_IN_ARCHIVE = 'GITHUB_BINARY_NOT_FOUND_IN_ARCHIVE'
 	UNKNOWN_DISTRIBUTION = 'UNKNOWN_DISTRIBUTION'
@@ -83,12 +85,12 @@ class ToolInstaller:
 		# Install binaries from GH
 		gh_status = InstallerStatus.UNKNOWN
 		if tool_cls.install_github_handle and not CONFIG.security.force_source_install:
-			gh_status = GithubInstaller.install(tool_cls.install_github_handle)
+			gh_status = GithubInstaller.install(tool_cls.install_github_handle, version=tool_cls.install_version or 'latest')
 			status = gh_status
 
 		# Install from source
 		if tool_cls.install_cmd and not gh_status.is_ok():
-			status = SourceInstaller.install(tool_cls.install_cmd)
+			status = SourceInstaller.install(tool_cls.install_cmd, tool_cls.install_version)
 			if not status.is_ok():
 				cls.print_status(status, name)
 				return status
@@ -167,12 +169,14 @@ class SourceInstaller:
 	"""Install a tool from source."""
 
 	@classmethod
-	def install(cls, config, install_prereqs=True):
+	def install(cls, config, version=None, install_prereqs=True):
 		"""Install from source.
 
 		Args:
 			cls: ToolInstaller class.
 			config (dict): A dict of distros as keys and a command as value.
+			version (str, optional): Version to install.
+			install_prereqs (bool, optional): Install pre-requisites.
 
 		Returns:
 			Status: install status.
@@ -204,6 +208,11 @@ class SourceInstaller:
 				if not status.is_ok():
 					return status
 
+		# Handle version
+		if '[install_version]' in install_cmd:
+			version = version or 'latest'
+			install_cmd = install_cmd.replace('[install_version]', version)
+
 		# 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
@@ -213,7 +222,7 @@ class GithubInstaller:
 	"""Install a tool from GitHub releases."""
 
 	@classmethod
-	def install(cls, github_handle):
+	def install(cls, github_handle, version='latest'):
 		"""Find and install a release from a GitHub handle {user}/{repo}.
 
 		Args:
@@ -223,35 +232,38 @@ class GithubInstaller:
 			InstallerStatus: status.
 		"""
 		_, repo = tuple(github_handle.split('/'))
-		latest_release = cls.get_latest_release(github_handle)
-		if not latest_release:
-			return InstallerStatus.GITHUB_LATEST_RELEASE_NOT_FOUND
+		release = cls.get_release(github_handle, version=version)
+		if not release:
+			return InstallerStatus.GITHUB_RELEASE_NOT_FOUND
 
 		# Find the right asset to download
 		system, arch, os_identifiers, arch_identifiers = cls._get_platform_identifier()
-		download_url = cls._find_matching_asset(latest_release['assets'], os_identifiers, arch_identifiers)
+		download_url = cls._find_matching_asset(release['assets'], os_identifiers, arch_identifiers)
 		if not download_url:
 			console.print(Error(message=f'Could not find a GitHub release matching distribution (system: {system}, arch: {arch}).'))  # noqa: E501
-			return InstallerStatus.GITHUB_RELEASE_NOT_FOUND
+			return InstallerStatus.GITHUB_RELEASE_UNMATCHED_DISTRIBUTION
 
 		# Download and unpack asset
 		console.print(Info(message=f'Found release URL: {download_url}'))
 		return cls._download_and_unpack(download_url, CONFIG.dirs.bin, repo)
 
 	@classmethod
-	def get_latest_release(cls, github_handle):
-		"""Get latest release from GitHub.
+	def get_release(cls, github_handle, version='latest'):
+		"""Get release from GitHub.
 
 		Args:
 			github_handle (str): A GitHub handle {user}/{repo}.
 
 		Returns:
-			dict: Latest release JSON from GitHub releases.
+			dict: Release JSON from GitHub releases.
 		"""
 		if not github_handle:
 			return False
 		owner, repo = tuple(github_handle.split('/'))
-		url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
+		if version == 'latest':
+			url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
+		else:
+			url = f"https://api.github.com/repos/{owner}/{repo}/releases/tags/{version}"
 		headers = {}
 		if CONFIG.cli.github_token:
 			headers['Authorization'] = f'Bearer {CONFIG.cli.github_token}'
@@ -268,7 +280,7 @@ class GithubInstaller:
 
 	@classmethod
 	def get_latest_version(cls, github_handle):
-		latest_release = cls.get_latest_release(github_handle)
+		latest_release = cls.get_release(github_handle, version='latest')
 		if not latest_release:
 			return None
 		return latest_release['tag_name'].lstrip('v')
@@ -444,6 +456,7 @@ def get_version_info(name, version_flag=None, install_github_handle=None, instal
 		'latest_version': None,
 		'location': None,
 		'status': '',
+		'outdated': False,
 		'errors': []
 	}
 
@@ -504,6 +517,7 @@ def get_version_info(name, version_flag=None, install_github_handle=None, instal
 	if version and latest_version:
 		if parse_version(version) < parse_version(latest_version):
 			info['status'] = 'outdated'
+			info['outdated'] = True
 		else:
 			info['status'] = 'latest'
 	elif not version:
@@ -529,7 +543,7 @@ def get_distro_config():
 	distrib = system
 
 	if system == "Linux":
-		distrib = distro.id()
+		distrib = distro.id() or distro.like()
 
 		if distrib in ["ubuntu", "debian", "linuxmint", "popos", "kali"]:
 			installer = "apt install -y --no-install-recommends"

secator/runners/_base.py

@@ -130,7 +130,8 @@ class Runner:
 
 		# Determine inputs
 		self.inputs = [inputs] if not isinstance(inputs, list) else inputs
-		self.filter_results(results)
+		targets = [Target(name=target) for target in self.inputs]
+		self.filter_results(results + targets)
 
 		# Debug
 		self.debug('Inputs', obj=self.inputs, sub='init')

secator/runners/_helpers.py

@@ -18,14 +18,25 @@ def run_extractors(results, opts, inputs=[], dry_run=False):
 	"""
 	extractors = {k: v for k, v in opts.items() if k.endswith('_')}
 	errors = []
+	computed_inputs = []
+	computed_opts = {}
 	for key, val in extractors.items():
 		key = key.rstrip('_')
 		values, err = extract_from_results(results, val)
 		errors.extend(err)
 		if key == 'targets':
-			inputs = ['<COMPUTED>'] if dry_run else deduplicate(values)
+			targets = ['<COMPUTED>'] if dry_run else deduplicate(values)
+			computed_inputs.extend(targets)
 		else:
-			opts[key] = ['<COMPUTED>'] if dry_run else deduplicate(values)
+			computed_opt = ['<COMPUTED>'] if dry_run else deduplicate(values)
+			if computed_opt:
+				computed_opts[key] = computed_opt
+				opts[key] = computed_opts[key]
+	if computed_inputs:
+		debug('computed_inputs', obj=computed_inputs, sub='extractors')
+		inputs = computed_inputs
+	if computed_opts:
+		debug('computed_opts', obj=computed_opts, sub='extractors')
 	return inputs, opts, errors
 
 

secator/runners/command.py

@@ -84,6 +84,7 @@ class Command(Runner):
 	install_post = None
 	install_cmd = None
 	install_github_handle = None
+	install_version = None
 
 	# Serializer
 	item_loader = None
@@ -246,7 +247,7 @@ class Command(Runner):
 	def get_version_info(cls):
 		from secator.installer import get_version_info
 		return get_version_info(
-			cls.__name__,
+			cls.cmd.split(' ')[0],
 			cls.get_version_flag(),
 			cls.install_github_handle,
 			cls.install_cmd

secator/tasks/_categories.py

@@ -27,7 +27,7 @@ USER_AGENTS = {
 OPTS = {
 	HEADER: {'type': str, 'help': 'Custom header to add to each request in the form "KEY1:VALUE1; KEY2:VALUE2"', 'default': 'User-Agent: ' + USER_AGENTS['chrome_134.0_win10']},  # noqa: E501
 	DELAY: {'type': float, 'short': 'd', 'help': 'Delay to add between each requests'},
-	DEPTH: {'type': int, 'help': 'Scan depth', 'default': 2},
+	DEPTH: {'type': int, 'help': 'Scan depth'},
 	FILTER_CODES: {'type': str, 'short': 'fc', 'help': 'Filter out responses with HTTP codes'},
 	FILTER_REGEX: {'type': str, 'short': 'fr', 'help': 'Filter out responses with regular expression'},
 	FILTER_SIZE: {'type': str, 'short': 'fs', 'help': 'Filter out responses with size'},
@@ -41,7 +41,7 @@ OPTS = {
 	PROXY: {'type': str, 'help': 'HTTP(s) / SOCKS5 proxy'},
 	RATE_LIMIT: {'type':  int, 'short': 'rl', 'help': 'Rate limit, i.e max number of requests per second'},
 	RETRIES: {'type': int, 'help': 'Retries'},
-	THREADS: {'type': int, 'help': 'Number of threads to run', 'default': 50},
+	THREADS: {'type': int, 'help': 'Number of threads to run'},
 	TIMEOUT: {'type': int, 'help': 'Request timeout'},
 	USER_AGENT: {'type': str, 'short': 'ua', 'help': 'User agent, e.g "Mozilla Firefox 1.0"'},
 	WORDLIST: {'type': str, 'short': 'w', 'default': 'http', 'process': process_wordlist, 'help': 'Wordlist to use'}

secator/tasks/arjun.py

@@ -49,7 +49,8 @@ class arjun(Command):
 		'follow_redirect': '--follow-redirect',
 	}
 	output_types = [Url]
-	install_cmd = 'pipx install arjun && pipx upgrade arjun'
+	install_version = '2.2.7'
+	install_cmd = 'pipx install arjun==[install_version] --force'
 	install_github_handle = 's0md3v/Arjun'
 
 	@staticmethod