secator 0.3.0__tar.gz → 0.3.2__tar.gz

{secator-0.3.0 → secator-0.3.2}/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [0.3.2](https://github.com/freelabz/secator/compare/v0.3.1...v0.3.2) (2024-04-12)
+
+
+### Bug Fixes
+
+* do not create scripts/ folder ([#273](https://github.com/freelabz/secator/issues/273)) ([8fdaf09](https://github.com/freelabz/secator/commit/8fdaf09d4d1f3fbac7def995b99e9bc4f4f5020d))
+* health table padding ([#274](https://github.com/freelabz/secator/issues/274)) ([4f976bd](https://github.com/freelabz/secator/commit/4f976bdaecef7c29a2c6b21ddb29299745dfe5c9))
+* install script ([#276](https://github.com/freelabz/secator/issues/276)) ([e27b339](https://github.com/freelabz/secator/commit/e27b3391ea3a5c5a7898d3c02a5f409be44255f8))
+
+
+### Documentation
+
+* update docker setup ([#279](https://github.com/freelabz/secator/issues/279)) ([9b56e75](https://github.com/freelabz/secator/commit/9b56e75b114f294d222660dbae4f2e6b5e1369cd))
+
+## [0.3.1](https://github.com/freelabz/secator/compare/v0.3.0...v0.3.1) (2024-04-11)
+
+
+### Bug Fixes
+
+* download default wordlists if missing ([#261](https://github.com/freelabz/secator/issues/261)) ([7bec2a4](https://github.com/freelabz/secator/commit/7bec2a46d054aa7d3702eb77d25b9f791f5cc9c5))
+* rework init & tools install ([#271](https://github.com/freelabz/secator/issues/271)) ([6c477fc](https://github.com/freelabz/secator/commit/6c477fc99d5f1dd625423ba27dc563acc50194bf))
+* wrong hook name in debug output ([#262](https://github.com/freelabz/secator/issues/262)) ([f2ee367](https://github.com/freelabz/secator/commit/f2ee36779615bd2c1ef1f80679a9cc77e9e592d6))
+
 ## [0.3.0](https://github.com/freelabz/secator/compare/v0.2.0...v0.3.0) (2024-04-09)
 
 

{secator-0.3.0 → secator-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: secator
-Version: 0.3.0
+Version: 0.3.2
 Summary: The pentester's swiss knife.
 Project-URL: Homepage, https://github.com/freelabz/secator
 Project-URL: Issues, https://github.com/freelabz/secator/issues
@@ -175,7 +175,7 @@ wget -O - https://raw.githubusercontent.com/freelabz/secator/main/scripts/instal
 	<summary>Docker</summary>
 
 ```sh
-docker run -it freelabz/secator --help
+docker run -it --rm --net=host freelabz/secator --help
 ```
 
 </details>

{secator-0.3.0 → secator-0.3.2}/README.md

@@ -116,7 +116,7 @@ wget -O - https://raw.githubusercontent.com/freelabz/secator/main/scripts/instal
 	<summary>Docker</summary>
 
 ```sh
-docker run -it freelabz/secator --help
+docker run -it --rm --net=host freelabz/secator --help
 ```
 
 </details>

{secator-0.3.0 → secator-0.3.2}/pyproject.toml

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

{secator-0.3.0 → secator-0.3.2}/scripts/install.sh

@@ -7,9 +7,9 @@ echo -e "🗄 ${YELLOW}Running apt update ...${NC}"
 sudo apt update
 echo -e "🗄 ${GREEN}Ran apt update successfully !${NC}\n"
 
-echo -e "🗄 ${YELLOW}Installing Python and pipx ...${NC}"
-sudo apt install -y python3-pip pipx
-echo -e "🗄 ${GREEN}pipx installed successfully !${NC}\n"
+echo -e "🗄 ${YELLOW}Installing pipx and git ...${NC}"
+sudo apt install -y pipx git
+echo -e "🗄 ${GREEN}pipx and git installed successfully !${NC}\n"
 
 echo -e "🗄 ${YELLOW}Setting \$PATH ...${NC}"
 export PATH=$PATH:~/.local/bin:~/go/bin
@@ -28,5 +28,5 @@ echo -e "🗄 ${GREEN}secator installed successfully !${NC}\n"
 
 echo -e "🗄 ${YELLOW}Adding ~/go/bin and ~/.local/bin to \$PATH in .bashrc ...${NC}"
 echo "export PATH=$PATH:~/go/bin:~/.local/bin" >> ~/.bashrc
-source ~/.bashrc
+. ~/.bashrc
 echo -e "🗄 ${GREEN}\$PATH modified successfully !${NC}\n"

{secator-0.3.0 → secator-0.3.2}/scripts/install_go.sh

@@ -7,9 +7,6 @@ YELLOW='\033[0;93m'
 GREEN='\033[0;92m'
 NC='\033[0m' # No Color
 
-echo -e "🗄 ${YELLOW}Removing existing Go build ...${NC}"
-sudo rm -rf /usr/local/go
-
 echo -e "🗄 ${YELLOW}Downloading Go $GO_VERSION ...${NC}"
 wget https://golang.org/dl/$GO_TAR
 
@@ -18,8 +15,8 @@ tar -xvf $GO_TAR
 rm $GO_TAR || true
 
 echo -e "🗄 ${YELLOW}Linking Go install to /usr/local ...${NC}"
-sudo mv go /usr/local
-sudo rm /usr/bin/go || true
-sudo ln -s /usr/local/go/bin/go /usr/bin/go
+sudo mv go /usr/local/go$GO_VERSION
+sudo mv /usr/bin/go /usr/bin/go.bak || true
+sudo ln -s /usr/local/go$GO_VERSION/bin/go /usr/bin/go
 
 echo -e "🗄 ${GREEN}Go $GO_VERSION installed successfully !${NC}\n"

{secator-0.3.0 → secator-0.3.2}/secator/celery.py

@@ -106,7 +106,7 @@ def void(*args, **kwargs):
 
 def revoke_task(task_id):
 	console.print(f'Revoking task {task_id}')
-	return app.control.revoke(task_id, terminate=True, signal='SIGKILL')
+	return app.control.revoke(task_id, terminate=True, signal='SIGINT')
 
 
 #--------------#

{secator-0.3.0 → secator-0.3.2}/secator/cli.py

@@ -7,20 +7,20 @@ import rich_click as click
 from dotmap import DotMap
 from fp.fp import FreeProxy
 from jinja2 import Template
+from rich.live import Live
 from rich.markdown import Markdown
 from rich.rule import Rule
 
 from secator.config import ConfigLoader
 from secator.decorators import OrderedGroup, register_runner
-from secator.definitions import (ASCII, BUILD_ADDON_ENABLED, CVES_FOLDER, DATA_FOLDER, DEV_ADDON_ENABLED,  # noqa: F401
-								 DEV_PACKAGE, GOOGLE_ADDON_ENABLED, VERSION_LATEST, LIB_FOLDER, MONGODB_ADDON_ENABLED,
-								 VERSION_OBSOLETE, OPT_NOT_SUPPORTED, PAYLOADS_FOLDER, REDIS_ADDON_ENABLED, REVSHELLS_FOLDER, ROOT_FOLDER,
-								 TRACE_ADDON_ENABLED, VERSION, VERSION_STR, WORKER_ADDON_ENABLED)
-from secator.installer import ToolInstaller
+from secator.definitions import (ADDONS_ENABLED, ASCII, CVES_FOLDER, DATA_FOLDER, DEV_PACKAGE, OPT_NOT_SUPPORTED,
+								 PAYLOADS_FOLDER, REVSHELLS_FOLDER, ROOT_FOLDER, VERSION)
+from secator.installer import ToolInstaller, get_version_info, get_health_table, fmt_health_table_row
 from secator.rich import console
 from secator.runners import Command
 from secator.serializers.dataclass import loads_dataclass
-from secator.utils import debug, detect_host, discover_tasks, find_list_item, flatten, print_results_table
+from secator.utils import (debug, detect_host, discover_tasks, find_list_item, flatten,
+						   print_results_table, print_version)
 
 click.rich_click.USE_RICH_MARKUP = True
 
@@ -30,15 +30,6 @@ ALL_WORKFLOWS = ALL_CONFIGS.workflow
 ALL_SCANS = ALL_CONFIGS.scan
 
 
-def print_version():
-	console.print(f'[bold gold3]Current version[/]: {VERSION}', highlight=False)
-	console.print(f'[bold gold3]Latest version[/]: {VERSION_LATEST}', highlight=False)
-	console.print(f'[bold gold3]Python binary[/]: {sys.executable}')
-	if DEV_PACKAGE:
-		console.print(f'[bold gold3]Root folder[/]: {ROOT_FOLDER}')
-	console.print(f'[bold gold3]Lib folder[/]: {LIB_FOLDER}')
-
-
 #-----#
 # CLI #
 #-----#
@@ -49,10 +40,6 @@ def print_version():
 def cli(ctx, version):
 	"""Secator CLI."""
 	console.print(ASCII, highlight=False)
-	if VERSION_OBSOLETE:
-		console.print(
-			'[bold red]:warning: secator version is outdated: '
-			f'run "secator update" to install the newest version ({VERSION_LATEST}).\n')
 	if ctx.invoked_subcommand is None:
 		if version:
 			print_version()
@@ -119,7 +106,7 @@ for config in sorted(ALL_SCANS, key=lambda x: x['name']):
 @click.option('--show', is_flag=True, help='Show command (celery multi).')
 def worker(hostname, concurrency, reload, queue, pool, check, dev, stop, show):
 	"""Run a worker."""
-	if not WORKER_ADDON_ENABLED:
+	if not ADDONS_ENABLED['worker']:
 		console.print('[bold red]Missing worker addon: please run `secator install addons worker`[/].')
 		sys.exit(1)
 	from secator.celery import app, is_celery_worker_alive
@@ -408,7 +395,7 @@ def build():
 @build.command('pypi')
 def build_pypi():
 	"""Build secator PyPI package."""
-	if not BUILD_ADDON_ENABLED:
+	if not ADDONS_ENABLED['build']:
 		console.print('[bold red]Missing build addon: please run `secator install addons build`')
 		sys.exit(1)
 	with console.status('[bold gold3]Building PyPI package...[/]'):
@@ -444,7 +431,7 @@ def publish():
 @publish.command('pypi')
 def publish_pypi():
 	"""Publish secator PyPI package."""
-	if not BUILD_ADDON_ENABLED:
+	if not ADDONS_ENABLED['build']:
 		console.print('[bold red]Missing build addon: please run `secator install addons build`')
 		sys.exit(1)
 	os.environ['HATCH_INDEX_USER'] = '__token__'
@@ -526,114 +513,64 @@ def report_show(json_path, exclude_fields):
 # HEALTH #
 #--------#
 
-
-def which(command):
-	"""Run which on a command.
-
-	Args:
-		command (str): Command to check.
-
-	Returns:
-		secator.Command: Command instance.
-	"""
-	return Command.execute(f'which {command}', quiet=True, print_errors=False)
-
-
-def get_version_cls(cls):
-	"""Get version for a Command.
-
-	Args:
-		cls: Command class.
-
-	Returns:
-		string: Version string or 'n/a' if not found.
-	"""
-	base_cmd = cls.cmd.split(' ')[0]
-	if cls.version_flag == OPT_NOT_SUPPORTED:
-		return 'N/A'
-	version_flag = cls.version_flag or f'{cls.opt_prefix}version'
-	version_cmd = f'{base_cmd} {version_flag}'
-	return get_version(version_cmd)
-
-
-def get_version(version_cmd):
-	"""Run version command and match first version number found.
-
-	Args:
-		version_cmd (str): Command to get the version.
-
-	Returns:
-		str: Version string.
-	"""
-	regex = r'[0-9]+\.[0-9]+\.?[0-9]*\.?[a-zA-Z]*'
-	ret = Command.execute(version_cmd, quiet=True, print_errors=False)
-	match = re.findall(regex, ret.output)
-	if not match:
-		return 'n/a'
-	return match[0]
-
-
 @cli.command(name='health')
 @click.option('--json', '-json', is_flag=True, default=False, help='JSON lines output')
 @click.option('--debug', '-debug', is_flag=True, default=False, help='Debug health output')
 def health(json, debug):
 	"""[dim]Get health status.[/]"""
-	tools = [cls for cls in ALL_TASKS]
-	status = {'tools': {}, 'languages': {}, 'secator': {}}
-
-	def print_status(cmd, return_code, version=None, bin=None, category=None):
-		s = '[bold green]ok      [/]' if return_code == 0 else '[bold red]missing [/]'
-		s = f'[bold magenta]{cmd:<15}[/] {s} '
-		if return_code == 0 and version:
-			if version == 'N/A':
-				s += f'[dim blue]{version:<12}[/]'
-			else:
-				s += f'[bold blue]{version:<12}[/]'
-		elif category:
-			s += ' '*12 + f'[dim]# secator install {category} {cmd}'
-		if bin:
-			s += f'[dim gold3]{bin}[/]'
-		console.print(s, highlight=False)
+	tools = ALL_TASKS
+	status = {'secator': {}, 'languages': {}, 'tools': {}, 'addons': {}}
 
 	# Check secator
-	if not json:
-		console.print(':wrench: [bold gold3]Checking secator ...[/]')
-	ret = which('secator')
-	if not json:
-		print_status('secator', ret.return_code, VERSION, ret.output, None)
-	status['secator'] = {'installed': ret.return_code == 0, 'version': VERSION}
+	console.print(':wrench: [bold gold3]Checking secator ...[/]')
+	info = get_version_info('secator', '-version', 'freelabz/secator')
+	table = get_health_table()
+	with Live(table, console=console):
+		row = fmt_health_table_row(info)
+		table.add_row(*row)
+	status['secator'] = info
 
 	# Check languages
-	if not json:
-		console.print('\n:wrench: [bold gold3]Checking installed languages ...[/]')
+	console.print('\n:wrench: [bold gold3]Checking installed languages ...[/]')
 	version_cmds = {'go': 'version', 'python3': '--version', 'ruby': '--version'}
-	for lang, version_flag in version_cmds.items():
-		ret = which(lang)
-		version = get_version(f'{lang} {version_flag}')
-		if not json:
-			print_status(lang, ret.return_code, version, ret.output, 'langs')
-		status['languages'][lang] = {'installed': ret.return_code == 0, 'version': version}
+	table = get_health_table()
+	with Live(table, console=console):
+		for lang, version_flag in version_cmds.items():
+			info = get_version_info(lang, version_flag)
+			row = fmt_health_table_row(info, 'langs')
+			table.add_row(*row)
+			status['languages'][lang] = info
 
 	# Check tools
-	if not json:
-		console.print('\n:wrench: [bold gold3]Checking installed tools ...[/]')
-	for tool in tools:
-		cmd = tool.cmd.split(' ')[0]
-		ret = which(cmd)
-		version = get_version_cls(tool)
-		if not json:
-			print_status(tool.__name__, ret.return_code, version, ret.output, 'tools')
-		status['tools'][tool.__name__] = {'installed': ret.return_code == 0, 'version': version}
-
-	# Check addons
-	if not json:
-		console.print('\n:wrench: [bold gold3]Checking installed addons ...[/]')
-	for addon in ['google', 'mongodb', 'redis', 'dev', 'trace', 'build']:
-		addon_var = globals()[f'{addon.upper()}_ADDON_ENABLED']
-		ret = 0 if addon_var == 1 else 1
-		bin = None if addon_var == 0 else ' '
-		if not json:
-			print_status(addon, ret, 'N/A', bin, 'addons')
+	console.print('\n:wrench: [bold gold3]Checking installed tools ...[/]')
+	table = get_health_table()
+	with Live(table, console=console):
+		for tool in tools:
+			cmd = tool.cmd.split(' ')[0]
+			version_flag = tool.version_flag or f'{tool.opt_prefix}version'
+			version_flag = None if tool.version_flag == OPT_NOT_SUPPORTED else version_flag
+			info = get_version_info(cmd, version_flag, tool.install_github_handle)
+			row = fmt_health_table_row(info, 'tools')
+			table.add_row(*row)
+			status['tools'][tool.__name__] = info
+
+	# # Check addons
+	console.print('\n:wrench: [bold gold3]Checking installed addons ...[/]')
+	table = get_health_table()
+	with Live(table, console=console):
+		for addon in ['google', 'mongodb', 'redis', 'dev', 'trace', 'build']:
+			addon_var = ADDONS_ENABLED[addon]
+			info = {
+				'name': addon,
+				'version': None,
+				'status': 'ok' if addon_var else 'missing',
+				'latest_version': None,
+				'installed': addon_var,
+				'location': None
+			}
+			row = fmt_health_table_row(info, 'addons')
+			table.add_row(*row)
+			status['addons'][addon] = info
 
 	# Print JSON health
 	if json:
@@ -675,7 +612,7 @@ def addons():
 def install_worker():
 	"Install worker addon."
 	run_install(
-		cmd=f'{sys.executable} -m pip install .[worker]',
+		cmd=f'{sys.executable} -m pip install secator[worker]',
 		title='worker addon',
 		next_steps=[
 			'Run "secator worker" to run a Celery worker using the file system as a backend and broker.',
@@ -689,7 +626,7 @@ def install_worker():
 def install_google():
 	"Install google addon."
 	run_install(
-		cmd=f'{sys.executable} -m pip install .[google]',
+		cmd=f'{sys.executable} -m pip install secator[google]',
 		title='google addon',
 		next_steps=[
 			'Set the "GOOGLE_CREDENTIALS_PATH" and "GOOGLE_DRIVE_PARENT_FOLDER_ID" environment variables.',
@@ -702,7 +639,7 @@ def install_google():
 def install_mongodb():
 	"Install mongodb addon."
 	run_install(
-		cmd=f'{sys.executable} -m pip install .[mongodb]',
+		cmd=f'{sys.executable} -m pip install secator[mongodb]',
 		title='mongodb addon',
 		next_steps=[
 			'[dim]\[optional][/] Run "docker run --name mongo -p 27017:27017 -d mongo:latest" to run a local MongoDB instance.',
@@ -716,7 +653,7 @@ def install_mongodb():
 def install_redis():
 	"Install redis addon."
 	run_install(
-		cmd=f'{sys.executable} -m pip install .[redis]',
+		cmd=f'{sys.executable} -m pip install secator[redis]',
 		title='redis addon',
 		next_steps=[
 			'[dim]\[optional][/] Run "docker run --name redis -p 6379:6379 -d redis" to run a local Redis instance.',
@@ -842,13 +779,16 @@ def install_cves(force):
 @cli.command('update')
 def update():
 	"""[dim]Update to latest version.[/]"""
-	if not VERSION_OBSOLETE:
-		console.print(f'[bold green]secator is already at the newest version {VERSION_LATEST}[/]')
-	console.print(f'[bold gold3]:wrench: Updating secator from {VERSION} to {VERSION_LATEST} ...[/]')
+	info = get_version_info('secator', github_handle='freelabz/secator', version=VERSION)
+	latest_version = info['latest_version']
+	if info['status'] == 'latest':
+		console.print(f'[bold green]secator is already at the newest version {latest_version}[/] !')
+		sys.exit(0)
+	console.print(f'[bold gold3]:wrench: Updating secator from {VERSION} to {latest_version} ...[/]')
 	if 'pipx' in sys.executable:
-		Command.execute(f'pipx install secator=={VERSION_LATEST} --force')
+		Command.execute(f'pipx install secator=={latest_version} --force')
 	else:
-		Command.execute(f'pip install secator=={VERSION_LATEST}')
+		Command.execute(f'pip install secator=={latest_version}')
 
 
 #-------#
@@ -953,7 +893,7 @@ def test():
 	if not DEV_PACKAGE:
 		console.print('[bold red]You MUST use a development version of secator to run tests.[/]')
 		sys.exit(1)
-	if not DEV_ADDON_ENABLED:
+	if not ADDONS_ENABLED['dev']:
 		console.print('[bold red]Missing dev addon: please run `secator install addons dev`')
 		sys.exit(1)
 	pass

{secator-0.3.0 → secator-0.3.2}/secator/decorators.py

@@ -5,8 +5,7 @@ import rich_click as click
 from rich_click.rich_click import _get_rich_console
 from rich_click.rich_group import RichGroup
 
-from secator.definitions import (MONGODB_ADDON_ENABLED, OPT_NOT_SUPPORTED,
-								 WORKER_ADDON_ENABLED)
+from secator.definitions import ADDONS_ENABLED, OPT_NOT_SUPPORTED
 from secator.runners import Scan, Task, Workflow
 from secator.utils import (deduplicate, expand_input, get_command_category,
 						   get_command_cls)
@@ -276,7 +275,7 @@ def register_runner(cli_endpoint, config):
 		# opts.update(unknown_opts)
 		targets = opts.pop(input_type)
 		targets = expand_input(targets)
-		if sync or show or not WORKER_ADDON_ENABLED:
+		if sync or show or not ADDONS_ENABLED['worker']:
 			sync = True
 		elif worker:
 			sync = False
@@ -294,7 +293,7 @@ def register_runner(cli_endpoint, config):
 		# Build hooks from driver name
 		hooks = {}
 		if driver == 'mongodb':
-			if not MONGODB_ADDON_ENABLED:
+			if not ADDONS_ENABLED['mongo']:
 				_get_rich_console().print('[bold red]Missing MongoDB dependencies: please run `secator install addons mongodb`[/].')
 				sys.exit(1)
 			from secator.hooks.mongodb import MONGODB_HOOKS

{secator-0.3.0 → secator-0.3.2}/secator/definitions.py

@@ -4,34 +4,20 @@ import os
 import requests
 
 from dotenv import find_dotenv, load_dotenv
-from pkg_resources import get_distribution, parse_version
-
-load_dotenv(find_dotenv(usecwd=True), override=False)
+from pkg_resources import get_distribution
 
+from secator.rich import console
 
-def get_latest_version():
-	"""Get latest secator version from GitHub API."""
-	try:
-		resp = requests.get('https://api.github.com/repos/freelabz/secator/releases/latest', timeout=2)
-		resp.raise_for_status()
-		latest_version = resp.json()['name'].lstrip('v')
-		return latest_version
-	except (requests.exceptions.RequestException):
-		return None
-
+load_dotenv(find_dotenv(usecwd=True), override=False)
 
 # Globals
 VERSION = get_distribution('secator').version
-VERSION_LATEST = get_latest_version()
-VERSION_OBSOLETE = parse_version(VERSION_LATEST) > parse_version(VERSION) if VERSION_LATEST else False
-VERSION_STR = f'{VERSION} [bold red](outdated)[/]' if VERSION_OBSOLETE else VERSION
-
 ASCII = f"""
 			 __            
    ________  _________ _/ /_____  _____
   / ___/ _ \/ ___/ __ `/ __/ __ \/ ___/
  (__  /  __/ /__/ /_/ / /_/ /_/ / /    
-/____/\___/\___/\__,_/\__/\____/_/     v{VERSION_STR}
+/____/\___/\___/\__,_/\__/\____/_/     v{VERSION}
 
 			freelabz.com
 """  # noqa: W605,W291
@@ -50,20 +36,10 @@ CVES_FOLDER = f'{DATA_FOLDER}/cves'
 PAYLOADS_FOLDER = f'{DATA_FOLDER}/payloads'
 REVSHELLS_FOLDER = f'{DATA_FOLDER}/revshells'
 TESTS_FOLDER = f'{ROOT_FOLDER}/tests'
-os.makedirs(BIN_FOLDER, exist_ok=True)
-os.makedirs(DATA_FOLDER, exist_ok=True)
-os.makedirs(REPORTS_FOLDER, exist_ok=True)
-os.makedirs(WORDLISTS_FOLDER, exist_ok=True)
-os.makedirs(SCRIPTS_FOLDER, exist_ok=True)
-os.makedirs(CVES_FOLDER, exist_ok=True)
-os.makedirs(PAYLOADS_FOLDER, exist_ok=True)
-os.makedirs(REVSHELLS_FOLDER, exist_ok=True)
 
 # Celery local fs folders
 CELERY_DATA_FOLDER = f'{DATA_FOLDER}/celery/data'
 CELERY_RESULTS_FOLDER = f'{DATA_FOLDER}/celery/results'
-os.makedirs(CELERY_DATA_FOLDER, exist_ok=True)
-os.makedirs(CELERY_RESULTS_FOLDER, exist_ok=True)
 
 # Environment variables
 DEBUG = int(os.environ.get('DEBUG', '0'))
@@ -99,8 +75,10 @@ DEFAULT_PROGRESS_UPDATE_FREQUENCY = int(os.environ.get('DEFAULT_PROGRESS_UPDATE_
 DEFAULT_SKIP_CVE_SEARCH = bool(int(os.environ.get('DEFAULT_SKIP_CVE_SEARCH', 0)))
 
 # Default wordlists
-DEFAULT_HTTP_WORDLIST = os.environ.get('DEFAULT_HTTP_WORDLIST', f'{WORDLISTS_FOLDER}/Fuzzing/fuzz-Bo0oM.txt')
-DEFAULT_DNS_WORDLIST = os.environ.get('DEFAULT_DNS_WORDLIST', f'{WORDLISTS_FOLDER}/Discovery/DNS/combined_subdomains.txt')  # noqa:E501
+DEFAULT_HTTP_WORDLIST = os.environ.get('DEFAULT_HTTP_WORDLIST', f'{WORDLISTS_FOLDER}/fuzz-Bo0oM.txt')
+DEFAULT_HTTP_WORDLIST_URL = 'https://raw.githubusercontent.com/Bo0oM/fuzz.txt/master/fuzz.txt'
+DEFAULT_DNS_WORDLIST = os.environ.get('DEFAULT_DNS_WORDLIST', f'{WORDLISTS_FOLDER}/combined_subdomains.txt')
+DEFAULT_DNS_WORDLIST_URL = 'https://raw.githubusercontent.com/danielmiessler/SecLists/master/Discovery/DNS/combined_subdomains.txt'  # noqa: E501
 
 # Constants
 OPT_NOT_SUPPORTED = -1
@@ -175,57 +153,84 @@ WEBSERVER = 'webserver'
 WORDLIST = 'wordlist'
 WORDS = 'words'
 
+
+# Create all folders
+for folder in [BIN_FOLDER, DATA_FOLDER, REPORTS_FOLDER, WORDLISTS_FOLDER, CVES_FOLDER, PAYLOADS_FOLDER,
+			   REVSHELLS_FOLDER, CELERY_DATA_FOLDER, CELERY_RESULTS_FOLDER]:
+	if not os.path.exists(folder):
+		console.print(f'[bold turquoise4]Creating folder {folder} ...[/] ', end='')
+		os.makedirs(folder)
+		console.print('[bold green]ok.[/]')
+
+
+# Download default wordlists
+for wordlist in ['HTTP', 'DNS']:
+	wordlist_path = globals()[f'DEFAULT_{wordlist}_WORDLIST']
+	wordlist_url = globals()[f'DEFAULT_{wordlist}_WORDLIST_URL']
+	if not os.path.exists(wordlist_path):
+		try:
+			console.print(f'[bold turquoise4]Downloading default {wordlist} wordlist {wordlist_path} ...[/] ', end='')
+			resp = requests.get(wordlist_url)
+			with open(wordlist_path, 'w') as f:
+				f.write(resp.text)
+			console.print('[bold green]ok.[/]')
+		except requests.exceptions.RequestException as e:
+			console.print(f'[bold green]failed ({type(e).__name__}).[/]')
+			pass
+
+ADDONS_ENABLED = {}
+
 # Check worker addon
 try:
 	import eventlet  # noqa: F401
-	WORKER_ADDON_ENABLED = 1
+	ADDONS_ENABLED['worker'] = True
 except ModuleNotFoundError:
-	WORKER_ADDON_ENABLED = 0
+	ADDONS_ENABLED['worker'] = False
 
 # Check google addon
 try:
 	import gspread  # noqa: F401
-	GOOGLE_ADDON_ENABLED = 1
+	ADDONS_ENABLED['google'] = True
 except ModuleNotFoundError:
-	GOOGLE_ADDON_ENABLED = 0
+	ADDONS_ENABLED['google'] = False
 
 # Check mongodb addon
 try:
 	import pymongo  # noqa: F401
-	MONGODB_ADDON_ENABLED = 1
+	ADDONS_ENABLED['mongodb'] = True
 except ModuleNotFoundError:
-	MONGODB_ADDON_ENABLED = 0
+	ADDONS_ENABLED['mongodb'] = False
 
 # Check redis addon
 try:
 	import redis  # noqa: F401
-	REDIS_ADDON_ENABLED = 1
+	ADDONS_ENABLED['redis'] = True
 except ModuleNotFoundError:
-	REDIS_ADDON_ENABLED = 0
+	ADDONS_ENABLED['redis'] = False
 
 # Check dev addon
 try:
 	import flake8  # noqa: F401
-	DEV_ADDON_ENABLED = 1
+	ADDONS_ENABLED['dev'] = True
 except ModuleNotFoundError:
-	DEV_ADDON_ENABLED = 0
+	ADDONS_ENABLED['dev'] = False
 
 # Check build addon
 try:
 	import hatch  # noqa: F401
-	BUILD_ADDON_ENABLED = 1
+	ADDONS_ENABLED['build'] = True
 except ModuleNotFoundError:
-	BUILD_ADDON_ENABLED = 0
+	ADDONS_ENABLED['build'] = False
 
 # Check trace addon
 try:
 	import memray  # noqa: F401
-	TRACE_ADDON_ENABLED = 1
+	ADDONS_ENABLED['trace'] = True
 except ModuleNotFoundError:
-	TRACE_ADDON_ENABLED = 0
+	ADDONS_ENABLED['trace'] = False
 
 # Check dev package
 if os.path.exists(f'{ROOT_FOLDER}/pyproject.toml'):
-	DEV_PACKAGE = 1
+	DEV_PACKAGE = True
 else:
-	DEV_PACKAGE = 0
+	DEV_PACKAGE = False