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

secator/tasks/cariddi.py

@@ -1,5 +1,3 @@
-import json
-
 from secator.decorators import task
 from secator.definitions import (DELAY, DEPTH, FILTER_CODES, FILTER_REGEX,
 							   FILTER_SIZE, FILTER_WORDS, FOLLOW_REDIRECT,
@@ -8,6 +6,7 @@ from secator.definitions import (DELAY, DEPTH, FILTER_CODES, FILTER_REGEX,
 							   OPT_PIPE_INPUT, PROXY, RATE_LIMIT, RETRIES,
 							   THREADS, TIMEOUT, URL, USER_AGENT)
 from secator.output_types import Tag, Url
+from secator.serializers import JSONSerializer
 from secator.tasks._categories import HttpCrawler
 
 
@@ -41,7 +40,7 @@ class cariddi(HttpCrawler):
 		TIMEOUT: 't',
 		USER_AGENT: 'ua'
 	}
-	item_loaders = []
+	item_loaders = [JSONSerializer()]
 	install_cmd = 'go install -v github.com/edoardottt/cariddi/cmd/cariddi@latest'
 	install_github_handle = 'edoardottt/cariddi'
 	encoding = 'ansi'
@@ -51,53 +50,43 @@ class cariddi(HttpCrawler):
 	profile = 'cpu'
 
 	@staticmethod
-	def item_loader(self, line):
-		items = []
-		try:
-			item = json.loads(line)
-			url_item = {k: v for k, v in item.items() if k != 'matches'}
-			url = url_item[URL]
-			items.append(url_item)
-			matches = item.get('matches', {})
-			params = matches.get('parameters', [])
-			errors = matches.get('errors', [])
-			secrets = matches.get('secrets', [])
-			infos = matches.get('infos', [])
-
-			for param in params:
-				param_name = param['name']
-				for attack in param['attacks']:
-					extra_data = {'param': param_name, 'source': 'url'}
-					item = {
-						'name': attack + ' param',
-						'match': url,
-						'extra_data': extra_data
-					}
-					items.append(item)
-
-			for error in errors:
-				match = error['match']
-				match = (match[:1000] + '...TRUNCATED') if len(match) > 1000 else match  # truncate as this can be a very long match
-				error['extra_data'] = {'error': match, 'source': 'body'}
-				error['match'] = url
-				items.append(error)
+	def on_json_loaded(self, item):
+		url_item = {k: v for k, v in item.items() if k != 'matches'}
+		yield Url(**url_item)
+		url = url_item[URL]
+		matches = item.get('matches', {})
+		params = matches.get('parameters', [])
+		errors = matches.get('errors', [])
+		secrets = matches.get('secrets', [])
+		infos = matches.get('infos', [])
 
-			for secret in secrets:
-				match = secret['match']
-				secret['extra_data'] = {'secret': match, 'source': 'body'}
-				secret['match'] = url
-				items.append(secret)
+		for param in params:
+			param_name = param['name']
+			for attack in param['attacks']:
+				extra_data = {'param': param_name, 'source': 'url'}
+				yield Tag(
+					name=f'{attack} param',
+					match=url,
+					extra_data=extra_data
+				)
 
-			for info in infos:
-				CARIDDI_IGNORE_LIST = ['BTC address']  # TODO: make this a config option
-				if info['name'] in CARIDDI_IGNORE_LIST:
-					continue
-				match = info['match']
-				info['extra_data'] = {'info': match, 'source': 'body'}
-				info['match'] = url
-				items.append(info)
+		for error in errors:
+			match = error['match']
+			error['extra_data'] = {'error': match, 'source': 'body'}
+			error['match'] = url
+			yield Tag(**error)
 
-		except json.decoder.JSONDecodeError:
-			pass
+		for secret in secrets:
+			match = secret['match']
+			secret['extra_data'] = {'secret': match, 'source': 'body'}
+			secret['match'] = url
+			yield Tag(**secret)
 
