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

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/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/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/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/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 = '--'

secator/tasks/gospider.py

@@ -16,8 +16,10 @@ from secator.tasks._categories import HttpCrawler
 class gospider(HttpCrawler):
 	"""Fast web spider written in Go."""
 	cmd = 'gospider'
+	tags = ['url', 'crawl']
 	file_flag = '-S'
 	input_flag = '-s'
+	input_types = [URL]
 	json_flag = '--json'
 	opt_prefix = '--'
 	opt_key_map = {

secator/tasks/grype.py

@@ -2,7 +2,7 @@ from secator.config import CONFIG
 from secator.decorators import task
 from secator.definitions import (DELAY, FOLLOW_REDIRECT, HEADER,
 							   OPT_NOT_SUPPORTED, PROXY, RATE_LIMIT, RETRIES,
-							   THREADS, TIMEOUT, USER_AGENT)
+							   THREADS, TIMEOUT, USER_AGENT, PATH, DOCKER_IMAGE)
 from secator.output_types import Vulnerability
 from secator.tasks._categories import VulnCode
 
@@ -11,6 +11,8 @@ from secator.tasks._categories import VulnCode
 class grype(VulnCode):
 	"""Vulnerability scanner for container images and filesystems."""
 	cmd = 'grype --quiet'
+	tags = ['vuln', 'scan']
+	input_types = [PATH, DOCKER_IMAGE]
 	input_flag = ''
 	file_flag = OPT_NOT_SUPPORTED
 	json_flag = None

secator/tasks/h8mail.py

@@ -11,9 +11,10 @@ from secator.output_types import UserAccount, Info, Error
 class h8mail(OSInt):
 	"""Email information and password lookup tool."""
 	cmd = 'h8mail'
+	tags = ['user', 'recon', 'email']
 	json_flag = '--json '
 	input_flag = '--targets'
-	input_type = EMAIL
+	input_types = [EMAIL]
 	file_flag = '-domain'
 	version_flag = '--help'
 	opt_prefix = '--'

secator/tasks/httpx.py

@@ -3,7 +3,7 @@ import os
 from secator.decorators import task
 from secator.definitions import (DELAY, DEPTH, FILTER_CODES, FILTER_REGEX, FILTER_SIZE, FILTER_WORDS, FOLLOW_REDIRECT,
 								 HEADER, MATCH_CODES, MATCH_REGEX, MATCH_SIZE, MATCH_WORDS, METHOD, OPT_NOT_SUPPORTED,
-								 PROXY, RATE_LIMIT, RETRIES, THREADS, TIMEOUT, URL, USER_AGENT)
+								 PROXY, RATE_LIMIT, RETRIES, THREADS, TIMEOUT, URL, USER_AGENT, HOST, IP)
 from secator.config import CONFIG
 from secator.output_types import Url, Subdomain
 from secator.serializers import JSONSerializer
