Fix python3 compatibility

dnsrecon/cli.py

@@ -114,11 +114,11 @@ def process_spf_data(res, data):
 
     # Create a list of IPNetwork objects.
     for ip in ipv4:
-        for i in IPNetwork(ip):
+        for i in netaddr.IPNetwork(ip):
             ip_list.append(i)
 
     for ip in ipv6:
-        for i in IPNetwork(ip):
+        for i in netaddr.IPNetwork(ip):
             ip_list.append(i)
 
     # Extract and process include values.
@@ -138,22 +138,22 @@ def expand_cidr(cidr_to_expand):
     Function to expand a given CIDR and return an Array of IP Addresses that
     form the range covered by the CIDR.
     """
-    return IPNetwork(cidr_to_expand)
+    return netaddr.IPNetwork(cidr_to_expand)
 
 
 def expand_range(startip, endip):
     """
     Function to expand a given range and return an Array of IP Addresses that
     form the range.
     """
-    return IPRange(startip, endip)
+    return netaddr.IPRange(startip, endip)
 
 
 def range2cidr(ip1, ip2):
     """
     Function to return the maximum CIDR given a range of IP's
     """
-    r1 = IPRange(ip1, ip2)
+    r1 = netaddr.IPRange(ip1, ip2)
     return str(r1.cidrs()[-1])
 
 
@@ -385,8 +385,8 @@ def brute_srv(res, domain, verbose=False, thread_num=None):
             future_results = {executor.submit(res.get_srv, srvtype + domain): srvtype for srvtype in srvrcd}
             # Display logs as soon as a thread is finished
             for future in futures.as_completed(future_results):
-                res = future.result()
-                for type_, name_, target_, addr_, port_, priority_ in res:
+                result = future.result()
+                for type_, name_, target_, addr_, port_, priority_ in result:
                     returned_records.append(
                         {
                             'type': type_,
@@ -496,8 +496,8 @@ def brute_domain(
             future_results = {executor.submit(res.get_ip, target): target for target in targets}
             # Display logs as soon as a thread is finished
             for future in futures.as_completed(future_results):
-                res = future.result()
-                for type_, name_, address_or_target_ in res:
+                result = future.result()
+                for type_, name_, address_or_target_ in result:
                     print_and_append = False
                     found_dict = {'type': type_, 'name': name_}
                     if type_ in ['A', 'AAAA']:
@@ -1707,7 +1707,7 @@ def main():
 
     # if user requests tool version, we print it and exit
     if arguments.version:
-        print(f'DNSRecon version {__version__} https://www.darkoperator.com')
+        logger.info(f'DNSRecon version {__version__} https://www.darkoperator.com')
         sys.exit(0)
 
     # validating type param which is in the form: type1,type2,...,typeN
@@ -1937,7 +1937,7 @@ def main():
                     if crt_enum_records is not None and do_output:
                         all_returned_records.extend(crt_enum_records)
                     else:
-                        print('[-] No records returned from crt.sh enumeration')
+                        logger.info('[-] No records returned from crt.sh enumeration')
 
                 elif type_ == 'snoop':
                     if not (dictionary and ns_server):

dnsrecon/lib/whois.py

@@ -13,11 +13,10 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
+import ipaddress
 import re
 import socket
 
-from netaddr import *
-
 __name__ = 'whois.py'
 
 WHOIS_PORT_NUMBER = 43
@@ -27,19 +26,16 @@
 def get_whois(ip_addrs):
     """
     Function that returns what whois server is the one to be queried for
-    registration information, returns whois.arin.net is not in database, returns
+    registration information, returns whois.arin.net if not in database, returns
     None if private.
     """
     whois_server = None
-    ip = IPAddress(ip_addrs)
-    info_of_ip = ip.info
-    if ip.version == 4 and ip.is_private() is False:
-        for i in info_of_ip['IPv4']:
-            whois_server = i['whois']
-            if len(whois_server) == 0 and i['status'] != 'Reserved':
-                whois_server = 'whois.arin.net'
-            elif len(whois_server) == 0:
-                whois_server = None
+    try:
+        ip = ipaddress.ip_address(ip_addrs)
+        if isinstance(ip, ipaddress.IPv4Address) and not ip.is_private:
+            whois_server = 'whois.arin.net'
+    except ValueError:
+        whois_server = None
 
     return whois_server
 
@@ -61,9 +57,11 @@ def whois(target, whois_srv):
         response = ''
         while True:
             d = s.recv(WHOIS_RECEIVE_BUFFER_SIZE)
-            response += str(d)
+            if not d:
+                break
+            response += d.decode('utf-8')
             counter += 1
-            if str(d) == '' or counter == 5:
+            if counter == 5:
                 break
         s.close()
     except Exception as e: