Clean ip extraction

Author: Inbal Tako

requirements.txt

@@ -2,4 +2,6 @@ requests~=2.24.0
 pycryptodome==3.9.8
 responses==0.10.15
 requests-mock==1.8.0
-pytest==5.4.3
+pytest==5.4.3
+setuptools~=49.6.0
+IPy~=1.0

securenative/utils/ip_utils.py

@@ -1,6 +1,6 @@
 import ipaddress
 import re
-import socket
+from IPy import IP
 
 
 class IpUtils(object):
@@ -19,12 +19,12 @@ def is_ip_address(ip_address):
     def is_valid_public_ip(ip_address):
         ip = ipaddress.ip_address(ip_address)
 
-        if ip is ipaddress.IPv4Address:
-            if not ip.is_loopback and not ip.is_reserved and not ip.is_unspecified:
+        if ip.version is 4:
+            if not ip.is_loopback and not ip.is_reserved and not ip.is_unspecified and IP(ip_address).iptype() is not "PRIVATE":
                 return True
             return False
 
-        if not ip.is_unspecified:
+        if not ip.is_unspecified and IP(ip_address).iptype() is not "PRIVATE":
             return True
         return False