secator 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

secator/config.py

@@ -20,6 +20,7 @@ StrExpandHome = Annotated[str, AfterValidator(lambda v: v.replace('~', str(Path.
 ROOT_FOLDER = Path(__file__).parent.parent
 LIB_FOLDER = ROOT_FOLDER / 'secator'
 CONFIGS_FOLDER = LIB_FOLDER / 'configs'
+DATA_FOLDER = os.environ.get('SECATOR_DIRS_DATA') or str(Path.home() / '.secator')
 
 
 class StrictModel(BaseModel, extra='forbid'):
@@ -28,12 +29,13 @@ class StrictModel(BaseModel, extra='forbid'):
 
 class Directories(StrictModel):
 	bin: Directory = Path.home() / '.local' / 'bin'
-	data: Directory = Path.home() / '.secator'
+	data: Directory = Path(DATA_FOLDER)
 	templates: Directory = ''
 	reports: Directory = ''
 	wordlists: Directory = ''
 	cves: Directory = ''
 	payloads: Directory = ''
+	performance: Directory = ''
 	revshells: Directory = ''
 	celery: Directory = ''
 	celery_data: Directory = ''
@@ -42,7 +44,7 @@ class Directories(StrictModel):
 	@model_validator(mode='after')
 	def set_default_folders(self) -> Self:
 		"""Set folders to be relative to the data folders if they are unspecified in config."""
-		for folder in ['templates', 'reports', 'wordlists', 'cves', 'payloads', 'revshells', 'celery', 'celery_data', 'celery_results']:  # noqa: E501
+		for folder in ['templates', 'reports', 'wordlists', 'cves', 'payloads', 'performance', 'revshells', 'celery', 'celery_data', 'celery_results']:  # noqa: E501
 			rel_target = '/'.join(folder.split('_'))
 			val = getattr(self, folder) or self.data / rel_target
 			setattr(self, folder, val)
@@ -61,6 +63,7 @@ class Celery(StrictModel):
 	broker_visibility_timeout: int = 3600
 	override_default_logging: bool = True
 	result_backend: StrExpandHome = ''
+	result_expires: int = 86400  # 1 day
 
 
 class Cli(StrictModel):
@@ -70,8 +73,11 @@ class Cli(StrictModel):
 
 
 class Runners(StrictModel):
-	input_chunk_size: int = 1000
-	progress_update_frequency: int = 60
+	input_chunk_size: int = 100
+	progress_update_frequency: int = 20
+	stat_update_frequency: int = 20
+	backend_update_frequency: int = 5
+	poll_frequency: int = 5
 	skip_cve_search: bool = False
 	skip_cve_low_confidence: bool = True
 	remove_duplicates: bool = False
@@ -81,20 +87,21 @@ class HTTP(StrictModel):
 	socks5_proxy: str = 'socks5://127.0.0.1:9050'
 	http_proxy: str = 'https://127.0.0.1:9080'
 	store_responses: bool = False
+	response_max_size_bytes: int = 100000  # 100MB
 	proxychains_command: str = 'proxychains'
 	freeproxy_timeout: int = 1
 
 
 class Tasks(StrictModel):
-	exporters: List[str] = ['json', 'csv']
+	exporters: List[str] = ['json', 'csv', 'txt']
 
 
 class Workflows(StrictModel):
-	exporters: List[str] = ['json', 'csv']
+	exporters: List[str] = ['json', 'csv', 'txt']
 
 
 class Scans(StrictModel):
-	exporters: List[str] = ['json', 'csv']
+	exporters: List[str] = ['json', 'csv', 'txt']
 
 
 class Payloads(StrictModel):
@@ -114,12 +121,18 @@ class Wordlists(StrictModel):
 	lists: Dict[str, List[str]] = {}
 
 
-class GoogleAddon(StrictModel):
+class GoogleDriveAddon(StrictModel):
 	enabled: bool = False
 	drive_parent_folder_id: str = ''
 	credentials_path: str = ''
 
 
+class GoogleCloudStorageAddon(StrictModel):
+	enabled: bool = False
+	bucket_name: str = ''
+	credentials_path: str = ''
+
+
 class WorkerAddon(StrictModel):
 	enabled: bool = False
 
@@ -128,10 +141,13 @@ class MongodbAddon(StrictModel):
 	enabled: bool = False
 	url: str = 'mongodb://localhost'
 	update_frequency: int = 60
+	max_pool_size: int = 10
+	server_selection_timeout_ms: int = 5000
 
 
 class Addons(StrictModel):
-	google: GoogleAddon = GoogleAddon()
+	gdrive: GoogleDriveAddon = GoogleDriveAddon()
+	gcs: GoogleCloudStorageAddon = GoogleCloudStorageAddon()
 	worker: WorkerAddon = WorkerAddon()
 	mongodb: MongodbAddon = MongodbAddon()
 
@@ -161,7 +177,7 @@ class Config(DotMap):
 	>>> config = Config.parse(path='/path/to/config.yml')  # get custom config (from YAML file).
 	>>> config.print() 									   # print config without defaults.
 	>>> config.print(partial=False)  					   # print full config.
-	>>> config.set('addons.google.enabled', False)         # set value in config.
+	>>> config.set('addons.gdrive.enabled', False)         # set value in config.
 	>>> config.save()									   # save config back to disk.
 	"""
 
@@ -512,7 +528,7 @@ def download_files(data: dict, target_folder: Path, offline_mode: bool, type: st
 		else:
 			# Download file from URL
 			ext = url_or_path.split('.')[-1]
-			filename = f'{name}.{ext}'
+			filename = f'{name}.{ext}' if not name.endswith(ext) else name
 			target_path = target_folder / filename
 			if not target_path.exists():
 				try:

secator/configs/workflows/host_recon.yaml

@@ -11,6 +11,8 @@ tasks:
     description: Find open ports
   nmap:
     description: Search for vulnerabilities on open ports
+    skip_host_discovery: True
+    version_detection: True
     targets_: port.host
     ports_: port.port
   httpx:
@@ -18,7 +20,7 @@ tasks:
     targets_:
       - type: port
         field: '{host}:{port}'
-        condition: item._source == 'nmap'
+        condition: item._source.startswith('nmap')
   _group:
     nuclei/network:
       description: Scan network and SSL vulnerabilities
@@ -32,10 +34,10 @@ tasks:
           condition: item.status_code != 0
 results:
   - type: port
-    condition: item._source == 'nmap'
+    condition: item._source.startswith('nmap')
 
   - type: vulnerability
   #   condition: item.confidence == 'high'
 
   - type: url
-    condition: item.status_code != 0
+    condition: item.status_code != 0

secator/configs/workflows/port_scan.yaml

@@ -5,11 +5,15 @@ description: Port scan
 tags: [recon, network, http, vuln]
 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
+    version_detection: True
     targets_: port.host
     ports_: port.port
   _group:
@@ -18,17 +22,17 @@ tasks:
       targets_:
       - type: port
         field: '{host}~{service_name}'
-        condition: item._source == 'nmap' and len(item.service_name.split('/')) > 1
+        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 == 'nmap'
+          condition: item._source.startswith('nmap')
 results:
   - type: port
 
   - type: url
     condition: item.status_code != 0
 
-  - type: vulnerability
+  - type: vulnerability

secator/configs/workflows/url_bypass.yaml

@@ -0,0 +1,10 @@
+type: workflow
+name: url_bypass
+alias: urlbypass
+description: Try bypass techniques for 4xx URLs
+tags: [http, crawl]
+input_types:
+  - url
+tasks:
+  bup:
+    description: Bypass 4xx

secator/configs/workflows/url_vuln.yaml

@@ -34,7 +34,7 @@ tasks:
     targets_:
       - type: tag
         field: match
-        condition: item._source == "gf"
+        condition: item._source.startswith("gf")
 
   # TODO: Add support for SQLMap
   # sqlmap:

secator/decorators.py

@@ -1,30 +1,33 @@
 import sys
+
 from collections import OrderedDict
 
 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 ADDONS_ENABLED, OPT_NOT_SUPPORTED
 from secator.config import CONFIG
+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)
+from secator.utils import (deduplicate, expand_input, get_command_category)
 
 RUNNER_OPTS = {
 	'output': {'type': str, 'default': None, 'help': 'Output options (-o table,json,csv,gdrive)', 'short': 'o'},
 	'workspace': {'type': str, 'default': 'default', 'help': 'Workspace', 'short': 'ws'},
-	'json': {'is_flag': True, 'default': False, 'help': 'Enable JSON mode'},
-	'orig': {'is_flag': True, 'default': False, 'help': 'Enable original output (no schema conversion)'},
-	'raw': {'is_flag': True, 'default': False, 'help': 'Enable text output for piping to other tools'},
+	'print_json': {'is_flag': True, 'short': 'json', 'default': False, 'help': 'Print items as JSON lines'},
+	'print_raw': {'is_flag': True, 'short': 'raw', 'default': False, 'help': 'Print items in raw format'},
+	'print_stat': {'is_flag': True, 'short': 'stat', 'default': False, 'help': 'Print runtime statistics'},
+	'print_format': {'default': '', 'short': 'fmt', 'help': 'Output formatting string'},
+	'enable_profiler': {'is_flag': True, 'short': 'prof', 'default': False, 'help': 'Enable runner profiling'},
 	'show': {'is_flag': True, 'default': False, 'help': 'Show command that will be run (tasks only)'},
-	'format': {'default': '', 'short': 'fmt', 'help': 'Output formatting string'},
+	'no_process': {'is_flag': True, 'default': False, 'help': 'Disable secator processing'},
 	# 'filter': {'default': '', 'short': 'f', 'help': 'Results filter', 'short': 'of'}, # TODO add this
 	'quiet': {'is_flag': True, 'default': False, 'help': 'Enable quiet mode'},
 }
 
 RUNNER_GLOBAL_OPTS = {
 	'sync': {'is_flag': True, 'help': 'Run tasks synchronously (automatic if no worker is alive)'},
+	'worker': {'is_flag': True, 'default': False, 'help': 'Run tasks in worker'},
 	'proxy': {'type': str, 'help': 'HTTP proxy'},
 	'driver': {'type': str, 'help': 'Export real-time results. E.g: "mongodb"'}
 	# 'debug': {'type': int, 'default': 0, 'help': 'Debug mode'},
@@ -100,20 +103,34 @@ class OrderedGroup(RichGroup):
 		return self.commands
 
 
-def get_command_options(*tasks):
-	"""Get unified list of command options from a list of secator tasks classes.
+def get_command_options(config):
+	"""Get unified list of command options from a list of secator tasks classes and optionally a Runner config.
 
 	Args:
-		tasks (list): List of secator command classes.
+		config (TemplateLoader): Current runner config.
 
 	Returns:
 		list: List of deduplicated options.
 	"""
+	from secator.utils import debug
 	opt_cache = []
 	all_opts = OrderedDict({})
+	tasks = config.flat_tasks
+	tasks_cls = set([c['class'] for c in tasks.values()])
 
-	for cls in tasks:
+	# Loop through tasks and set options
+	for cls in tasks_cls:
 		opts = OrderedDict(RUNNER_GLOBAL_OPTS, **RUNNER_OPTS, **cls.meta_opts, **cls.opts)
+
+		# Find opts defined in config corresponding to this task class
+		# TODO: rework this as this ignores subsequent tasks of the same task class
+		task_config_opts = {}
+		if config.type != 'task':
+			for k, v in tasks.items():
+				if v['class'] == cls:
+					task_config_opts = v['opts']
+
+		# Loop through options
 		for opt, opt_conf in opts.items():
 
 			# Get opt key map if any
@@ -126,6 +143,7 @@ def get_command_options(*tasks):
 				and opt not in RUNNER_GLOBAL_OPTS:
 				continue
 
+			# Opt is defined as unsupported
 			if opt_key_map.get(opt) == OPT_NOT_SUPPORTED:
 				continue
 
@@ -143,17 +161,50 @@ def get_command_options(*tasks):
 			elif opt in RUNNER_GLOBAL_OPTS:
 				prefix = 'Execution'
 
+			# Get opt conf
+			conf = opt_conf.copy()
+			conf['show_default'] = True
+			conf['prefix'] = prefix
+			opt_default = conf.get('default', None)
+			opt_is_flag = conf.get('is_flag', False)
+			opt_value_in_config = task_config_opts.get(opt)
+
+			# Check if opt already defined in config
+			if opt_value_in_config:
+				if conf.get('required', False):
+					debug('OPT (skipped: opt is required and defined in config)', obj={'opt': opt}, sub=f'cli.{config.name}', verbose=True)  # noqa: E501
+					continue
+				mapped_value = cls.opt_value_map.get(opt)
+				if callable(mapped_value):
+					opt_value_in_config = mapped_value(opt_value_in_config)
+				elif mapped_value:
+					opt_value_in_config = mapped_value
+				if opt_value_in_config != opt_default:
+					if opt in opt_cache:
+						continue
+					if opt_is_flag:
+						conf['reverse'] = True
+						conf['default'] = not conf['default']
+					# print(f'{opt}: change default to {opt_value_in_config}')
+					conf['default'] = opt_value_in_config
+
+			# If opt is a flag but the default is True, add opposite flag
+			if opt_is_flag and opt_default is True:
+				conf['reverse'] = True
+
 			# Check if opt already processed before
-			opt = opt.replace('_', '-')
 			if opt in opt_cache:
+				# debug('OPT (skipped: opt is already in opt cache)', obj={'opt': opt}, sub=f'cli.{config.name}', verbose=True)
 				continue
 
 			# Build help
-			conf = opt_conf.copy()
-			conf['show_default'] = True
-			conf['prefix'] = prefix
-			all_opts[opt] = conf
 			opt_cache.append(opt)
+			opt = opt.replace('_', '-')
+			all_opts[opt] = conf
+
+			# Debug
+			debug_conf = OrderedDict({'opt': opt, 'config_val': opt_value_in_config or 'N/A', **conf.copy()})
+			debug('OPT', obj=debug_conf, sub=f'cli.{config.name}', verbose=True)
 
 	return all_opts
 
@@ -171,11 +222,18 @@ def decorate_command_options(opts):
 		reversed_opts = OrderedDict(list(opts.items())[::-1])
 		for opt_name, opt_conf in reversed_opts.items():
 			conf = opt_conf.copy()
-			short = conf.pop('short', None)
-			conf.pop('internal', False)
+			short_opt = conf.pop('short', None)
+			conf.pop('internal', None)
 			conf.pop('prefix', None)
+			conf.pop('shlex', None)
+			conf.pop('meta', None)
+			conf.pop('supported', None)
+			reverse = conf.pop('reverse', False)
 			long = f'--{opt_name}'
-			short = f'-{short}' if short else f'-{opt_name}'
+			short = f'-{short_opt}' if short_opt else f'-{opt_name}'
+			if reverse:
+				long += f'/--no-{opt_name}'
+				short += f'/-n{short_opt}' if short else f'/-n{opt_name}'
 			f = click.option(long, short, **conf)(f)
 		return f
 	return decorator
@@ -188,66 +246,56 @@ def task():
 	return decorator
 
 
+def generate_cli_subcommand(cli_endpoint, func, **opts):
+	return cli_endpoint.command(**opts)(func)
+
+
 def register_runner(cli_endpoint, config):
-	fmt_opts = {
-		'print_cmd': True,
-	}
-	short_help = ''
-	input_type = 'targets'
+	name = config.name
 	input_required = True
-	runner_cls = None
-	tasks = []
-	no_args_is_help = True
+	input_type = 'targets'
+	command_opts = {
+		'no_args_is_help': True,
+		'context_settings': {
+			'ignore_unknown_options': False,
+			'allow_extra_args': False
+		}
+	}
 
 	if cli_endpoint.name == 'scan':
-		# TODO: this should be refactored to scan.get_tasks_from_conf() or scan.tasks
-		from secator.cli import ALL_CONFIGS
-		tasks = [
-			get_command_cls(task)
-			for workflow in ALL_CONFIGS.workflow
-			for task in Task.get_tasks_from_conf(workflow.tasks)
-			if workflow.name in list(config.workflows.keys())
-		]
-		input_type = 'targets'
-		name = config.name
-		short_help = config.description or ''
-		if config.alias:
-			short_help += f' [dim]alias: {config.alias}'
-		fmt_opts['print_start'] = True
-		fmt_opts['print_run_summary'] = True
-		fmt_opts['print_progress'] = False
 		runner_cls = Scan
+		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
+		})
 
 	elif cli_endpoint.name == 'workflow':
-		# TODO: this should be refactored to workflow.get_tasks_from_conf() or workflow.tasks
-		tasks = [
-			get_command_cls(task) for task in Task.get_tasks_from_conf(config.tasks)
-		]
-		input_type = 'targets'
-		name = config.name
-		short_help = config.description or ''
-		if config.alias:
-			short_help = f'{short_help:<55} [dim](alias)[/][bold cyan] {config.alias}'
-		fmt_opts['print_start'] = True
-		fmt_opts['print_run_summary'] = True
-		fmt_opts['print_progress'] = False
 		runner_cls = Workflow
+		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
+		})
 
 	elif cli_endpoint.name == 'task':