-		return items
+		for info in infos:
+			CARIDDI_IGNORE_LIST = ['BTC address']  # TODO: make this a config option
+			if info['name'] in CARIDDI_IGNORE_LIST:
+				continue
+			match = info['match']
+			info['extra_data'] = {'info': match, 'source': 'body'}
+			info['match'] = url
+			yield Tag(**info)

secator/tasks/dalfox.py

@@ -7,6 +7,7 @@ from secator.definitions import (CONFIDENCE, DELAY, EXTRA_DATA, FOLLOW_REDIRECT,
 							   SEVERITY, TAGS, THREADS, TIMEOUT, URL,
 							   USER_AGENT)
 from secator.output_types import Vulnerability
+from secator.serializers import JSONSerializer
 from secator.tasks._categories import VulnHttp
 
 DALFOX_TYPE_MAP = {
@@ -23,6 +24,7 @@ class dalfox(VulnHttp):
 	input_type = URL
 	input_flag = 'url'
 	file_flag = 'file'
+	# input_chunk_size = 1
 	json_flag = '--format json'
 	version_flag = 'version'
 	opt_prefix = '--'
@@ -37,6 +39,7 @@ class dalfox(VulnHttp):
 		TIMEOUT: 'timeout',
 		USER_AGENT: 'user-agent'
 	}
