From 89c494ae9bc1e8dca67fb0de859bbed978a0a0bd Mon Sep 17 00:00:00 2001 From: Damian Schwyrz Date: Sat, 30 Jun 2018 17:33:43 +0200 Subject: [PATCH] - Added cloudflare resolvers - Fixed deadlock based on https://github.com/persebek/Sublist3r/commit/75144adaa62afb06ea3448e1212019bcbdcb1db9 --- subbrute/subbrute.py | 6 +++--- turbolist3r.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/subbrute/subbrute.py b/subbrute/subbrute.py index c7b1ab6..534f95a 100644 --- a/subbrute/subbrute.py +++ b/subbrute/subbrute.py @@ -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) diff --git a/turbolist3r.py b/turbolist3r.py index 746db81..72832b8 100644 --- a/turbolist3r.py +++ b/turbolist3r.py @@ -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))