-		tasks = [
-			get_command_cls(config.name)
-		]
+		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'
-		name = config.name
 		short_help = f'[magenta]{task_category:<15}[/]{task_cls.__doc__}'
-		fmt_opts['print_item_count'] = True
-		runner_cls = Task
-		no_args_is_help = False
-		input_required = False
+		command_opts.update({
+			'name': name,
+			'short_help': short_help,
+			'no_args_is_help': False
+		})
 
-	options = get_command_options(*tasks)
+	else:
+		raise ValueError(f"Unrecognized runner endpoint name {cli_endpoint.name}")
+	options = get_command_options(config)
 
 	# TODO: maybe allow this in the future
 	# def get_unknown_opts(ctx):
@@ -262,24 +310,59 @@ def register_runner(cli_endpoint, config):
 	@decorate_command_options(options)
 	@click.pass_context
 	def func(ctx, **opts):
-		opts.update(fmt_opts)
 		sync = opts['sync']
-		# debug = opts['debug']
+		worker = opts.pop('worker')
 		ws = opts.pop('workspace')
 		driver = opts.pop('driver', '')
 		show = opts['show']
 		context = {'workspace_name': ws}
+
+		# Remove options whose values are default values
+		for k, v in options.items():
+			opt_name = k.replace('-', '_')
+			if opt_name in opts and opts[opt_name] == v.get('default', None):
+				del opts[opt_name]
+
 		# TODO: maybe allow this in the future
 		# unknown_opts = get_unknown_opts(ctx)
 		# opts.update(unknown_opts)