+	item_loaders = [JSONSerializer()]
 	output_map = {
 		Vulnerability: {
 			ID: lambda x: None,

secator/tasks/dirsearch.py

@@ -10,7 +10,7 @@ from secator.definitions import (CONTENT_LENGTH, CONTENT_TYPE, DELAY, DEPTH,
 							   MATCH_WORDS, METHOD, OPT_NOT_SUPPORTED, OUTPUT_PATH, PROXY,
 							   RATE_LIMIT, RETRIES, STATUS_CODE,
 							   THREADS, TIMEOUT, USER_AGENT, WORDLIST)
-from secator.output_types import Url
+from secator.output_types import Url, Info, Error
 from secator.tasks._categories import HttpFuzzer
 
 
@@ -20,7 +20,7 @@ class dirsearch(HttpFuzzer):
 	cmd = 'dirsearch'
 	input_flag = '-u'
 	file_flag = '-l'
-	json_flag = '--format json'
+	json_flag = '-O json'
 	opt_prefix = '--'
 	encoding = 'ansi'
 	opt_key_map = {
@@ -52,37 +52,26 @@ class dirsearch(HttpFuzzer):
 			STATUS_CODE: 'status'
 		}
 	}
-	install_cmd = 'pipx install dirsearch'
+	install_cmd = 'pipx install --force git+https://github.com/maurosoria/dirsearch'
 	proxychains = True
 	proxy_socks5 = True
 	proxy_http = True
 	profile = 'io'
 
-	def yielder(self):
-		prev = self.print_item_count
-		self.print_item_count = False
-		list(super().yielder())
-		if self.return_code != 0:
-			return
-		self.results = []
-		if not self.output_json:
-			return
-		note = f'dirsearch JSON results saved to {self.output_path}'
-		if self.print_line:
-			self._print(note)
-		if os.path.exists(self.output_path):
-			with open(self.output_path, 'r') as f:
-				results = yaml.safe_load(f.read()).get('results', [])
-			for item in results:
-				item = self._process_item(item)
-				if not item:
-					continue
-				yield item
-		self.print_item_count = prev
-
 	@staticmethod
 	def on_init(self):
 		self.output_path = self.get_opt_value(OUTPUT_PATH)
 		if not self.output_path:
 			self.output_path = f'{self.reports_folder}/.outputs/{self.unique_name}.json'
 		self.cmd += f' -o {self.output_path}'
+
+	@staticmethod
+	def on_cmd_done(self):
+		if not os.path.exists(self.output_path):
+			yield Error(message=f'Could not find JSON results in {self.output_path}')
+			return
+
+		yield Info(message=f'JSON results saved to {self.output_path}')
+		with open(self.output_path, 'r') as f:
+			results = yaml.safe_load(f.read()).get('results', [])
+		yield from results

secator/tasks/dnsx.py

@@ -1,18 +1,20 @@
 from secator.decorators import task
 from secator.definitions import (OPT_PIPE_INPUT, RATE_LIMIT, RETRIES, THREADS)
-from secator.output_types import Record
+from secator.output_types import Record, Ip, Subdomain
+from secator.output_types.ip import IpProtocol
 from secator.tasks._categories import ReconDns
-import json
+from secator.serializers import JSONSerializer
+from secator.utils import extract_domain_info
 
 
 @task()
 class dnsx(ReconDns):
 	"""dnsx is a fast and multi-purpose DNS toolkit designed for running various retryabledns library."""
-	cmd = 'dnsx -resp -a -aaaa -cname -mx -ns -txt -srv -ptr -soa -axfr -caa'
+	cmd = 'dnsx -resp -recon'
 	json_flag = '-json'
 	input_flag = OPT_PIPE_INPUT
 	file_flag = OPT_PIPE_INPUT
-	output_types = [Record]
+	output_types = [Record, Ip, Subdomain]
 	opt_key_map = {
 		RATE_LIMIT: 'rate-limit',
 		RETRIES: 'retry',
@@ -23,35 +25,52 @@ class dnsx(ReconDns):
 		'resolver': {'type': str, 'short': 'r', 'help': 'List of resolvers to use (file or comma separated)'},
 		'wildcard_domain': {'type': str, 'short': 'wd', 'help': 'Domain name for wildcard filtering'},
 	}
-
+	item_loaders = [JSONSerializer()]
 	install_cmd = 'go install -v github.com/projectdiscovery/dnsx/cmd/dnsx@latest'
 	install_github_handle = 'projectdiscovery/dnsx'
 	profile = 'io'
 
 	@staticmethod
-	def item_loader(self, line):
-		items = []
-		try:
-			item = json.loads(line)
-			if self.orig:  # original dnsx output
-				return item
-			host = item['host']
-			record_types = ['a', 'aaaa', 'cname', 'mx', 'ns', 'txt', 'srv', 'ptr', 'soa', 'axfr', 'caa']
-			for _type in record_types:
-				values = item.get(_type, [])
-				for value in values:
-					name = value
-					extra_data = {}
-					if isinstance(value, dict):
-						name = value['name']
-						extra_data = {k: v for k, v in value.items() if k != 'name'}
-					items.append({
-						'host': host,
-						'name': name,
-						'type': _type.upper(),
-						'extra_data': extra_data
-					})
-		except json.decoder.JSONDecodeError:
-			pass
+	def on_json_loaded(self, item):
+		# Show full DNS response
+		quiet = self.get_opt_value('quiet')
+		if not quiet:
+			all = item['all']
+			for line in all:
+				yield line
+			yield '\n'
 
-		return items
+		# Loop through record types and yield records
+		record_types = ['a', 'aaaa', 'cname', 'mx', 'ns', 'txt', 'srv', 'ptr', 'soa', 'axfr', 'caa']
+		host = item['host']
+		for _type in record_types:
+			values = item.get(_type, [])
+			for value in values:
+				name = value
+				extra_data = {}
+				if isinstance(value, dict):
+					name = value['name']
+					extra_data = {k: v for k, v in value.items() if k != 'name'}
+				if _type == 'a':
+					yield Ip(
+						host=host,
+						ip=name,
+						protocol=IpProtocol.IPv4
+					)
+				elif _type == 'aaaa':
+					yield Ip(
+						host=host,
+						ip=name,
+						protocol=IpProtocol.IPv6
+					)
+				elif _type == 'ptr':
+					yield Subdomain(
+						host=name,
+						domain=extract_domain_info(name, domain_only=True)
+					)
+				yield Record(
+					host=host,
+					name=name,
+					type=_type.upper(),
+					extra_data=extra_data
+				)

secator/tasks/dnsxbrute.py

@@ -2,7 +2,9 @@ from secator.decorators import task
 from secator.definitions import (DOMAIN, HOST, RATE_LIMIT, RETRIES, THREADS, WORDLIST, EXTRA_DATA)
 from secator.config import CONFIG
 from secator.output_types import Subdomain
+from secator.serializers import JSONSerializer
 from secator.tasks._categories import ReconDns
+from secator.utils import process_wordlist
 
 
 @task()
@@ -18,9 +20,10 @@ class dnsxbrute(ReconDns):
         THREADS: 'threads',
     }
     opts = {
-        WORDLIST: {'type': str, 'short': 'w', 'default': CONFIG.wordlists.defaults.dns, 'help': 'Wordlist'},
+        WORDLIST: {'type': str, 'short': 'w', 'default': CONFIG.wordlists.defaults.dns, 'process': process_wordlist, 'help': 'Wordlist to use'},  # noqa: E501
         'trace': {'is_flag': True, 'default': False, 'help': 'Perform dns tracing'},
     }
