secator 0.14.0__tar.gz → 0.15.0__tar.gz

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

@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.15.0](https://github.com/freelabz/secator/compare/v0.14.0...v0.15.0) (2025-05-04)
+
+
+### Features
+
+* improve cli usage and add multi input types ([#609](https://github.com/freelabz/secator/issues/609)) ([b850914](https://github.com/freelabz/secator/commit/b8509141e62dfd72e0b4f15c2b9b5466089e9818))
+
+
+### Bug Fixes
+
+* installer issue on non-standard distribs ([#613](https://github.com/freelabz/secator/issues/613)) ([194e911](https://github.com/freelabz/secator/commit/194e911b420fcbb0feec3b563a098a3f36cc09cd))
+
 ## [0.14.0](https://github.com/freelabz/secator/compare/v0.13.0...v0.14.0) (2025-04-30)
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.14.0
+Version: 0.15.0
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues
@@ -82,7 +82,7 @@ Description-Content-Type: text/markdown
 <a href="https://pypi.org/project/secator/"><img src="https://img.shields.io/pypi/dm/secator"></a>
 <a href="https://twitter.com/freelabz"><img src="https://img.shields.io/twitter/follow/freelabz.svg?logo=twitter"></a>
 <a href="https://youtube.com/@FreeLabz"><img src="https://img.shields.io/youtube/channel/subscribers/UCu-F6SpU0h2NP18zBBP04cw?style=social&label=Subscribe%20%40FreeLabz"></a>
-<!-- <a href="https://discord.gg/freelabz"><img src="https://img.shields.io/discord/695645237418131507.svg?logo=discord"></a> -->
+<a href="https://discord.gg/nyHjC2aTrq"><img src="https://img.shields.io/discord/695645237418131507.svg?logo=discord"></a>
 </p>
 
 
@@ -91,7 +91,8 @@ Description-Content-Type: text/markdown
   <a href="#supported-commands">Supported commands</a> •
   <a href="#install-secator">Installation</a> •
   <a href="#usage">Usage</a> •
-  <a href="https://docs.freelabz.com">Documentation</a>
+  <a href="https://docs.freelabz.com">Documentation</a>  •
+  <a href="https://discord.gg/nyHjC2aTrq">Join us on Discord !</a>
 </p>
 
 `secator` is a task and workflow runner used for security assessments. It supports dozens of well-known security tools
@@ -122,6 +123,11 @@ and it is designed to improve productivity for pentesters and security researche
 
 | Name                                                          | Description                                                                    | Category        |
 |---------------------------------------------------------------|--------------------------------------------------------------------------------|-----------------|
+| [arjun](https://github.com/s0md3v/Arjun)                      | HTTP Parameter Discovery Suite.                                                |                 |
+| [gitleaks](https://github.com/gitleaks/gitleaks)              | Tool for detecting secrets like passwords, API keys, tokens, etc.              |                 |
+| [testssl](https://github.com/testssl/testssl.sh)              | SSL/TLS security scanner, including ciphers, protocols and cryptographic flaws.|                 |
+| [wafw00f](https://github.com/EnableSecurity/wafw00f)          | Web Application Firewall Fingerprinting tool.                                  |                 |
+| [wpprobe](https://github.com/Chocapikk/wpprobe)               | Fast wordpress plugin enumeration tool.                                        |                 |
 | [httpx](https://github.com/projectdiscovery/httpx)            | Fast HTTP prober.                                                              | `http`          |
 | [cariddi](https://github.com/edoardottt/cariddi)              | Fast crawler and endpoint secrets / api keys / tokens matcher.                 | `http/crawler`  |
 | [gau](https://github.com/lc/gau)                              | Offline URL crawler (Alien Vault, The Wayback Machine, Common Crawl, URLScan). | `http/crawler`  |
@@ -139,6 +145,7 @@ and it is designed to improve productivity for pentesters and security researche
 | [naabu](https://github.com/projectdiscovery/naabu)            | Fast port discovery tool.                                                      | `recon/port`    |
 | [maigret](https://github.com/soxoj/maigret)                   | Hunt for user accounts across many websites.                                   | `recon/user`    |
 | [gf](https://github.com/tomnomnom/gf)                         | A wrapper around grep to avoid typing common patterns.                         | `tagger`        |
+| [trivy](https://github.com/aquasecurity/trivy)                | Comprehensive and versatile security scanner.                                  | `vuln`          |
 | [grype](https://github.com/anchore/grype)                     | A vulnerability scanner for container images and filesystems.                  | `vuln/code`     |
 | [dalfox](https://github.com/hahwul/dalfox)                    | Powerful XSS scanning tool and parameter analyzer.                             | `vuln/http`     |
 | [msfconsole](https://docs.rapid7.com/metasploit/msf-overview) | CLI to access and work with the Metasploit Framework.                          | `vuln/http`     |

{secator-0.14.0 → secator-0.15.0}/README.md

@@ -12,7 +12,7 @@
 <a href="https://pypi.org/project/secator/"><img src="https://img.shields.io/pypi/dm/secator"></a>
 <a href="https://twitter.com/freelabz"><img src="https://img.shields.io/twitter/follow/freelabz.svg?logo=twitter"></a>
 <a href="https://youtube.com/@FreeLabz"><img src="https://img.shields.io/youtube/channel/subscribers/UCu-F6SpU0h2NP18zBBP04cw?style=social&label=Subscribe%20%40FreeLabz"></a>
-<!-- <a href="https://discord.gg/freelabz"><img src="https://img.shields.io/discord/695645237418131507.svg?logo=discord"></a> -->
+<a href="https://discord.gg/nyHjC2aTrq"><img src="https://img.shields.io/discord/695645237418131507.svg?logo=discord"></a>
 </p>
 
 
@@ -21,7 +21,8 @@
   <a href="#supported-commands">Supported commands</a> •
   <a href="#install-secator">Installation</a> •
   <a href="#usage">Usage</a> •
-  <a href="https://docs.freelabz.com">Documentation</a>
+  <a href="https://docs.freelabz.com">Documentation</a>  •
+  <a href="https://discord.gg/nyHjC2aTrq">Join us on Discord !</a>
 </p>
 
 `secator` is a task and workflow runner used for security assessments. It supports dozens of well-known security tools
@@ -52,6 +53,11 @@ and it is designed to improve productivity for pentesters and security researche
 
 | Name                                                          | Description                                                                    | Category        |
 |---------------------------------------------------------------|--------------------------------------------------------------------------------|-----------------|
+| [arjun](https://github.com/s0md3v/Arjun)                      | HTTP Parameter Discovery Suite.                                                |                 |
+| [gitleaks](https://github.com/gitleaks/gitleaks)              | Tool for detecting secrets like passwords, API keys, tokens, etc.              |                 |
+| [testssl](https://github.com/testssl/testssl.sh)              | SSL/TLS security scanner, including ciphers, protocols and cryptographic flaws.|                 |
+| [wafw00f](https://github.com/EnableSecurity/wafw00f)          | Web Application Firewall Fingerprinting tool.                                  |                 |
+| [wpprobe](https://github.com/Chocapikk/wpprobe)               | Fast wordpress plugin enumeration tool.                                        |                 |
 | [httpx](https://github.com/projectdiscovery/httpx)            | Fast HTTP prober.                                                              | `http`          |
 | [cariddi](https://github.com/edoardottt/cariddi)              | Fast crawler and endpoint secrets / api keys / tokens matcher.                 | `http/crawler`  |
 | [gau](https://github.com/lc/gau)                              | Offline URL crawler (Alien Vault, The Wayback Machine, Common Crawl, URLScan). | `http/crawler`  |
@@ -69,6 +75,7 @@ and it is designed to improve productivity for pentesters and security researche
 | [naabu](https://github.com/projectdiscovery/naabu)            | Fast port discovery tool.                                                      | `recon/port`    |
 | [maigret](https://github.com/soxoj/maigret)                   | Hunt for user accounts across many websites.                                   | `recon/user`    |
 | [gf](https://github.com/tomnomnom/gf)                         | A wrapper around grep to avoid typing common patterns.                         | `tagger`        |
+| [trivy](https://github.com/aquasecurity/trivy)                | Comprehensive and versatile security scanner.                                  | `vuln`          |
 | [grype](https://github.com/anchore/grype)                     | A vulnerability scanner for container images and filesystems.                  | `vuln/code`     |
 | [dalfox](https://github.com/hahwul/dalfox)                    | Powerful XSS scanning tool and parameter analyzer.                             | `vuln/http`     |
 | [msfconsole](https://docs.rapid7.com/metasploit/msf-overview) | CLI to access and work with the Metasploit Framework.                          | `vuln/http`     |

{secator-0.14.0 → secator-0.15.0}/pyproject.toml

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

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

@@ -783,7 +783,7 @@ def report_list(workspace, runner_type, time_delta):
 @report.command('export')
 @click.argument('json_path', type=str)
 @click.option('--output-folder', '-of', type=str)
-@click.option('-output', '-o', type=str)
+@click.option('-output', '-o', type=str, required=True)
 def report_export(json_path, output_folder, output):
 	with open(json_path, 'r') as f:
 		data = loads_dataclass(f.read())
@@ -1502,7 +1502,7 @@ def task(name, verbose, check):
 		errors
 	)
 	check_test(
-		task.input_type,
+		task.input_types,
 		'Check task input type is set (cls.input_type)',
 		'Task has no input_type attribute.',
 		warnings,

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

@@ -271,7 +271,6 @@ def generate_cli_subcommand(cli_endpoint, func, **opts):
 def register_runner(cli_endpoint, config):
 	name = config.name
 	input_required = True
-	input_type = 'targets'
 	command_opts = {
 		'no_args_is_help': True,
 		'context_settings': {
@@ -282,37 +281,44 @@ def register_runner(cli_endpoint, config):
 
 	if cli_endpoint.name == 'scan':
 		runner_cls = Scan
+		input_required = False  # allow targets from stdin
 		short_help = config.description or ''
 		short_help += f' [dim]alias: {config.alias}' if config.alias else ''
 		command_opts.update({
 			'name': name,
-			'short_help': short_help
+			'short_help': short_help,
+			'no_args_is_help': False
 		})
+		input_types = config.input_types
 
 	elif cli_endpoint.name == 'workflow':
 		runner_cls = Workflow
+		input_required = False  # allow targets from stdin
 		short_help = config.description or ''
 		short_help = f'{short_help:<55} [dim](alias)[/][bold cyan] {config.alias}' if config.alias else ''
 		command_opts.update({
 			'name': name,
-			'short_help': short_help
+			'short_help': short_help,
+			'no_args_is_help': False
 		})
+		input_types = config.input_types
 
 	elif cli_endpoint.name == 'task':
 		runner_cls = Task
 		input_required = False  # allow targets from stdin
 		task_cls = Task.get_task_class(config.name)
 		task_category = get_command_category(task_cls)
-		input_type = task_cls.input_type or 'targets'
-		short_help = f'[magenta]{task_category:<15}[/]{task_cls.__doc__}'
+		short_help = f'[magenta]{task_category:<25}[/] {task_cls.__doc__}'
 		command_opts.update({
 			'name': name,
 			'short_help': short_help,
 			'no_args_is_help': False
 		})
+		input_types = task_cls.input_types
 
 	else:
 		raise ValueError(f"Unrecognized runner endpoint name {cli_endpoint.name}")
+	input_types_str = '|'.join(input_types) if input_types else 'targets'
 	options = get_command_options(config)
 
 	# TODO: maybe allow this in the future
@@ -324,7 +330,7 @@ def register_runner(cli_endpoint, config):
 	# 		for i in range(0, len(ctx.args), 2)
 	# 	}
 
-	@click.argument(input_type, required=input_required)
+	@click.argument(input_types_str, required=input_required)
 	@decorate_command_options(options)
 	@click.pass_context
 	def func(ctx, **opts):
@@ -353,7 +359,7 @@ def register_runner(cli_endpoint, config):
 		# opts.update(unknown_opts)
 
 		# Expand input
-		inputs = opts.pop(input_type)
+		inputs = opts.pop(input_types_str)
 		inputs = expand_input(inputs, ctx)
 
 		# Build hooks from driver name
@@ -420,10 +426,10 @@ def register_runner(cli_endpoint, config):
 		runner.run()
 
 	generate_cli_subcommand(cli_endpoint, func, **command_opts)
-	generate_rich_click_opt_groups(cli_endpoint, name, input_type, options)
+	generate_rich_click_opt_groups(cli_endpoint, name, input_types, options)
 
 
-def generate_rich_click_opt_groups(cli_endpoint, name, input_type, options):
+def generate_rich_click_opt_groups(cli_endpoint, name, input_types, options):
 	sortorder = {
 		'Execution': 0,
 		'Output': 1,
@@ -434,7 +440,7 @@ def generate_rich_click_opt_groups(cli_endpoint, name, input_type, options):
 	opt_group = [
 		{
 			'name': 'Targets',
-			'options': [input_type],
+			'options': input_types,
 		},
 	]
 	for prefix in prefixes:

{secator-0.14.0 → secator-0.15.0}/secator/definitions.py

@@ -40,6 +40,9 @@ AUTO_CALIBRATION = 'auto_calibration'
 CONTENT_TYPE = 'content_type'
 CONTENT_LENGTH = 'content_length'
 CIDR_RANGE = 'cidr_range'
+DOCKER_IMAGE = 'docker_image'
+FILENAME = 'filename'
+GIT_REPOSITORY = 'git_repository'
 CPES = 'cpes'
 CVES = 'cves'
 DELAY = 'delay'
@@ -62,6 +65,7 @@ MATCH_CODES = 'match_codes'
 MATCH_REGEX = 'match_regex'
 MATCH_SIZE = 'match_size'
 MATCH_WORDS = 'match_words'
+ORG_NAME = 'org_name'
 OUTPUT_PATH = 'output_path'
 PATH = 'path'
 PERCENT = 'percent'
@@ -100,6 +104,7 @@ REFERENCE = 'reference'
 REFERENCES = 'references'
 SEVERITY = 'severity'
 TAGS = 'tags'
+TECHNOLOGY = 'technology'
 WEBSERVER = 'webserver'
 WORDLIST = 'wordlist'
 WORDS = 'words'

{secator-0.14.0 → secator-0.15.0}/secator/installer.py

@@ -47,6 +47,7 @@ class InstallerStatus(Enum):
 @dataclass
 class Distribution:
 	name: str
+	system: str
 	pm_name: str
 	pm_installer: str
 	pm_finalizer: str
@@ -186,6 +187,8 @@ class SourceInstaller:
 			install_cmd = config
 		else:
 			distribution = get_distro_config()
+			if not distribution.pm_installer:
+				return InstallerStatus.UNKNOWN_DISTRIBUTION
 			for distros, command in config.items():
 				if distribution.name in distros.split("|") or distros == '*':
 					install_cmd = command
@@ -543,7 +546,7 @@ def get_distro_config():
 	distrib = system
 
 	if system == "Linux":
-		distrib = distro.id() or distro.like()
+		distrib = distro.like() or distro.id()
 
 		if distrib in ["ubuntu", "debian", "linuxmint", "popos", "kali"]:
 			installer = "apt install -y --no-install-recommends"
@@ -573,12 +576,16 @@ def get_distro_config():
 		else:
 			installer = "scoop"  # Alternative package manager for Windows
 
-	manager = installer.split(' ')[0]
+	if not installer:
+		console.print(Error(message=f'Could not find installer for your distribution (system: {system}, distrib: {distrib})'))  # noqa: E501
+
+	manager = installer.split(' ')[0] if installer else ''
 	config = Distribution(
 		pm_installer=installer,
 		pm_finalizer=finalizer,
 		pm_name=manager,
-		name=distrib
+		name=distrib,
+		system=system
 	)
 	return config
 

{secator-0.14.0 → secator-0.15.0}/secator/output_types/stat.py

@@ -25,6 +25,9 @@ class Stat(OutputType):
 	_table_fields = ['name', 'pid', 'cpu', 'memory']
 	_sort_by = ('name', 'pid')
 
+	def __str__(self) -> str:
+		return f'{self.name} [pid={self.pid}] [cpu={self.cpu:.2f}%] [memory={self.memory:.2f}%]'
+
 	def __repr__(self) -> str:
 		s = rf'[dim yellow3]📊 {self.name} \[pid={self.pid}] \[cpu={self.cpu:.2f}%] \[memory={self.memory:.2f}%]'
 		if self.net_conns:

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

@@ -53,7 +53,7 @@ class Runner:
 	"""
 
 	# Input field (mostly for tests and CLI)
-	input_type = None
+	input_types = []
 
 	# Output types
 	output_types = []
@@ -831,7 +831,7 @@ class Runner:
 			if isinstance(data, (OutputType, dict)):
 				if getattr(data, 'toDict', None):
 					data = data.toDict()
-				data = json.dumps(data)
+				data = json.dumps(data, default=str)
 			print(data, file=out)
 
 	def _get_findings_count(self):

{secator-0.14.0 → secator-0.15.0}/secator/runners/command.py

@@ -30,6 +30,8 @@ class Command(Runner):
 	# Base cmd
 	cmd = None
 
+	# Tags
+	tags = []
 	# Meta options
 	meta_opts = {}
 

{secator-0.14.0 → secator-0.15.0}/secator/tasks/_categories.py

@@ -73,19 +73,19 @@ OPTS_VULN = [
 
 class Http(Command):
 	meta_opts = {k: OPTS[k] for k in OPTS_HTTP_CRAWLERS}
-	input_type = URL
+	input_types = [URL]
 	output_types = [Url]
 
 
 class HttpCrawler(Command):
 	meta_opts = {k: OPTS[k] for k in OPTS_HTTP_CRAWLERS}
-	input_type = URL
+	input_types = [URL]
 	output_types = [Url]
 
 
 class HttpFuzzer(Command):
 	meta_opts = {k: OPTS[k] for k in OPTS_HTTP_FUZZERS}
-	input_type = URL
+	input_types = [URL]
 	output_types = [Url]
 
 
@@ -99,22 +99,22 @@ class Recon(Command):
 
 
 class ReconDns(Recon):
-	input_type = HOST
+	input_types = [HOST]
 	output_types = [Subdomain]
 
 
 class ReconUser(Recon):
-	input_type = USERNAME
+	input_types = [USERNAME]
 	output_types = [UserAccount]
 
 
 class ReconIp(Recon):
-	input_type = CIDR_RANGE
+	input_types = [CIDR_RANGE]
 	output_types = [Ip]
 
 
 class ReconPort(Recon):
-	input_type = IP
+	input_types = [IP]
 	output_types = [Port]
 
 
@@ -434,15 +434,15 @@ class Vuln(Command):
 
 
 class VulnHttp(Vuln):
-	input_type = HOST
+	input_types = [HOST]
 
 
 class VulnCode(Vuln):
-	input_type = PATH
+	input_types = [PATH]
 
 
 class VulnMulti(Vuln):
-	input_type = HOST
+	input_types = [HOST]
 	output_types = [Vulnerability]
 
 
@@ -451,7 +451,7 @@ class VulnMulti(Vuln):
 #--------------#
 
 class Tagger(Command):
-	input_type = URL
+	input_types = [URL]
 	output_types = [Tag]
 
 #----------------#

{secator-0.14.0 → secator-0.15.0}/secator/tasks/arjun.py

@@ -14,8 +14,9 @@ from secator.utils import process_wordlist
 class arjun(Command):
 	"""HTTP Parameter Discovery Suite."""
 	cmd = 'arjun'
+	tags = ['url', 'fuzz', 'params']
 	input_flag = '-u'
-	input_type = URL
+	input_types = [URL]
 	version_flag = ' '
 	opts = {
 		'chunk_size': {'type': int, 'help': 'Control query/chunk size'},

{secator-0.14.0 → secator-0.15.0}/secator/tasks/bbot.py

@@ -2,6 +2,7 @@ import shutil
 
 from secator.config import CONFIG
 from secator.decorators import task
+from secator.definitions import FILENAME, HOST, IP, ORG_NAME, PORT, URL, USERNAME
 from secator.runners import Command
 from secator.serializers import RegexSerializer
 from secator.output_types import Vulnerability, Port, Url, Record, Ip, Tag, Info, Error
@@ -177,8 +178,10 @@ def output_discriminator(self, item):
 class bbot(Command):
 	"""Multipurpose scanner."""
 	cmd = 'bbot -y --allow-deadly --force'
+	tags = ['vuln', 'scan']
 	json_flag = '--json'
 	input_flag = '-t'
+	input_types = [HOST, IP, URL, PORT, ORG_NAME, USERNAME, FILENAME]
 	file_flag = None
 	version_flag = '--help'
 	opts = {

{secator-0.14.0 → secator-0.15.0}/secator/tasks/bup.py

@@ -16,8 +16,9 @@ from secator.tasks._categories import Http
 class bup(Http):
 	"""40X bypasser."""
 	cmd = 'bup'
+	tags = ['url', 'bypass']
 	input_flag = '-u'
-	input_type = URL
+	input_types = [URL]
 	json_flag = '--jsonl'
 	opt_prefix = '--'
 	opts = {

{secator-0.14.0 → secator-0.15.0}/secator/tasks/cariddi.py

@@ -14,7 +14,8 @@ from secator.tasks._categories import HttpCrawler
 class cariddi(HttpCrawler):
 	"""Crawl endpoints, secrets, api keys, extensions, tokens..."""
 	cmd = 'cariddi'
-	input_type = URL
+	tags = ['url', 'crawl']
+	input_types = [URL]
 	input_flag = OPT_PIPE_INPUT
 	output_types = [Url, Tag]
 	file_flag = OPT_PIPE_INPUT

{secator-0.14.0 → secator-0.15.0}/secator/tasks/dalfox.py

@@ -21,7 +21,8 @@ DALFOX_TYPE_MAP = {
 class dalfox(VulnHttp):
 	"""Powerful open source XSS scanning tool."""
 	cmd = 'dalfox'
-	input_type = URL
+	tags = ['url', 'fuzz']
+	input_types = [URL]
 	input_flag = 'url'
 	file_flag = 'file'
 	# input_chunk_size = 1

{secator-0.14.0 → secator-0.15.0}/secator/tasks/dirsearch.py

@@ -9,7 +9,7 @@ from secator.definitions import (CONTENT_LENGTH, CONTENT_TYPE, DELAY, DEPTH,
 							   MATCH_CODES, MATCH_REGEX, MATCH_SIZE,
 							   MATCH_WORDS, METHOD, OPT_NOT_SUPPORTED, OUTPUT_PATH, PROXY,
 							   RATE_LIMIT, RETRIES, STATUS_CODE,
-							   THREADS, TIMEOUT, USER_AGENT, WORDLIST)
+							   THREADS, TIMEOUT, USER_AGENT, WORDLIST, URL)
 from secator.output_types import Url, Info, Error
 from secator.tasks._categories import HttpFuzzer
 
@@ -18,6 +18,8 @@ from secator.tasks._categories import HttpFuzzer
 class dirsearch(HttpFuzzer):
 	"""Advanced web path brute-forcer."""
 	cmd = 'dirsearch'
+	tags = ['url', 'fuzz']
+	input_types = [URL]
 	input_flag = '-u'
 	file_flag = '-l'
 	json_flag = '-O json'

{secator-0.14.0 → secator-0.15.0}/secator/tasks/dnsx.py

@@ -1,5 +1,5 @@
 from secator.decorators import task
-from secator.definitions import (OPT_PIPE_INPUT, RATE_LIMIT, RETRIES, THREADS)
+from secator.definitions import (HOST, OPT_PIPE_INPUT, RATE_LIMIT, RETRIES, THREADS)
 from secator.output_types import Record, Ip, Subdomain
 from secator.output_types.ip import IpProtocol
 from secator.tasks._categories import ReconDns
@@ -11,8 +11,10 @@ from secator.utils import extract_domain_info
 class dnsx(ReconDns):
 	"""dnsx is a fast and multi-purpose DNS toolkit designed for running various retryabledns library."""
 	cmd = 'dnsx -resp -recon'
+	tags = ['dns', 'fuzz']
 	json_flag = '-json'
 	input_flag = OPT_PIPE_INPUT
+	input_types = [HOST]
 	file_flag = OPT_PIPE_INPUT
 	output_types = [Record, Ip, Subdomain]
 	opt_key_map = {

{secator-0.14.0 → secator-0.15.0}/secator/tasks/dnsxbrute.py

@@ -11,8 +11,10 @@ from secator.utils import process_wordlist
 class dnsxbrute(ReconDns):
     """dnsx is a fast and multi-purpose DNS toolkit designed for running various library."""
     cmd = 'dnsx'
+    tags = ['dns', 'fuzz']
     json_flag = '-json'
     input_flag = '-domain'
+    input_types = [HOST]
     file_flag = '-domain'
     opt_key_map = {
         RATE_LIMIT: 'rate-limit',

{secator-0.14.0 → secator-0.15.0}/secator/tasks/feroxbuster.py

@@ -6,7 +6,7 @@ from secator.definitions import (CONTENT_TYPE, DELAY, DEPTH, FILTER_CODES,
 							   MATCH_REGEX, MATCH_SIZE, MATCH_WORDS, METHOD,
 							   OPT_NOT_SUPPORTED, OPT_PIPE_INPUT, PROXY,
 							   RATE_LIMIT, RETRIES, STATUS_CODE,
-							   THREADS, TIMEOUT, USER_AGENT, WORDLIST, WORDS)
+							   THREADS, TIMEOUT, USER_AGENT, WORDLIST, WORDS, URL)
 from secator.output_types import Url
 from secator.serializers import JSONSerializer
 from secator.tasks._categories import HttpFuzzer
@@ -16,6 +16,8 @@ from secator.tasks._categories import HttpFuzzer
 class feroxbuster(HttpFuzzer):
 	"""Simple, fast, recursive content discovery tool written in Rust"""
 	cmd = 'feroxbuster --auto-bail --no-state'
+	tags = ['url', 'fuzz']
+	input_types = [URL]
 	input_flag = '--url'
 	input_chunk_size = 1
 	file_flag = OPT_PIPE_INPUT

{secator-0.14.0 → secator-0.15.0}/secator/tasks/ffuf.py

@@ -7,7 +7,7 @@ from secator.definitions import (AUTO_CALIBRATION, CONTENT_LENGTH,
 								 MATCH_WORDS, METHOD, OPT_NOT_SUPPORTED,
 								 PERCENT, PROXY, RATE_LIMIT, RETRIES,
 								 STATUS_CODE, THREADS, TIME, TIMEOUT,
-								 USER_AGENT, WORDLIST)
+								 USER_AGENT, WORDLIST, URL)
 from secator.output_types import Progress, Url
 from secator.serializers import JSONSerializer, RegexSerializer
 from secator.tasks._categories import HttpFuzzer
@@ -19,6 +19,8 @@ FFUF_PROGRESS_REGEX = r':: Progress: \[(?P<count>\d+)/(?P<total>\d+)\] :: Job \[
 class ffuf(HttpFuzzer):
 	"""Fast web fuzzer written in Go."""
 	cmd = 'ffuf -noninteractive'
+	tags = ['url', 'fuzz']
+	input_types = [URL]
 	input_flag = '-u'
 	input_chunk_size = 1
 	file_flag = None

{secator-0.14.0 → secator-0.15.0}/secator/tasks/fping.py

@@ -11,8 +11,10 @@ from secator.tasks._categories import ReconIp
 class fping(ReconIp):
 	"""Send ICMP echo probes to network hosts, similar to ping, but much better."""
 	cmd = 'fping -a'
+	tags = ['ip', 'recon']
 	file_flag = '-f'
 	input_flag = None
+	input_types = [IP]
 	opt_prefix = '--'
 	opt_key_map = {
 		DELAY: 'period',
@@ -26,7 +28,7 @@ class fping(ReconIp):
 		DELAY: lambda x: x * 1000,  # convert s to ms
 		TIMEOUT: lambda x: x * 1000  # convert s to ms
 	}
-	input_type = IP
+	input_types = [IP]
 	output_types = [Ip]
 	install_pre = {'*': ['fping']}
 	ignore_return_code = True

{secator-0.14.0 → secator-0.15.0}/secator/tasks/gau.py

@@ -4,7 +4,7 @@ from secator.definitions import (DELAY, DEPTH, FILTER_CODES, FILTER_REGEX,
 							   HEADER, MATCH_CODES, MATCH_REGEX, MATCH_SIZE,
 							   MATCH_WORDS, METHOD, OPT_NOT_SUPPORTED,
 							   OPT_PIPE_INPUT, PROXY, RATE_LIMIT, RETRIES,
-							   THREADS, TIMEOUT, USER_AGENT)
+							   THREADS, TIMEOUT, USER_AGENT, URL)
 from secator.serializers import JSONSerializer
 from secator.tasks._categories import HttpCrawler
 
@@ -13,6 +13,8 @@ from secator.tasks._categories import HttpCrawler
 class gau(HttpCrawler):
 	"""Fetch known URLs from AlienVault's Open Threat Exchange, the Wayback Machine, Common Crawl, and URLScan."""
 	cmd = 'gau'
+	tags = ['pattern', 'scan']
+	input_types = [URL]
 	file_flag = OPT_PIPE_INPUT
 	json_flag = '--json'
 	opt_prefix = '--'

{secator-0.14.0 → secator-0.15.0}/secator/tasks/gf.py

@@ -8,6 +8,7 @@ from secator.tasks._categories import Tagger
 class gf(Tagger):
 	"""Wrapper around grep, to help you grep for things."""
 	cmd = 'gf'
+	tags = ['pattern', 'scan']
 	file_flag = OPT_PIPE_INPUT
 	input_flag = OPT_PIPE_INPUT
 	version_flag = OPT_NOT_SUPPORTED
@@ -17,7 +18,7 @@ class gf(Tagger):
 	opt_key_map = {
 		'pattern': ''
 	}
-	input_type = URL
+	input_types = [URL]
 	install_cmd = (
 		'go install -v github.com/tomnomnom/gf@latest && '
 		'git clone https://github.com/1ndianl33t/Gf-Patterns $HOME/.gf || true'

{secator-0.14.0 → secator-0.15.0}/secator/tasks/gitleaks.py

@@ -5,7 +5,7 @@ import yaml
 from secator.config import CONFIG
 from secator.decorators import task
 from secator.runners import Command
-from secator.definitions import (OUTPUT_PATH)
+from secator.definitions import (OUTPUT_PATH, PATH, GIT_REPOSITORY)
 from secator.utils import caml_to_snake
 from secator.output_types import Tag, Info, Error
 
@@ -14,6 +14,8 @@ from secator.output_types import Tag, Info, Error
 class gitleaks(Command):
 	"""Tool for detecting secrets like passwords, API keys, and tokens in git repos, files, and stdin."""
 	cmd = 'gitleaks'
+	tags = ['secret', 'scan']
+	input_types = [PATH, GIT_REPOSITORY]
 	input_flag = None
 	json_flag = '-f json'
 	opt_prefix = '--'