@@ -15,8 +15,10 @@ from secator.utils import (sanitize_url, extract_domain_info, extract_subdomains
 class httpx(Http):
 	"""Fast and multi-purpose HTTP toolkit."""
 	cmd = 'httpx'
+	tags = ['url', 'probe']
 	file_flag = '-l'
 	input_flag = '-u'
+	input_types = [HOST, IP, URL]
 	json_flag = '-json'
 	opts = {
 		# 'silent': {'is_flag': True, 'default': False, 'help': 'Silent mode'},

secator/tasks/katana.py

@@ -17,8 +17,10 @@ from secator.tasks._categories import HttpCrawler
 class katana(HttpCrawler):
 	"""Next-generation crawling and spidering framework."""
 	cmd = 'katana'
+	tags = ['url', 'crawl']
 	file_flag = '-list'
 	input_flag = '-u'
+	input_types = [URL]
 	json_flag = '-jsonl'
 	opts = {
 		'headless': {'is_flag': True, 'short': 'hl', 'help': 'Headless mode'},

secator/tasks/maigret.py

@@ -17,8 +17,10 @@ logger = logging.getLogger(__name__)
 class maigret(ReconUser):
 	"""Collect a dossier on a person by username."""
 	cmd = 'maigret'
+	tags = ['user', 'recon', 'username']
 	file_flag = None
 	input_flag = None
+	input_types = [USERNAME]
 	json_flag = '--json ndjson'
 	opt_prefix = '--'
 	opts = {
@@ -32,7 +34,7 @@ class maigret(ReconUser):
 		TIMEOUT: 'timeout',
 		THREADS: OPT_NOT_SUPPORTED
 	}
-	input_type = USERNAME
+	input_types = [USERNAME]
 	output_types = [UserAccount]
 	output_map = {
 		UserAccount: {

secator/tasks/mapcidr.py

@@ -11,6 +11,7 @@ from secator.tasks._categories import ReconIp
 class mapcidr(ReconIp):
 	"""Utility program to perform multiple operations for a given subnet/cidr ranges."""
 	cmd = 'mapcidr'
+	tags = ['ip', 'recon']
 	input_flag = '-cidr'
 	file_flag = '-cl'
 	install_pre = {
@@ -19,7 +20,7 @@ class mapcidr(ReconIp):
 	install_version = 'v1.1.34'
 	install_cmd = 'go install -v github.com/projectdiscovery/mapcidr/cmd/mapcidr@[install_version]'
 	install_github_handle = 'projectdiscovery/mapcidr'
-	input_type = CIDR_RANGE
+	input_types = [CIDR_RANGE]
 	output_types = [Ip]
 	opt_key_map = {
 		THREADS: OPT_NOT_SUPPORTED,

secator/tasks/msfconsole.py

@@ -6,8 +6,8 @@ from rich.panel import Panel
 
 from secator.config import CONFIG
 from secator.decorators import task
-from secator.definitions import (DELAY, FOLLOW_REDIRECT, HEADER, HOST, OPT_NOT_SUPPORTED, PROXY, RATE_LIMIT, RETRIES,
-								 THREADS, TIMEOUT, USER_AGENT)
+from secator.definitions import (DELAY, FOLLOW_REDIRECT, HEADER, HOST, IP, OPT_NOT_SUPPORTED, PROXY, RATE_LIMIT,
+								 RETRIES, THREADS, TIMEOUT, USER_AGENT, URL)
 from secator.tasks._categories import VulnMulti
 from secator.utils import get_file_timestamp
 
@@ -18,8 +18,9 @@ logger = logging.getLogger(__name__)
 class msfconsole(VulnMulti):
 	"""CLI to access and work with the Metasploit Framework."""
 	cmd = 'msfconsole --quiet'
+	tags = ['exploit', 'attack']
 	version_flag = OPT_NOT_SUPPORTED
-	input_type = HOST
+	input_types = [HOST, IP, URL]
 	input_chunk_size = 1
 	output_types = []
 	opt_prefix = '--'

secator/tasks/naabu.py

@@ -1,5 +1,5 @@
 from secator.decorators import task
-from secator.definitions import (DELAY, HOST, OPT_NOT_SUPPORTED, PORT, PORTS,
+from secator.definitions import (DELAY, HOST, IP, OPT_NOT_SUPPORTED, PORT, PORTS,
 								 PROXY, RATE_LIMIT, RETRIES, STATE, THREADS,
 								 TIMEOUT, TOP_PORTS)
 from secator.output_types import Port
@@ -11,7 +11,9 @@ from secator.tasks._categories import ReconPort
 class naabu(ReconPort):
 	"""Port scanning tool written in Go."""
 	cmd = 'naabu'
+	tags = ['port', 'scan']
 	input_flag = '-host'
+	input_types = [HOST, IP]
 	file_flag = '-list'
 	json_flag = '-json'
 	opts = {

secator/tasks/nmap.py

@@ -24,7 +24,9 @@ logger = logging.getLogger(__name__)
 class nmap(VulnMulti):
 	"""Network Mapper is a free and open source utility for network discovery and security auditing."""
 	cmd = 'nmap'
+	tags = ['port', 'scan']
 	input_flag = None
+	input_types = [HOST, IP]
 	input_chunk_size = 1
 	file_flag = '-iL'
 	opt_prefix = '--'

secator/tasks/nuclei.py

@@ -4,7 +4,7 @@ from secator.definitions import (CONFIDENCE, CVSS_SCORE, DELAY, DESCRIPTION,
 								 MATCHED_AT, NAME, OPT_NOT_SUPPORTED, PERCENT,
 								 PROVIDER, PROXY, RATE_LIMIT, REFERENCES,
 								 RETRIES, SEVERITY, TAGS, THREADS, TIMEOUT,
-								 USER_AGENT)
+								 USER_AGENT, HOST, URL)
 from secator.output_types import Progress, Vulnerability
 from secator.serializers import JSONSerializer
 from secator.tasks._categories import VulnMulti
@@ -14,6 +14,8 @@ from secator.tasks._categories import VulnMulti
 class nuclei(VulnMulti):
 	"""Fast and customisable vulnerability scanner based on simple YAML based DSL."""
 	cmd = 'nuclei'
+	tags = ['vuln', 'scan']
+	input_types = [HOST, IP, URL]
 	file_flag = '-l'
 	input_flag = '-u'
 	json_flag = '-jsonl'

secator/tasks/searchsploit.py

@@ -3,7 +3,7 @@ import re
 from secator.config import CONFIG
 from secator.decorators import task
 from secator.definitions import (CVES, EXTRA_DATA, ID, MATCHED_AT, NAME,
-								 PROVIDER, REFERENCE, TAGS, OPT_NOT_SUPPORTED)
+								 PROVIDER, REFERENCE, TAGS, TECHNOLOGY, OPT_NOT_SUPPORTED)
 from secator.output_types import Exploit
 from secator.runners import Command
 from secator.serializers import JSONSerializer
@@ -16,7 +16,9 @@ SEARCHSPLOIT_TITLE_REGEX = re.compile(r'^((?:[a-zA-Z\-_!\.()]+\d?\s?)+)\.?\s*(.*
 class searchsploit(Command):
 	"""Exploit searcher based on ExploitDB."""
 	cmd = 'searchsploit'
+	tags = ['exploit', 'recon']
 	input_flag = None
+	input_types = [TECHNOLOGY]
 	json_flag = '--json'
 	version_flag = OPT_NOT_SUPPORTED
 	opts = {

secator/tasks/subfinder.py

@@ -1,5 +1,5 @@
 from secator.decorators import task
-from secator.definitions import (DELAY, DOMAIN, OPT_NOT_SUPPORTED, PROXY,
+from secator.definitions import (DELAY, DOMAIN, HOST, OPT_NOT_SUPPORTED, PROXY,
 							   RATE_LIMIT, RETRIES, THREADS, TIMEOUT)
 from secator.output_types import Subdomain
 from secator.serializers import JSONSerializer
@@ -10,6 +10,8 @@ from secator.tasks._categories import ReconDns
 class subfinder(ReconDns):
 	"""Fast passive subdomain enumeration tool."""
 	cmd = 'subfinder -cs'
+	tags = ['dns', 'recon']
+	input_types = [HOST]
 	file_flag = '-dL'
 	input_flag = '-d'
 	json_flag = '-json'

secator/tasks/testssl.py

@@ -15,7 +15,8 @@ from secator.tasks._categories import Command, OPTS
 class testssl(Command):
     """SSL/TLS security scanner, including ciphers, protocols and cryptographic flaws."""
     cmd = 'testssl.sh'
-    input_type = HOST
+    tags = ['dns', 'recon', 'tls']
+    input_types = [HOST]
     input_flag = None
     file_flag = '-iL'
     file_eof_newline = True

secator/tasks/trivy.py

@@ -5,7 +5,8 @@ import yaml
 from secator.config import CONFIG
 from secator.decorators import task
 from secator.definitions import (THREADS, OUTPUT_PATH, OPT_NOT_SUPPORTED, HEADER, DELAY, FOLLOW_REDIRECT,
-								PROXY, RATE_LIMIT, RETRIES, TIMEOUT, USER_AGENT)
+								DOCKER_IMAGE, PATH, GIT_REPOSITORY, PROXY, RATE_LIMIT, RETRIES, TIMEOUT,
+								USER_AGENT)
 from secator.tasks._categories import Vuln
 from secator.output_types import Vulnerability, Tag, Info, Error
 
@@ -14,7 +15,9 @@ from secator.output_types import Vulnerability, Tag, Info, Error
 class trivy(Vuln):
 	"""Comprehensive and versatile security scanner."""
 	cmd = 'trivy'
+	tags = ['vuln', 'scan']
 	input_flag = None
+	input_types = [DOCKER_IMAGE, PATH, GIT_REPOSITORY]
 	json_flag = '-f json'
 	opts = {
 		"mode": {"type": click.Choice(['image', 'fs', 'repo']), 'default': 'image', 'help': 'Trivy mode', 'required': True}  # noqa: E501

secator/tasks/wafw00f.py

@@ -12,7 +12,8 @@ from secator.tasks._categories import OPTS
 class wafw00f(Command):
 	"""Web Application Firewall Fingerprinting tool."""
 	cmd = 'wafw00f'
-	input_type = URL
+	tags = ['waf', 'scan']
+	input_types = [URL]
 	input_flag = None
 	file_flag = '-i'
 	json_flag = '-f json'

secator/tasks/wpprobe.py

@@ -12,9 +12,10 @@ from secator.tasks._categories import OPTS
 class wpprobe(Command):
     """Fast wordpress plugin enumeration tool."""
     cmd = 'wpprobe'
+    tags = ['vuln', 'scan', 'wordpress']
     file_flag = '-f'
     input_flag = '-u'
-    input_type = URL
+    input_types = [URL]
     opt_prefix = '-'
     opts = {
         'mode': {'type': click.Choice(['scan', 'update', 'update-db']), 'default': 'scan', 'help': 'WPProbe mode', 'required': True, 'internal': True},  # noqa: E501

secator/tasks/wpscan.py

@@ -17,9 +17,10 @@ from secator.tasks._categories import VulnHttp
 class wpscan(VulnHttp):
 	"""Wordpress security scanner."""
 	cmd = 'wpscan --force --verbose'
+	tags = ['vuln', 'scan', 'wordpress']
 	file_flag = None
 	input_flag = '--url'
-	input_type = URL
+	input_types = [URL]
 	json_flag = '-f json'
 	opt_prefix = '--'
 	opts = {

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/utils.py

@@ -164,7 +164,8 @@ def discover_internal_tasks():
 	# Sort task_classes by category
 	task_classes = sorted(
 		task_classes,
-		key=lambda x: (get_command_category(x), x.__name__))
+		# key=lambda x: (get_command_category(x), x.__name__)
+		key=lambda x: x.__name__)
 
 	return task_classes
 
@@ -262,9 +263,9 @@ def get_command_category(command):
 	Returns:
 		str: Command category.
 	"""
-	base_cls = command.__bases__[0].__name__.replace('Command', '').replace('Runner', 'misc')
-	category = re.sub(r'(?<!^)(?=[A-Z])', '/', base_cls).lower()
-	return category
+	if not command.tags:
+		return 'misc'
+	return '/'.join(command.tags)
 
 
 def merge_opts(*options):
@@ -309,6 +310,8 @@ def pluralize(word):
 	"""
 	if word.endswith('y'):
 		return word.rstrip('y') + 'ies'
+	elif word.endswith('s'):
+		return word + 'es'
 	return f'{word}s'
 
 
@@ -418,15 +421,16 @@ def format_object(obj, obj_breaklines=False):
 
 def debug(msg, sub='', id='', obj=None, lazy=None, obj_after=True, obj_breaklines=False, verbose=False):
 	"""Print debug log if DEBUG >= level."""
-	if not DEBUG_COMPONENT or DEBUG_COMPONENT == [""]:
-		return
-
-	if sub:
-		if verbose and sub not in DEBUG_COMPONENT:
-			sub = f'debug.{sub}'
-		if not any(sub.startswith(s) for s in DEBUG_COMPONENT):
+	if not DEBUG_COMPONENT == ['all']:
+		if not DEBUG_COMPONENT or DEBUG_COMPONENT == [""]:
 			return
 
+		if sub:
+			if verbose and sub not in DEBUG_COMPONENT:
+				sub = f'debug.{sub}'
+			if not any(sub.startswith(s) for s in DEBUG_COMPONENT):
+				return
+
 	if lazy:
 		msg = lazy(msg)
 

secator/utils_test.py

@@ -9,7 +9,8 @@ from fp.fp import FreeProxy
 from secator.definitions import (CIDR_RANGE, DELAY, DEPTH, EMAIL,
 							   FOLLOW_REDIRECT, HEADER, HOST, IP, MATCH_CODES,
 							   METHOD, PROXY, RATE_LIMIT, RETRIES,
-							   THREADS, TIMEOUT, URL, USER_AGENT, USERNAME)
+							   THREADS, TIMEOUT, URL, USER_AGENT, USERNAME, PATH,
+							   DOCKER_IMAGE, GIT_REPOSITORY)
 from secator.cli import ALL_WORKFLOWS, ALL_TASKS, ALL_SCANS
 from secator.output_types import EXECUTION_TYPES, STAT_TYPES
 from secator.runners import Command
@@ -61,7 +62,9 @@ INPUTS_TASKS = {
 	IP: '192.168.1.23',
 	CIDR_RANGE: '192.168.1.0/24',
 	EMAIL: 'fake@fake.com',
-	'folder': '.'
+	PATH: '.',
+	DOCKER_IMAGE: 'redis:latest',
+	GIT_REPOSITORY: 'https://github.com/freelabz/secator',
 }
 
 #---------------------#
@@ -165,7 +168,7 @@ class CommandOutputTester:  # Mixin for unittest.TestCase
 			expected_status='SUCCESS',
 			empty_results_allowed=False):
 
-		console.print(f'[dim]Testing {runner.config.type} {runner.name} ...[/]', end='')
+		console.print(f'\t[dim]Testing {runner.config.type} {runner.name} ...[/]', end='')
 		debug('', sub='unittest')
 
 		if not runner.inputs:
@@ -176,6 +179,8 @@ class CommandOutputTester:  # Mixin for unittest.TestCase
 			console.print('[dim gold3] (no outputs defined).[/]', end='')
 
 		try:
+			debug(f'{runner.name} starting command: {runner.cmd}', sub='unittest') if isinstance(runner, Command) else None
+
 			# Run runner
 			results = runner.run()
 			for result in results:
@@ -202,6 +207,7 @@ class CommandOutputTester:  # Mixin for unittest.TestCase
 			# Check results
 			for item in results:
 				debug(f'{runner.name} yielded {repr(item)}', sub='unittest')
+				debug(f'{runner.name} yielded (JSON): {json.dumps(item.toDict(), default=str)}', sub='unittest.dict', verbose=True)
 
 				if expected_output_types:
 					debug(f'{runner.name} item should have an output type in {[_._type for _ in expected_output_types]}', sub='unittest')  # noqa: E501

{secator-0.13.0.dist-info → secator-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: secator
-Version: 0.13.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`     |