- Added cloudflare resolvers

- Fixed deadlock based on 75144adaa6
This commit is contained in:
Damian Schwyrz 2018-06-30 17:33:43 +02:00
parent 322b613e60
commit 89c494ae9b
2 changed files with 5 additions and 5 deletions

View File

@ -163,7 +163,7 @@ class verify_nameservers(multiprocessing.Process):
#We found atleast one wildcard, look for more.
looking_for_wildcards = True
except Exception as e:
if type(e) == dns.resolver.NXDOMAIN or type(e) == dns.name.EmptyLabel:
if type(e) == dns.resolver.NXDOMAIN or type(e) == dns.name.EmptyLabel or type(e) == dns.resolver.NoAnswer:
#not found
return True
else:
@ -194,7 +194,7 @@ class lookup(multiprocessing.Process):
ret = []
try:
ret = [self.resolver_q.get_nowait()]
if ret == False:
if ret == [False]:
#Queue is empty, inform the rest.
self.resolver_q.put(False)
ret = []
@ -205,7 +205,7 @@ class lookup(multiprocessing.Process):
def get_ns_blocking(self):
ret = []
ret = [self.resolver_q.get()]
if ret == False:
if ret == [False]:
trace("get_ns_blocking - Resolver list is empty.")
#Queue is empty, inform the rest.
self.resolver_q.put(False)

View File

@ -625,7 +625,7 @@ class DNSdumpster(enumratorBaseThreaded):
def check_host(self, host):
is_valid = False
Resolver = dns.resolver.Resolver()
Resolver.nameservers = ['8.8.8.8', '8.8.4.4']
Resolver.nameservers = ['8.8.8.8', '8.8.4.4', '1.1.1.1', '1.0.0.1']
self.lock.acquire()
try:
ip = Resolver.query(host, 'A')[0].to_text()
@ -1135,7 +1135,7 @@ if __name__ == "__main__":
# Code added here
if (analysis):
# res is the list of subdomains e.g. www.example.com, mail.example.com, etc
resolvers = ['8.8.8.8', '8.8.4.4', '9.9.9.9', '75.75.75.75']
resolvers = ['8.8.8.8', '8.8.4.4', '9.9.9.9', '75.75.75.75', '1.1.1.1', '1.0.0.1']
server = 0
count = 0
total = str(len(res))