-		targets = opts.pop(input_type)
-		targets = expand_input(targets)
+
+		# Expand input
+		inputs = opts.pop(input_type)
+		inputs = expand_input(inputs, ctx)
+
+		# Build hooks from driver name
+		hooks = []
+		drivers = driver.split(',') if driver else []
+		console = _get_rich_console()
+		supported_drivers = ['mongodb', 'gcs']
+		for driver in drivers:
+			if driver in supported_drivers:
+				if not ADDONS_ENABLED[driver]:
+					console.print(f'[bold red]Missing "{driver}" addon: please run `secator install addons {driver}`[/].')
+					sys.exit(1)
+				from secator.utils import import_dynamic
+				driver_hooks = import_dynamic(f'secator.hooks.{driver}', 'HOOKS')
+				if driver_hooks is None:
+					console.print(f'[bold red]Missing "secator.hooks.{driver}.HOOKS".[/]')
+					sys.exit(1)
+				hooks.append(driver_hooks)
+			else:
+				supported_drivers_str = ', '.join([f'[bold green]{_}[/]' for _ in supported_drivers])
+				console.print(f'[bold red]Driver "{driver}" is not supported.[/]')
+				console.print(f'Supported drivers: {supported_drivers_str}')
+				sys.exit(1)
+
+		from secator.utils import deep_merge_dicts
+		hooks = deep_merge_dicts(*hooks)
+
+		# Enable sync or not
 		if sync or show:
 			sync = True
 		else:
 			from secator.celery import is_celery_worker_alive
 			worker_alive = is_celery_worker_alive()