+    item_loaders = [JSONSerializer()]
     output_map = {
         Subdomain: {
             HOST: 'host',

secator/tasks/feroxbuster.py

@@ -1,15 +1,14 @@
-import shlex
-from pathlib import Path
-
+from secator.config import CONFIG
 from secator.decorators import task
 from secator.definitions import (CONTENT_TYPE, DELAY, DEPTH, FILTER_CODES,
 							   FILTER_REGEX, FILTER_SIZE, FILTER_WORDS,
 							   FOLLOW_REDIRECT, HEADER, LINES, MATCH_CODES,
 							   MATCH_REGEX, MATCH_SIZE, MATCH_WORDS, METHOD,
-							   OPT_NOT_SUPPORTED, OPT_PIPE_INPUT, OUTPUT_PATH, PROXY,
+							   OPT_NOT_SUPPORTED, OPT_PIPE_INPUT, PROXY,
 							   RATE_LIMIT, RETRIES, STATUS_CODE,
 							   THREADS, TIMEOUT, USER_AGENT, WORDLIST, WORDS, DEFAULT_FEROXBUSTER_FLAGS)
 from secator.output_types import Url
+from secator.serializers import JSONSerializer
 from secator.tasks._categories import HttpFuzzer
 
 
@@ -20,7 +19,7 @@ class feroxbuster(HttpFuzzer):
 	input_flag = '--url'
 	input_chunk_size = 1
 	file_flag = OPT_PIPE_INPUT
-	json_flag = '--json'
+	json_flag = '--silent --json'
 	opt_prefix = '--'
 	opts = {
 		# 'auto_tune': {'is_flag': True, 'default': False, 'help': 'Automatically lower scan rate when too many errors'},
@@ -51,6 +50,7 @@ class feroxbuster(HttpFuzzer):
 		USER_AGENT: 'user-agent',
 		WORDLIST: 'wordlist'
 	}
+	item_loaders = [JSONSerializer()]
 	output_map = {
 		Url: {
 			STATUS_CODE: 'status',
@@ -60,9 +60,7 @@ class feroxbuster(HttpFuzzer):
 		}
 	}
 	install_cmd = (
-		'sudo apt install -y unzip curl && '
-		'curl -sL https://raw.githubusercontent.com/epi052/feroxbuster/master/install-nix.sh | '
-		'bash && sudo mv feroxbuster /usr/local/bin'
+		f'cd /tmp && curl -sL https://raw.githubusercontent.com/epi052/feroxbuster/master/install-nix.sh | bash -s {CONFIG.dirs.bin}'  # noqa: E501
 	)
 	install_github_handle = 'epi052/feroxbuster'
 	proxychains = False
@@ -70,21 +68,13 @@ class feroxbuster(HttpFuzzer):
 	proxy_http = True
 	profile = 'cpu'
 
-	@staticmethod
-	def on_init(self):
-		self.output_path = self.get_opt_value(OUTPUT_PATH)
-		if not self.output_path:
-			self.output_path = f'{self.reports_folder}/.outputs/{self.unique_name}.json'
-		Path(self.output_path).touch()
-		self.cmd += f' --output {self.output_path}'
-
 	@staticmethod
 	def on_start(self):
-		if self.input_path:
+		if self.inputs_path:
 			self.cmd += ' --stdin'
-		self.cmd += f' & tail --pid=$! -f {shlex.quote(self.output_path)}'
-		self.shell = True
 
 	@staticmethod
 	def validate_item(self, item):
-		return item['type'] == 'response'
+		if isinstance(item, dict):
+			return item['type'] == 'response'
+		return True

secator/tasks/ffuf.py

@@ -25,7 +25,7 @@ class ffuf(HttpFuzzer):
 	json_flag = '-json'
 	version_flag = '-V'
 	item_loaders = [
-		JSONSerializer(),
+		JSONSerializer(strict=True),
 		RegexSerializer(FFUF_PROGRESS_REGEX, fields=['count', 'total', 'rps', 'duration', 'errors'])
 	]
 	opts = {
@@ -79,5 +79,6 @@ class ffuf(HttpFuzzer):
 
 	@staticmethod
 	def on_item(self, item):
-		item.method = self.get_opt_value(METHOD) or 'GET'
+		if isinstance(item, Url):
+			item.method = self.get_opt_value(METHOD) or 'GET'
 		return item

secator/tasks/fping.py

@@ -29,13 +29,13 @@ class fping(ReconIp):
 	}
 	input_type = IP
 	output_types = [Ip]
-	install_cmd = 'sudo apt install -y fping'
+	install_pre = {'*': ['fping']}
 
 	@staticmethod
 	def item_loader(self, line):
-		if validators.ipv4(line) or validators.ipv6(line):
-			return {'ip': line, 'alive': True}
-		return None
+		if not (validators.ipv4(line) or validators.ipv6(line)):
+			return
+		yield {'ip': line, 'alive': True}
 
 	@staticmethod
 	def on_line(self, line):

secator/tasks/gau.py

@@ -5,6 +5,7 @@ from secator.definitions import (DELAY, DEPTH, FILTER_CODES, FILTER_REGEX,
 							   MATCH_WORDS, METHOD, OPT_NOT_SUPPORTED,
 							   OPT_PIPE_INPUT, PROXY, RATE_LIMIT, RETRIES,
 							   THREADS, TIMEOUT, USER_AGENT)
+from secator.serializers import JSONSerializer
 from secator.tasks._categories import HttpCrawler
 
 
@@ -15,6 +16,9 @@ class gau(HttpCrawler):
 	file_flag = OPT_PIPE_INPUT
 	json_flag = '--json'
 	opt_prefix = '--'
+	opts = {
+		'providers': {'type': str, 'default': None, 'help': 'List of providers to use (wayback,commoncrawl,otx,urlscan)'}
+	}
 	opt_key_map = {
 		HEADER: OPT_NOT_SUPPORTED,
 		DELAY: OPT_NOT_SUPPORTED,
@@ -36,6 +40,7 @@ class gau(HttpCrawler):
 		TIMEOUT: 'timeout',
 		USER_AGENT: OPT_NOT_SUPPORTED,
 	}
+	item_loaders = [JSONSerializer()]
 	install_cmd = 'go install -v github.com/lc/gau/v2/cmd/gau@latest'
 	install_github_handle = 'lc/gau'
 	proxychains = False

secator/tasks/gf.py

@@ -12,7 +12,7 @@ class gf(Tagger):
 	input_flag = OPT_PIPE_INPUT
 	version_flag = OPT_NOT_SUPPORTED
 	opts = {
-		'pattern': {'type': str, 'help': 'Pattern names to match against (comma-delimited)'}
+		'pattern': {'type': str, 'help': 'Pattern names to match against (comma-delimited)', 'required': True}
 	}
 	opt_key_map = {
 		'pattern': ''
@@ -26,7 +26,7 @@ class gf(Tagger):
 
 	@staticmethod
 	def item_loader(self, line):
-		return {'match': line, 'name': self.get_opt_value('pattern').rstrip() + ' pattern'}  # noqa: E731,E501
+		yield {'match': line, 'name': self.get_opt_value('pattern').rstrip() + ' pattern'}  # noqa: E731,E501
 
 	@staticmethod
 	def on_item(self, item):

secator/tasks/gospider.py

@@ -8,6 +8,7 @@ from secator.definitions import (CONTENT_LENGTH, DELAY, DEPTH, FILTER_CODES,
 							   OPT_NOT_SUPPORTED, PROXY, RATE_LIMIT, RETRIES,
 							   STATUS_CODE, THREADS, TIMEOUT, URL, USER_AGENT)
 from secator.output_types import Url
+from secator.serializers import JSONSerializer
 from secator.tasks._categories import HttpCrawler
 
 
@@ -44,6 +45,7 @@ class gospider(HttpCrawler):
 		FOLLOW_REDIRECT: lambda x: not x,
 		DELAY: lambda x: round(x) if isinstance(x, float) else x
 	}
+	item_loaders = [JSONSerializer()]
 	output_map = {
 		Url: {
 			URL: 'output',
@@ -62,6 +64,8 @@ class gospider(HttpCrawler):
 	@staticmethod
 	def validate_item(self, item):
 		"""Keep only items that match the same host."""
+		if not isinstance(item, dict):
+			return False
 		try:
 			netloc_in = furl(item['input']).netloc
 			netloc_out = furl(item['output']).netloc

secator/tasks/grype.py

@@ -1,4 +1,4 @@
-
+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,
@@ -28,32 +28,32 @@ class grype(VulnCode):
 	}
 	output_types = [Vulnerability]
 	install_cmd = (
-		'curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sudo sh -s -- -b /usr/local/bin'
+		f'curl -sSfL https://raw.githubusercontent.com/anchore/grype/main/install.sh | sh -s -- -b {CONFIG.dirs.bin}'
 	)
 	install_github_handle = 'anchore/grype'
 
 	@staticmethod
 	def item_loader(self, line):
 		"""Load vulnerabilty dicts from grype line output."""
-		split = [i for i in line.split(' ') if i]
-		if not len(split) in [5, 6] or split[0] == 'NAME':
-			return None
-		version_fixed = None
+		split = [i for i in line.split('  ') if i]
+		if len(split) not in [5, 6] or split[0] == 'NAME':
+			return
+		versions_fixed = None
 		if len(split) == 5:  # no version fixed
 			product, version, product_type, vuln_id, severity = tuple(split)
 		elif len(split) == 6:
-			product, version, version_fixed, product_type, vuln_id, severity = tuple(split)
+			product, version, versions_fixed, product_type, vuln_id, severity = tuple(split)
 		extra_data = {
 			'lang': product_type,
 			'product': product,
 			'version': version,
 		}
-		if version_fixed:
-			extra_data['version_fixed'] = version_fixed
+		if versions_fixed:
+			extra_data['versions_fixed'] = [c.strip() for c in versions_fixed.split(', ')]
 		data = {
 			'id': vuln_id,
 			'name': vuln_id,
-			'matched_at': self.input,
+			'matched_at': self.inputs[0],
 			'confidence': 'medium',
 			'severity': severity.lower(),
 			'provider': 'grype',
@@ -63,7 +63,6 @@ class grype(VulnCode):
 		if vuln_id.startswith('GHSA'):
 			data['provider'] = 'github.com'
 			data['references'] = [f'https://github.com/advisories/{vuln_id}']
-			data['tags'].extend(['cve', 'ghsa'])
 			vuln = VulnCode.lookup_ghsa(vuln_id)
 			if vuln:
 				data.update(vuln)
@@ -72,8 +71,7 @@ class grype(VulnCode):
 		elif vuln_id.startswith('CVE'):
 			vuln = VulnCode.lookup_cve(vuln_id)
 			if vuln:
-				vuln['tags'].append('cve')
 				data.update(vuln)
 				data['severity'] = data['severity'] or severity.lower()
 		data['extra_data'] = extra_data
-		return data
+		yield data

secator/tasks/h8mail.py

@@ -4,7 +4,7 @@ import json
 from secator.decorators import task
 from secator.definitions import EMAIL, OUTPUT_PATH
 from secator.tasks._categories import OSInt
-from secator.output_types import UserAccount
+from secator.output_types import UserAccount, Info, Error
 
 
 @task()
@@ -17,17 +17,11 @@ class h8mail(OSInt):
 	file_flag = '-domain'
 	version_flag = '--help'
 	opt_prefix = '--'
-	opt_key_map = {
-
-	}
 	opts = {
 		'config': {'type': str, 'help': 'Configuration file for API keys'},
 		'local_breach': {'type': str, 'short': 'lb', 'help': 'Local breach file'}
 	}
-	output_map = {
-	}
-
-	install_cmd = 'pipx install h8mail'
+	install_cmd = 'pipx install h8mail && pipx upgrade h8mail'
 
 	@staticmethod
 	def on_start(self):
@@ -37,44 +31,40 @@ class h8mail(OSInt):
 		self.output_path = output_path
 		self.cmd = self.cmd.replace('--json', f'--json {self.output_path}')
 
-	def yielder(self):
-		prev = self.print_item_count
-		self.print_item_count = False
-		list(super().yielder())
-		if self.return_code != 0:
+	@staticmethod
+	def on_cmd_done(self):
+		if not os.path.exists(self.output_path):
+			yield Error(message=f'Could not find JSON results in {self.output_path}')
 			return
-		self.results = []
-		if os.path.exists(self.output_path):
-			with open(self.output_path, 'r') as f:
-				data = json.load(f)
-			if self.orig:  # original h8mail output
-				yield data
-				return
-			targets = data['targets']
-			for target in targets:
-				email = target['target']
-				target_data = target.get('data', [])
-				pwn_num = target['pwn_num']
-				if not pwn_num > 0:
-					continue
-				if len(target_data) > 0:
-					entries = target_data[0]
-					for entry in entries:
-						source, site_name = tuple(entry.split(':'))
-						yield UserAccount(**{
-							"site_name": site_name,
-							"username": email.split('@')[0],
-							"email": email,
-							"extra_data": {
-								'source': source
-							},
-						})
-				else:
+
+		yield Info(message=f'JSON results saved to {self.output_path}')
+		with open(self.output_path, 'r') as f:
+			data = json.load(f)
+
+		targets = data['targets']
+		for target in targets:
+			email = target['target']
+			target_data = target.get('data', [])
+			pwn_num = target['pwn_num']
+			if not pwn_num > 0:
+				continue
+			if len(target_data) > 0:
+				entries = target_data[0]
+				for entry in entries:
+					source, site_name = tuple(entry.split(':'))
 					yield UserAccount(**{
+						"site_name": site_name,
 						"username": email.split('@')[0],
 						"email": email,
 						"extra_data": {
-							'source': self.get_opt_value('local_breach')
+							'source': source
 						},
 					})
-		self.print_item_count = prev
+			else:
+				yield UserAccount(**{
+					"username": email.split('@')[0],
+					"email": email,
+					"extra_data": {
+						'source': self.get_opt_value('local_breach')
+					},
+				})