Added test cases for IP2LocationIPTools class.

Author: ip2location-com

ChangeLog

@@ -1,3 +1,6 @@
+8.7.2 2022-04-15
+	* Added test cases for IP2LocationIPTools class.
+
 8.7.2 2022-03-21
 	* Fixed GitHub issue #19.
 

IP2Location.py

@@ -96,13 +96,12 @@ def inet_pton(t, addr):
     socket.inet_pton = inet_pton
 
 def is_ipv4(hostname):
-    pattern = r'^([0-9]{1,3}[.]){3}[0-9]{1,3}$'
     ip_parts = hostname.split('.')
+    for i in range(0,len(ip_parts)):
+        if int(ip_parts[i]) > 255:
+            return False
+    pattern = r'^([0-9]{1,3}[.]){3}[0-9]{1,3}$'
     if match(pattern, hostname) is not None:
-        ip_parts = hostname.split('.')
-        for i in range(0,len(ip_parts)):
-            if int(ip_parts[i]) > 255:
-                return False
         return 4
     return False
 
@@ -674,19 +673,29 @@ def getcredit(self):
 class IP2LocationAPIError(Exception):
     """Raise for IP2Location API Error Message"""
 
-class AddressValueError(ValueError):
-    """A Value Error related to the address."""
-
 class IP2LocationIPTools(object):
 
     def is_ipv4(self, ip):
-        ip_parts = ip.split('.')
-        for i in range(0,len(ip_parts)):
-            if int(ip_parts[i]) > 255:
+        if '.' in ip:
+            ip_parts = ip.split('.')
+            if len(ip_parts) == 4:
+                for i in range(0,len(ip_parts)):
+                    if ip_parts[i].isdigit():
+                        if int(ip_parts[i]) > 255:
+                            print('1')
+                            return False
+                    else:
+                        print('2')
+                        return False
+                pattern = r'^([0-9]{1,3}[.]){3}[0-9]{1,3}$'
+                if match(pattern, ip) is not None:
+                    return True
+            else:
+                print('3')
                 return False
-        pattern = r'^([0-9]{1,3}[.]){3}[0-9]{1,3}$'
-        if match(pattern, ip) is not None:
-            return True
+        else:
+            print('4')
+            return False
         return False
 
     def is_ipv6(self, ip):
@@ -705,22 +714,32 @@ def ipv4_to_decimal(self, ip):
         return ipnum
 
     def decimal_to_ipv4(self, decimal):
+        if decimal.isdigit() is False:
+            return
         if (int(decimal) > 4294967295):
             return
         else:
             return (socket.inet_ntoa(struct.pack('!I', int(decimal))))
 
     def ipv6_to_decimal(self, ip):
+        if self.is_ipv6(ip) is False:
+            return
         return(int(ipaddress.ip_address(u(ip))))
 
     def decimal_to_ipv6(self, decimal):
+        if decimal.isdigit() is False:
+            return
         result = ipaddress.IPv6Address(int(decimal))
         if (result.ipv4_mapped != None):
             return('::ffff:' + str(result.ipv4_mapped))
         else:
             return str(result)
 
     def ipv4_to_cidr(self, from_ip, to_ip):
+        if self.is_ipv4(from_ip) is False:
+            return
+        if self.is_ipv4(to_ip) is False:
+            return
         startip = ipaddress.IPv4Address(u(from_ip))
         endip = ipaddress.IPv4Address(u(to_ip))
         ar = [ipaddr for ipaddr in ipaddress.summarize_address_range(startip, endip)]
@@ -730,6 +749,10 @@ def ipv4_to_cidr(self, from_ip, to_ip):
         return (ar1)
 
     def ipv6_to_cidr(self, from_ip, to_ip):
+        if self.is_ipv6(from_ip) is False:
+            return
+        if self.is_ipv6(to_ip) is False:
+            return
         startip = ipaddress.IPv6Address(u(from_ip))
         endip = ipaddress.IPv6Address(u(to_ip))
         ar = [ipaddr for ipaddr in ipaddress.summarize_address_range(startip, endip)]
@@ -739,10 +762,14 @@ def ipv6_to_cidr(self, from_ip, to_ip):
         return (ar1)
 
     def cidr_to_ipv4(self, cidr):
+        if '/' not in cidr:
+            return
         net=ipaddress.ip_network(u(cidr))
         return({"ip_start": str(net[0]), "ip_end": str(net[-1])})
 
     def cidr_to_ipv6(self, cidr):
+        if '/' not in cidr:
+            return
         parts = cidr.split('/')
         hexstartaddress = binascii.hexlify(socket.inet_pton(socket.AF_INET6, parts[0]))
         if (len(hexstartaddress) < 16):
@@ -764,8 +791,12 @@ def cidr_to_ipv6(self, cidr):
         return({"ip_start": self.expand_ipv6(parts[0]), "ip_end": self.expand_ipv6(socket.inet_ntop(socket.AF_INET6, binlastaddress))})
 
     def compressed_ipv6(self, ip):