-			if not worker_alive:
+			if not worker_alive and not worker:
 				sync = True
 			else:
 				sync = False
@@ -289,34 +372,28 @@ def register_runner(cli_endpoint, config):
 					if (broker_protocol == 'redis' or backend_protocol == 'redis') and not ADDONS_ENABLED['redis']:
 						_get_rich_console().print('[bold red]Missing `redis` addon: please run `secator install addons redis`[/].')
 						sys.exit(1)
-		opts['sync'] = sync
+
+		from secator.utils import debug
+		debug('Run options', obj=opts, sub='cli')
+
+		# Set run options
 		opts.update({
-			'print_item': not sync,
-			'print_line': sync,
-			'print_remote_status': not sync,
-			'print_start': not sync
+			'print_cmd': True,
+			'print_item': True,
+			'print_line': True,
+			'print_progress': True,
+			'print_remote_info': not sync,
+			'piped_input': ctx.obj['piped_input'],
+			'piped_output': ctx.obj['piped_output'],
+			'caller': 'cli',
+			'sync': sync,
 		})
 
-		# Build hooks from driver name
-		hooks = {}
-		if driver == 'mongodb':
-			if not ADDONS_ENABLED['mongodb']:
-				_get_rich_console().print('[bold red]Missing `mongodb` addon: please run `secator install addons mongodb`[/].')
-				sys.exit(1)
-			from secator.hooks.mongodb import MONGODB_HOOKS
-			hooks = MONGODB_HOOKS
-
-		# Build exporters
-		runner = runner_cls(config, targets, run_opts=opts, hooks=hooks, context=context)
+		# Start runner
+		runner = runner_cls(config, inputs, run_opts=opts, hooks=hooks, context=context)
 		runner.run()
 
-	settings = {'ignore_unknown_options': False, 'allow_extra_args': False}
-	cli_endpoint.command(
-		name=config.name,
-		context_settings=settings,
-		no_args_is_help=no_args_is_help,
-		short_help=short_help)(func)
-
+	generate_cli_subcommand(cli_endpoint, func, **command_opts)
 	generate_rich_click_opt_groups(cli_endpoint, name, input_type, options)
 
 

secator/definitions.py

@@ -24,14 +24,19 @@ DEBUG = CONFIG.debug.level
 DEBUG_COMPONENT = CONFIG.debug.component.split(',')
 
 # Default tasks settings
-DEFAULT_HTTPX_FLAGS = os.environ.get('DEFAULT_HTTPX_FLAGS', '-td')
-DEFAULT_KATANA_FLAGS = os.environ.get('DEFAULT_KATANA_FLAGS', '-jc -js-crawl -known-files all -or -ob')
 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
+STATE_COLORS = {
+	'PENDING': 'dim yellow3',
+	'RUNNING': 'bold yellow3',
+	'SUCCESS': 'bold green',
+	'FAILURE': 'bold red',
+	'REVOKED': 'bold magenta'
+}
 
 # Vocab
 ALIVE = 'alive'
@@ -54,6 +59,7 @@ FILTER_SIZE = 'filter_size'
 HEADER = 'header'
 HOST = 'host'
 IP = 'ip'
