Replaced IPy library with built in ipaddress library

Author: byt3bl33d3r

CHANGELOG

@@ -3,6 +3,7 @@ Version 0.4
 * Ported to Python 3.6+
 * Made everything a bit more PEP8 compliant
 * Improved logging
+* Removed IPy library (replaced with built-in ipaddress library)
 
 Version 0.3
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2014 Peter Kacherginsky
+Copyright (C) 2014 Peter Kacherginsky, Marcello Salvati
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Pipfile

@@ -7,4 +7,3 @@ verify_ssl = true
 
 [packages]
 dnslib = "*"
-ipy = "*"

Pipfile.lock

@@ -335,7 +335,7 @@ Internal architecture
 
 Here is some information on the internals in case you need to adapt the tool for your needs. DNSChef is built on top of the SocketServer module and uses threading to help process multiple requests simultaneously. The tool is designed to listen on TCP or UDP ports (default is port 53) for incoming requests and forward those requests when necessary to a real DNS server over UDP.
 
-The excellent [dnslib library](https://bitbucket.org/paulc/dnslib/wiki/Home) is used to dissect and reassemble DNS packets. It is particularly useful when generating response packets based on queries. [IPy](https://github.com/haypo/python-ipy/) is used for IPv6 addresses manipulation. Both libraries come bundled with DNSChef to ease installation.
+The excellent [dnslib library](https://bitbucket.org/paulc/dnslib/wiki/Home) is used to dissect and reassemble DNS packets. It is particularly useful when generating response packets based on queries.
 
 DNSChef is capable of modifing queries for records of type "A", "AAAA", "MX", "CNAME", "NS", "TXT", "PTR", "NAPTR", "SOA", "ANY". It is very easy to expand or modify behavior for any record. Simply add another **if qtype == "RECORD TYPE")** entry and tell it what to reply with.
 

README

@@ -38,7 +38,7 @@
 from configparser import ConfigParser
 
 from dnslib import *
-from IPy import IP
+from ipaddress import ip_address
 
 import logging
 import threading
@@ -128,9 +128,7 @@ def parse(self, data):
 
                     # IPv6 needs additional work before inclusion:
                     if qtype == "AAAA":
-                        ipv6 = IP(fake_record)
-                        ipv6_bin = ipv6.strBin()
-                        ipv6_hex_tuple = [int(ipv6_bin[i:i+8],2) for i in range(0,len(ipv6_bin),8)]
+                        ipv6_hex_tuple = list(map(int, ip_address(fake_record).packed))
                         response.add_answer(RR(qname, getattr(QTYPE,qtype), rdata=RDMAP[qtype](ipv6_hex_tuple)))
 
                     elif qtype == "SOA":
@@ -203,9 +201,7 @@ def parse(self, data):
                             # NOTE: RDMAP is a dictionary map of qtype strings to handling classses
                             # IPv6 needs additional work before inclusion:
                             if qtype == "AAAA":
-                                ipv6 = IP(fake_record)
-                                ipv6_bin = ipv6.strBin()
-                                fake_record = [int(ipv6_bin[i:i+8],2) for i in range(0,len(ipv6_bin),8)]
+                                fake_record = list(map(int, ip_address(fake_record).packed))
 
                             elif qtype == "SOA":
                                 mname,rname,t1,t2,t3,t4,t5 = fake_record.split(" ")

dnschef.py

@@ -0,0 +1,2 @@
+-i https://pypi.org/simple
+dnslib==0.9.10