+        if self.is_ipv6(ip) is False:
+            return
         return ((ipaddress.IPv6Address(u(ip)).compressed))
 
     def expand_ipv6(self, ip):
+        if self.is_ipv6(ip) is False:
+            return
         return ((ipaddress.IPv6Address(u(ip)).exploded))
 

PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: IP2Location
-Version: 8.7.2
+Version: 8.7.3
 Summary: Python API for IP2Location database
 Home-page: http://www.ip2location.com
 Author: IP2Location

README.md

@@ -1,4 +1,4 @@
-# IP2Location 8.7.2
+# IP2Location 8.7.3
 
 
 This is a IP2Location Python library that enables the user to find the country, region or state, city, latitude and longitude, ZIP code, time zone, Internet Service Provider (ISP) or company name, domain name, net speed, area code, weather station code, weather station name, mobile country code (MCC), mobile network code (MNC) and carrier brand, elevation, usage type, address type and IAB category by IP address or hostname originates from. The library reads the geo location information from **IP2Location BIN data** file.

sample.py

@@ -49,6 +49,7 @@
 print ("\n")
 print ("Credit Remaining: {}\n".format(ws.getcredit()))
 
+# IP Tools
 ipTools = IP2Location.IP2LocationIPTools()
 print(str(ipTools.is_ipv4('8.8.8.8')))
 print(str(ipTools.is_ipv6('2001:4860:4860::8888')))

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
 	name="IP2Location",
-	version="8.7.2", 
+	version="8.7.3", 
 	author="IP2Location",
 	author_email="support@ip2location.com",
 	description="This is an IP geolocation library that enables the user to find the country, region, city, latitude and longitude, ZIP code, time zone, ISP, domain name, area code, weather info, mobile info, elevation, usage type, address type and IAB category from an IP address. It supports both IPv4 and IPv6 lookup.",

tests/test_iptools.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+import IP2Location
+
+ipTools = IP2Location.IP2LocationIPTools()
+
+def testipv4():
+    assert ipTools.is_ipv4('8.8.8.8') == True
+
+def testinvalidipv4():
+    assert ipTools.is_ipv4('8.8.8.555') == False
+
+def testipv6():
+    assert ipTools.is_ipv6('2001:4860:4860::8888') == True
+
+def testinvalidipv6():
+    assert ipTools.is_ipv6('2001:4860:4860::ZZZZ') == False
+
+def testipv4decimal():
+    assert ipTools.ipv4_to_decimal('8.8.8.8') == 134744072
+
+def testdecimalipv4():
+    assert ipTools.decimal_to_ipv4(134744072) == '8.8.8.8'
+
+def testipv6decimal():
+    assert ipTools.ipv6_to_decimal('2001:4860:4860::8888') == 42541956123769884636017138956568135816
+
+def testdecimalipv6():
+    assert ipTools.decimal_to_ipv6(42541956123769884636017138956568135816) == '2001:4860:4860::8888'
+
+def testipv4tocidr():
+    assert ipTools.ipv4_to_cidr('8.0.0.0', '8.255.255.255') == ['8.0.0.0/8']
+
+def testcidrtoipv4():
+    assert ipTools.cidr_to_ipv4('8.0.0.0/8') == {'ip_start': '8.0.0.0', 'ip_end': '8.255.255.255'}
+
+def testipv6tocidr():
+    assert ipTools.ipv6_to_cidr('2002:0000:0000:1234:abcd:ffff:c0a8:0000', '2002:0000:0000:1234:ffff:ffff:ffff:ffff') == ['2002::1234:abcd:ffff:c0a8:0/109', '2002::1234:abcd:ffff:c0b0:0/108', '2002::1234:abcd:ffff:c0c0:0/106', '2002::1234:abcd:ffff:c100:0/104', '2002::1234:abcd:ffff:c200:0/103', '2002::1234:abcd:ffff:c400:0/102', '2002::1234:abcd:ffff:c800:0/101', '2002::1234:abcd:ffff:d000:0/100', '2002::1234:abcd:ffff:e000:0/99', '2002:0:0:1234:abce::/79', '2002:0:0:1234:abd0::/76', '2002:0:0:1234:abe0::/75', '2002:0:0:1234:ac00::/70', '2002:0:0:1234:b000::/68', '2002:0:0:1234:c000::/66']
+
+def testcidrtoipv6():
+    assert ipTools.cidr_to_ipv6('2002::1234:abcd:ffff:c0a8:101/64') == {'ip_start': '2002:0000:0000:1234:abcd:ffff:c0a8:0101', 'ip_end': '2002:0000:0000:1234:ffff:ffff:ffff:ffff'}
+
+def testcompressipv6():
+    assert ipTools.compressed_ipv6('2002:0000:0000:1234:FFFF:FFFF:FFFF:FFFF') == '2002::1234:ffff:ffff:ffff:ffff'
+
+def testexpandipv6():
+    assert ipTools.expand_ipv6('2002::1234:FFFF:FFFF:FFFF:FFFF') == '2002:0000:0000:1234:ffff:ffff:ffff:ffff'