+PROTOCOL = 'protocol'
 LINES = 'lines'
 METHOD = 'method'
 MATCH_CODES = 'match_codes'
@@ -119,7 +125,8 @@ ADDONS_ENABLED = {}
 
 for addon, module in [
 	('worker', 'eventlet'),
-	('google', 'gspread'),
+	('gdrive', 'gspread'),
+	('gcs', 'google.cloud.storage'),
 	('mongodb', 'pymongo'),
 	('redis', 'redis'),
 	('dev', 'flake8'),

secator/exporters/__init__.py

@@ -1,10 +1,12 @@
 __all__ = [
-    'CsvExporter',
-    'GdriveExporter',
-    'JsonExporter',
-    'TableExporter',
-    'TxtExporter'
+	'ConsoleExporter',
+	'CsvExporter',
+	'GdriveExporter',
+	'JsonExporter',
+	'TableExporter',
+	'TxtExporter'
 ]
+from secator.exporters.console import ConsoleExporter
 from secator.exporters.csv import CsvExporter
 from secator.exporters.gdrive import GdriveExporter
 from secator.exporters.json import JsonExporter

secator/exporters/console.py

@@ -0,0 +1,10 @@
+from secator.exporters._base import Exporter
+from secator.rich import console
+
+
+class ConsoleExporter(Exporter):
+	def send(self):
+		results = self.report.data['results']
+		for items in results.values():
+			for item in items:
+				console.print(item)