secator 0.3.6__py3-none-any.whl → 0.4.1__py3-none-any.whl

secator/decorators.py

@@ -6,12 +6,13 @@ 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.runners import Scan, Task, Workflow
 from secator.utils import (deduplicate, expand_input, get_command_category,
 						   get_command_cls)
 
 RUNNER_OPTS = {
-	'output': {'type': str, 'default': '', 'help': 'Output options (-o table,json,csv,gdrive)', 'short': 'o'},
+	'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)'},
@@ -282,10 +283,9 @@ def register_runner(cli_endpoint, config):
 				sync = True
 			else:
 				sync = False
-				from secator.definitions import CELERY_BROKER_URL, CELERY_RESULT_BACKEND
-				broker_protocol = CELERY_BROKER_URL.split('://')[0]
-				backend_protocol = CELERY_RESULT_BACKEND.split('://')[0]
-				if CELERY_BROKER_URL:
+				broker_protocol = CONFIG.celery.broker_url.split('://')[0]
+				backend_protocol = CONFIG.celery.result_backend.split('://')[0]
+				if CONFIG.celery.broker_url:
 					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)

secator/definitions.py

@@ -1,14 +1,11 @@
 #!/usr/bin/python
 
 import os
-import requests
 
-from dotenv import find_dotenv, load_dotenv
 from importlib.metadata import version
 
-from secator.rich import console
+from secator.config import CONFIG, ROOT_FOLDER
 
-load_dotenv(find_dotenv(usecwd=True), override=False)
 
 # Globals
 VERSION = version('secator')
@@ -22,63 +19,15 @@ ASCII = f"""
 			freelabz.com
 """  # noqa: W605,W291
 
-# Secator folders
-ROOT_FOLDER = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
-LIB_FOLDER = ROOT_FOLDER + '/secator'
-CONFIGS_FOLDER = LIB_FOLDER + '/configs'
-EXTRA_CONFIGS_FOLDER = os.environ.get('SECATOR_EXTRA_CONFIGS_FOLDER')
-BIN_FOLDER = os.environ.get('SECATOR_BIN_FOLDER', f'{os.path.expanduser("~")}/.local/bin')
-DATA_FOLDER = os.environ.get('SECATOR_DATA_FOLDER', f'{os.path.expanduser("~")}/.secator')
-REPORTS_FOLDER = os.environ.get('SECATOR_REPORTS_FOLDER', f'{DATA_FOLDER}/reports')
-WORDLISTS_FOLDER = os.environ.get('SECATOR_WORDLISTS_FOLDER', f'{DATA_FOLDER}/wordlists')
-SCRIPTS_FOLDER = f'{ROOT_FOLDER}/scripts'
-CVES_FOLDER = f'{DATA_FOLDER}/cves'
-PAYLOADS_FOLDER = f'{DATA_FOLDER}/payloads'
-REVSHELLS_FOLDER = f'{DATA_FOLDER}/revshells'
-TESTS_FOLDER = f'{ROOT_FOLDER}/tests'
-
-# Celery local fs folders
-CELERY_DATA_FOLDER = f'{DATA_FOLDER}/celery/data'
-CELERY_RESULTS_FOLDER = f'{DATA_FOLDER}/celery/results'
-
-# Environment variables
-DEBUG = int(os.environ.get('DEBUG', '0'))
-DEBUG_COMPONENT = os.environ.get('DEBUG_COMPONENT', '').split(',')
-RECORD = bool(int(os.environ.get('RECORD', 0)))
-CELERY_BROKER_URL = os.environ.get('CELERY_BROKER_URL', 'filesystem://')
-CELERY_RESULT_BACKEND = os.environ.get('CELERY_RESULT_BACKEND', f'file://{CELERY_RESULTS_FOLDER}')
-CELERY_BROKER_POOL_LIMIT = int(os.environ.get('CELERY_BROKER_POOL_LIMIT', 10))
-CELERY_BROKER_CONNECTION_TIMEOUT = float(os.environ.get('CELERY_BROKER_CONNECTION_TIMEOUT', 4.0))
-CELERY_BROKER_VISIBILITY_TIMEOUT = int(os.environ.get('CELERY_BROKER_VISIBILITY_TIMEOUT', 3600))
-CELERY_OVERRIDE_DEFAULT_LOGGING = bool(int(os.environ.get('CELERY_OVERRIDE_DEFAULT_LOGGING', 1)))
-GOOGLE_DRIVE_PARENT_FOLDER_ID = os.environ.get('GOOGLE_DRIVE_PARENT_FOLDER_ID')
-GOOGLE_CREDENTIALS_PATH = os.environ.get('GOOGLE_CREDENTIALS_PATH')
-GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN')
-
-# Defaults HTTP and Proxy settings
-DEFAULT_SOCKS5_PROXY = os.environ.get('SOCKS5_PROXY', "socks5://127.0.0.1:9050")
-DEFAULT_HTTP_PROXY = os.environ.get('HTTP_PROXY', "https://127.0.0.1:9080")
-DEFAULT_STORE_HTTP_RESPONSES = bool(int(os.environ.get('DEFAULT_STORE_HTTP_RESPONSES', 1)))
-DEFAULT_PROXYCHAINS_COMMAND = "proxychains"
-DEFAULT_FREEPROXY_TIMEOUT = 1  # seconds
-
-# Default worker settings
-DEFAULT_INPUT_CHUNK_SIZE = int(os.environ.get('DEFAULT_INPUT_CHUNK_SIZE', 1000))
-DEFAULT_STDIN_TIMEOUT = 1000  # seconds
+# Debug
+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')
-DEFAULT_PROGRESS_UPDATE_FREQUENCY = int(os.environ.get('DEFAULT_PROGRESS_UPDATE_FREQUENCY', 60))
-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}/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
@@ -154,80 +103,30 @@ 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
+def is_importable(module_to_import):
+	import importlib
+	try:
+		importlib.import_module(module_to_import)
+		return True
+	except ModuleNotFoundError:
+		return False
+	except Exception as e:
+		print(f'Failed trying to import {module_to_import}: {str(e)}')
+		return False
+
 
 ADDONS_ENABLED = {}
 
-# Check worker addon
-try:
-	import eventlet  # noqa: F401
-	ADDONS_ENABLED['worker'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['worker'] = False
-
-# Check google addon
-try:
-	import gspread  # noqa: F401
-	ADDONS_ENABLED['google'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['google'] = False
-
-# Check mongodb addon
-try:
-	import pymongo  # noqa: F401
-	ADDONS_ENABLED['mongodb'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['mongodb'] = False
-
-# Check redis addon
-try:
-	import redis  # noqa: F401
-	ADDONS_ENABLED['redis'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['redis'] = False
-
-# Check dev addon
-try:
-	import flake8  # noqa: F401
-	ADDONS_ENABLED['dev'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['dev'] = False
-
-# Check build addon
-try:
-	import hatch  # noqa: F401
-	ADDONS_ENABLED['build'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['build'] = False
-
-# Check trace addon
-try:
-	import memray  # noqa: F401
-	ADDONS_ENABLED['trace'] = True
-except ModuleNotFoundError:
-	ADDONS_ENABLED['trace'] = False
+for addon, module in [
+	('worker', 'eventlet'),
+	('google', 'gspread'),
+	('mongodb', 'pymongo'),
+	('redis', 'redis'),
+	('dev', 'flake8'),
+	('trace', 'memray'),
+	('build', 'hatch')
+]:
+	ADDONS_ENABLED[addon] = is_importable(module)
 
 # Check dev package
 if os.path.exists(f'{ROOT_FOLDER}/pyproject.toml'):

secator/exporters/gdrive.py

@@ -2,7 +2,7 @@ import os
 import csv
 import yaml
 
-from secator.definitions import GOOGLE_CREDENTIALS_PATH, GOOGLE_DRIVE_PARENT_FOLDER_ID
+from secator.config import CONFIG
 from secator.exporters._base import Exporter
 from secator.rich import console
 from secator.utils import pluralize
@@ -16,20 +16,20 @@ class GdriveExporter(Exporter):
 		title = self.report.data['info']['title']
 		sheet_title = f'{self.report.data["info"]["title"]}_{self.report.timestamp}'
 		results = self.report.data['results']
-		if not GOOGLE_CREDENTIALS_PATH:
-			console.print(':file_cabinet: Missing GOOGLE_CREDENTIALS_PATH to save to Google Sheets', style='red')
+		if not CONFIG.addons.google.credentials_path:
+			console.print(':file_cabinet: Missing CONFIG.addons.google.credentials_path to save to Google Sheets', style='red')
 			return
-		if not GOOGLE_DRIVE_PARENT_FOLDER_ID:
-			console.print(':file_cabinet: Missing GOOGLE_DRIVE_PARENT_FOLDER_ID to save to Google Sheets.', style='red')
+		if not CONFIG.addons.google.drive_parent_folder_id:
+			console.print(':file_cabinet: Missing CONFIG.addons.google.drive_parent_folder_id to save to Google Sheets.', style='red')  # noqa: E501
 			return
-		client = gspread.service_account(GOOGLE_CREDENTIALS_PATH)
+		client = gspread.service_account(CONFIG.addons.google.credentials_path)
 
 		# Create workspace folder if it doesn't exist
-		folder_id = self.get_folder_by_name(ws, parent_id=GOOGLE_DRIVE_PARENT_FOLDER_ID)
+		folder_id = self.get_folder_by_name(ws, parent_id=CONFIG.addons.google.drive_parent_folder_id)
 		if ws and not folder_id:
 			folder_id = self.create_folder(
 				folder_name=ws,
-				parent_id=GOOGLE_DRIVE_PARENT_FOLDER_ID)
+				parent_id=CONFIG.addons.google.drive_parent_folder_id)
 
 		# Create worksheet
 		sheet = client.create(title, folder_id=folder_id)
@@ -84,7 +84,7 @@ class GdriveExporter(Exporter):
 	def create_folder(self, folder_name, parent_id=None):
 		from googleapiclient.discovery import build
 		from google.oauth2 import service_account
-		creds = service_account.Credentials.from_service_account_file(GOOGLE_CREDENTIALS_PATH)
+		creds = service_account.Credentials.from_service_account_file(CONFIG.addons.google.credentials_path)
 		service = build('drive', 'v3', credentials=creds)
 		body = {
 			'name': folder_name,
@@ -98,7 +98,7 @@ class GdriveExporter(Exporter):
 	def list_folders(self, parent_id):
 		from googleapiclient.discovery import build
 		from google.oauth2 import service_account
-		creds = service_account.Credentials.from_service_account_file(GOOGLE_CREDENTIALS_PATH)
+		creds = service_account.Credentials.from_service_account_file(CONFIG.addons.google.credentials_path)
 		service = build('drive', 'v3', credentials=creds)
 		driveid = service.files().get(fileId='root').execute()['id']
 		response = service.files().list(

secator/hooks/mongodb.py

@@ -1,12 +1,11 @@
 import logging
-import os
 import time
 
 import pymongo
 from bson.objectid import ObjectId
 from celery import shared_task
 
-from secator.definitions import DEFAULT_PROGRESS_UPDATE_FREQUENCY
+from secator.config import CONFIG
 from secator.output_types import OUTPUT_TYPES
 from secator.runners import Scan, Task, Workflow
 from secator.utils import debug, escape_mongodb_url
@@ -14,8 +13,8 @@ from secator.utils import debug, escape_mongodb_url
 # import gevent.monkey
 # gevent.monkey.patch_all()
 
-MONGODB_URL = os.environ.get('MONGODB_URL', 'mongodb://localhost')
-MONGODB_UPDATE_FREQUENCY = int(os.environ.get('MONGODB_UPDATE_FREQUENCY', DEFAULT_PROGRESS_UPDATE_FREQUENCY))
+MONGODB_URL = CONFIG.addons.mongodb.url
+MONGODB_UPDATE_FREQUENCY = CONFIG.addons.mongodb.update_frequency
 MAX_POOL_SIZE = 100
 
 logger = logging.getLogger(__name__)

secator/installer.py

@@ -11,7 +11,7 @@ from rich.table import Table
 
 from secator.rich import console
 from secator.runners import Command
-from secator.definitions import BIN_FOLDER, GITHUB_TOKEN
+from secator.config import CONFIG
 
 
 class ToolInstaller:
@@ -95,7 +95,7 @@ class GithubInstaller:
 
 		# Download and unpack asset
 		console.print(f'Found release URL: {download_url}')
-		cls._download_and_unpack(download_url, BIN_FOLDER, repo)
+		cls._download_and_unpack(download_url, CONFIG.dirs.bin, repo)
 		return True
 
 	@classmethod
@@ -113,8 +113,8 @@ class GithubInstaller:
 		owner, repo = tuple(github_handle.split('/'))
 		url = f"https://api.github.com/repos/{owner}/{repo}/releases/latest"
 		headers = {}
-		if GITHUB_TOKEN:
-			headers['Authorization'] = f'Bearer {GITHUB_TOKEN}'
+		if CONFIG.cli.github_token:
+			headers['Authorization'] = f'Bearer {CONFIG.cli.github_token}'
 		try:
 			response = requests.get(url, headers=headers, timeout=5)
 			response.raise_for_status()
@@ -281,8 +281,10 @@ def get_version_info(name, version_flag=None, github_handle=None, version=None):
 		info['version'] = version
 
 	# Get latest version
-	latest_version = GithubInstaller.get_latest_version(github_handle)
-	info['latest_version'] = latest_version
+	latest_version = None
+	if not CONFIG.offline_mode:
+		latest_version = GithubInstaller.get_latest_version(github_handle)
+		info['latest_version'] = latest_version
 
 	if location:
 		info['installed'] = True
@@ -295,6 +297,8 @@ def get_version_info(name, version_flag=None, github_handle=None, version=None):
 			info['status'] = 'current unknown'
 		elif not latest_version:
 			info['status'] = 'latest unknown'
+			if CONFIG.offline_mode:
+				info['status'] += ' [dim orange1]\[offline][/]'
 	else:
 		info['status'] = 'missing'
 

secator/output_types/vulnerability.py

@@ -15,7 +15,7 @@ class Vulnerability(OutputType):
 	id: str = ''
 	matched_at: str = ''
 	ip: str = field(default='', compare=False)
-	confidence: int = 'low'
+	confidence: str = 'low'
 	severity: str = 'unknown'
 	cvss_score: float = 0
 	tags: List[str] = field(default_factory=list)
@@ -85,6 +85,8 @@ class Vulnerability(OutputType):
 			s += f' \[[cyan]{tags_str}[/]]'
 		if data:
 			s += f' \[[yellow]{str(data)}[/]]'
+		if self.confidence == 'low':
+			s = f'[dim]{s}[/]'
 		return rich_to_ansi(s)
 
 	# def __gt__(self, other):

secator/runners/_base.py

@@ -14,7 +14,8 @@ from rich.panel import Panel
 from rich.progress import Progress as RichProgress
 from rich.progress import SpinnerColumn, TextColumn, TimeElapsedColumn
 
-from secator.definitions import DEBUG, DEFAULT_PROGRESS_UPDATE_FREQUENCY, REPORTS_FOLDER
+from secator.definitions import DEBUG
+from secator.config import CONFIG
 from secator.output_types import OUTPUT_TYPES, OutputType, Progress
 from secator.report import Report
 from secator.rich import console, console_stdout
@@ -48,7 +49,7 @@ class Runner:
 	"""Runner class.
 
 	Args:
-		config (secator.config.ConfigLoader): Loaded config.
+		config (secator.config.TemplateLoader): Loaded config.
 		targets (list): List of targets to run task on.
 		results (list): List of existing results to re-use.
 		workspace_name (str): Workspace name.
@@ -109,7 +110,7 @@ class Runner:
 		self.celery_result = None
 
 		# Determine report folder
-		default_reports_folder_base = f'{REPORTS_FOLDER}/{self.workspace_name}/{self.config.type}s'
+		default_reports_folder_base = f'{CONFIG.dirs.reports}/{self.workspace_name}/{self.config.type}s'
 		_id = get_task_folder_id(default_reports_folder_base)
 		self.reports_folder = f'{default_reports_folder_base}/{_id}'
 
@@ -391,14 +392,14 @@ class Runner:
 
 	def resolve_exporters(self):
 		"""Resolve exporters from output options."""
-		output = self.run_opts.get('output', '')
-		if output == '':
-			return self.default_exporters
-		elif output is False:
+		output = self.run_opts.get('output') or self.default_exporters
+		if not output or output in ['false', 'False']:
 			return []
+		if isinstance(output, str):
+			output = output.split(',')
 		exporters = [
 			import_dynamic(f'secator.exporters.{o.capitalize()}Exporter', 'Exporter')
-			for o in output.split(',')
+			for o in output
 			if o
 		]
 		return [e for e in exporters if e]
@@ -850,7 +851,8 @@ class Runner:
 
 		if item._type == 'progress' and item._source == self.config.name:
 			self.progress = item.percent
-			if self.last_updated_progress and (item._timestamp - self.last_updated_progress) < DEFAULT_PROGRESS_UPDATE_FREQUENCY:
+			update_frequency = CONFIG.runners.progress_update_frequency
+			if self.last_updated_progress and (item._timestamp - self.last_updated_progress) < update_frequency:
 				return None
 			elif int(item.percent) in [0, 100]:
 				return None

secator/runners/_helpers.py

@@ -1,6 +1,10 @@
 import os
 
+import kombu
+import kombu.exceptions
+
 from secator.utils import deduplicate
+from secator.rich import console
 
 
 def run_extractors(results, opts, targets=[]):
@@ -80,20 +84,24 @@ def get_task_ids(result, ids=[]):
 	if result is None:
 		return
 
-	if isinstance(result, GroupResult):
-		get_task_ids(result.parent, ids=ids)
+	try:
+		if isinstance(result, GroupResult):
+			get_task_ids(result.parent, ids=ids)
 
-	elif isinstance(result, AsyncResult):
-		if result.id not in ids:
-			ids.append(result.id)
+		elif isinstance(result, AsyncResult):
+			if result.id not in ids:
+				ids.append(result.id)
 
-	if hasattr(result, 'children') and result.children:
-		for child in result.children:
-			get_task_ids(child, ids=ids)
+		if hasattr(result, 'children') and result.children:
+			for child in result.children:
+				get_task_ids(child, ids=ids)
 
-	# Browse parent
-	if hasattr(result, 'parent') and result.parent:
-		get_task_ids(result.parent, ids=ids)
+		# Browse parent
+		if hasattr(result, 'parent') and result.parent:
+			get_task_ids(result.parent, ids=ids)
+	except kombu.exceptions.DecodeError as e:
+		console.print(f'[bold red]{str(e)}. Aborting get_task_ids.[/]')
+		return
 
 
 def get_task_data(task_id):
@@ -107,33 +115,43 @@ def get_task_data(task_id):
 	"""
 	from celery.result import AsyncResult
 	res = AsyncResult(task_id)
-	if not (res and res.args and len(res.args) > 1):
+	if not res:
+		return
+	try:
+		args = res.args
+		info = res.info
+		state = res.state
+	except kombu.exceptions.DecodeError as e:
+		console.print(f'[bold red]{str(e)}. Aborting get_task_data.[/]')
 		return
-	data = {}
-	task_name = res.args[1]
-	data['id'] = task_id
-	data['name'] = task_name
-	data['state'] = res.state
-	data['chunk_info'] = ''
-	data['count'] = 0
-	data['error'] = None
-	data['ready'] = False
-	data['descr'] = ''
-	data['progress'] = 0
-	data['results'] = []
-	if res.state in ['FAILURE', 'SUCCESS', 'REVOKED']:
+	if not (args and len(args) > 1):
+		return
+	task_name = args[1]
+	data = {
+		'id': task_id,
+		'name': task_name,
+		'state': state,
+		'chunk_info': '',
+		'count': 0,
+		'error': None,
+		'ready': False,
+		'descr': '',
+		'progress': 0,
+		'results': []
+	}
+
+	# Set ready flag
+	if state in ['FAILURE', 'SUCCESS', 'REVOKED']:
 		data['ready'] = True
-	if res.info and not isinstance(res.info, list):
-		chunk = res.info.get('chunk', '')
-		chunk_count = res.info.get('chunk_count', '')
-		data['chunk'] = chunk
-		data['chunk_count'] = chunk_count
-		if chunk:
+
+	# Set task data
+	if info and not isinstance(info, list):
+		data.update(info)
+		chunk = data.get('chunk')
+		chunk_count = data.get('chunk_count')
+		if chunk and chunk_count:
 			data['chunk_info'] = f'{chunk}/{chunk_count}'
-		data.update(res.info)
 		data['descr'] = data.pop('description', '')
-		# del data['results']
-		# del data['task_results']
 	return data