Merge remote-tracking branch 'origin/master'

# Conflicts:
#	modules/dnsquery/srv.py
#	modules/finder.py
This commit is contained in:
Jing Ling
2020-08-20 21:36:33 +08:00
42 changed files with 88 additions and 70 deletions
+1 -1
View File
@@ -23,6 +23,6 @@ class Lookup(Module):
for item in answer:
record = item.to_text()
subdomains = self.match_subdomains(record)
self.subdomains = self.subdomains.union(subdomains)
self.subdomains.update(subdomains)
logger.log('DEBUG', record)
return self.subdomains
+2 -1
View File
@@ -220,7 +220,8 @@ class Module(object):
def collect_subdomains(self, resp):
subdomains = self.match_subdomains(resp)
return self.subdomains.union(subdomains)
self.subdomains.update(subdomains)
return self.subdomains
def save_json(self):
"""
+10
View File
@@ -728,3 +728,13 @@ def match_subdomains(domain, html, distinct=True, fuzzy=True):
return set(deal)
else:
return list(deal)
def check_random_subdomain(subdomains):
if not subdomains:
logger.log('ALERT', f'The generated dictionary is empty')
return False
for subdomain in subdomains:
if subdomain:
logger.log('ALERT', f'Please check whether {subdomain} is correct or not')
return True