Add ipinfo.io, improve tracing

Author: Zomboided

changelog.txt

@@ -1,6 +1,7 @@
 v4.1.0
 - Add black.box
 - Fix issue with verb setting being ignored in some UserDefined ovpns
+- Improve detection of IP address by adding ipinfo.io
 
 v4.0.9
 - Fix XML

libs/common.py

@@ -142,8 +142,7 @@ def getIPInfo(addon):
 
     if isAutoSelect(source):
         source = getAutoSource()
-        
-    debugTrace("Getting IP info from " + source)
+
     retry = 0
     bad_response = False
     while retry < 6:
@@ -181,12 +180,11 @@ def getIPInfo(addon):
             # Worked, exit loop
             break
         retry = retry + 1
-
+        
     # Check to see if the call was good (after 5 retries)
-    if ip == "no_info" or ip == "error":
+    if ip == "no info" or ip == "error":
         return source, "no info", "unknown", "unknown"
 
-    
     location = ""
     if not (region == "-" or region == "Not Available"): location = region
     if not (country == "-" or country == "Not Available"):

libs/ipinfo.py

@@ -26,8 +26,8 @@
 
 
 
-ip_sources = ["Auto select", "IP-API", "IPInfoDB", "freegeoip.net"]
-ip_urls = ["", "http://ip-api.com/json", "http://www.ipinfodb.com/my_ip_location.php", "http://freegeoip.net/json/"] 
+ip_sources = ["Auto select", "ipinfo.io", "IP-API", "freegeoip.net"]
+ip_urls = ["", "http://ipinfo.io/json", "http://ip-api.com/json", "http://freegeoip.net/json/"] 
 LIST_DEFAULT = "0,0,0"
 
 MAX_ERROR = 64
@@ -38,7 +38,7 @@ def getIPInfoFrom(source):
     # No info generated from call is "no info", "unknown", "unknown", "unknown", url response
     # Or general error is "error", "error", "error", reason, url response
     link = ""
-    try:      
+    try:
         # Determine the URL, make the call and read the response
         url = getIPSourceURL(source)
         if url == "": return "error", "error", "error", "unknown source", ""
@@ -47,23 +47,45 @@ def getIPInfoFrom(source):
         response = urllib2.urlopen(req)
         link = response.read()
         response.close()
-
-        # Call the right routine to parse the reply using regex.
-        # If the website changes, this parsing can fail...sigh
-        if source == "IPInfoDB": match = getIPInfoDB(link)
+    except Exception as e:
+        errorTrace("ipinfo.py", "Couldn't connect to IP provider " + source)
+        errorTrace("ipinfo.py", str(e))
+        recordError(source)
+        return "error", "error", "error", "call failed", link
+        
+    try:
+        # This makes stupid regex easier
+        link = link.replace("\n","")
+        debugTrace("IP provider " + source + " returned " + link)
+        # Call the right routine to parse the reply using regex
+        # These all return JSON so probably a JSON parser should really be used
+        if source == "ipinfo.io": match = getipinfo(link)
         if source == "IP-API": match = getIPAPI(link)
         if source == "freegeoip.net": match = getFreeGeoIP(link)
-        if len(match) > 0:
+        
+        if not match == None:
             recordWorking(source)
             for ip, country, region, city, isp in match:
                 return ip, country, region, city, isp
         else:
+            errorTrace("ipinfo.py", "No matches found for IP provider " + "source" + " " + link)
             recordError(source)
             return "no info", "unknown location", "unknown location", "no matches", link
-    except:
+    except Exception as e:
+        errorTrace("ipinfo.py", "Couldn't parse response from IP provider " + source + " " + link)
+        errorTrace("ipinfo.py", str(e))
         recordError(source)
-        return "error", "error", "error", "call failed", link
+        return "error", "error", "error", "parse failed", link
 
+        
+def getipinfo(link):
+    match = re.compile(ur'"ip": "(.*?)".*"city": "(.*?)".*"region": "(.*?)".*"country": "(.*?)".*"org": "(.*?)"').findall(link)
+    if len(match) > 0:
+        for ip, city, region, country, isp in match:
+            return [(ip, country, region, city, isp)]
+    else:
+        return None               
+        
 
 def getIPAPI(link):
     match = re.compile(ur'"city":"(.*?)".*"country":"(.*?)".*"isp":"(.*?)".*"query":"(.*?)".*"regionName":"(.*?)"').findall(link)
@@ -74,15 +96,6 @@ def getIPAPI(link):
         return None           
 
 
-def getIPInfoDB(link):
-    match = re.compile(ur'<h5>Your IP address.*</h5>.*\s*.*<br>.*IP2Location.*\s*.*\s*<li>IP address.*<strong>(.+?)</strong>.*\s*\s*<li>Country : (.+?) <img.*\s*<li>State.*: (.+?)</li>.*\s*<li>City : (.+?)</li>').findall(link)    
-    if len(match) > 0:
-        for ip, country, region, city in match:
-            return [(ip, country, region, city, "Unknown")]
-    else:
-        return None
-
-        
 def getFreeGeoIP(link):
     match = re.compile(ur'"ip":"(.*?)".*"country_name":"(.*?)".*"region_name":"(.*?).*"city":"(.*?)".*').findall(link)
     if len(match) > 0:

resources/language/English/strings.po

@@ -587,11 +587,11 @@ msgid "Auto select"
 msgstr ""
 
 msgctxt "#32173"
-msgid "IP-API"
+msgid "ipinfo.io"
 msgstr ""
 
 msgctxt "#32174"
-msgid "IPInfoDB"
+msgid "IP-API"
 msgstr ""
 
 msgctxt "#32175"

service.py

@@ -91,6 +91,7 @@ def checkConnections():
     for i in range (1, 11):        
         next_conn = (addon.getSetting(str(i)+"_vpn_validated"))
         if not next_conn == "" and not xbmcvfs.exists(next_conn):
+            errorTrace("service.py", "Checking connections and couldn't find connection " + str(i) + ", " + next_conn)
             return False
     return True
 
@@ -215,9 +216,10 @@ def onSettingsChanged( self ):
 
     if not primary_path == "" and not xbmcvfs.exists(primary_path):
         vpn_provider = getVPNLocation(addon.getSetting("vpn_provider_validated"))
-        infoTrace("service.py", "New install, but was using good VPN previously (" + vpn_provider + ").  Regenerate OVPNs")
+        infoTrace("service.py", "New install, but was using good VPN previously (" + vpn_provider + ", " + primary_path + ").  Regenerate OVPNs")
         populateSupportingFromGit(vpn_provider)
         if not fixOVPNFiles(vpn_provider, addon.getSetting("vpn_locations_list")) or not checkConnections():
+            errorTrace("service.py", "VPN connection is not available for " + vpn_provider + " with list " + addon.getSetting("vpn_locations_list") + ", need to revalidate")
             xbmcgui.Dialog().ok(addon_name, "One of the VPN connections you were using previously is no longer available.  Please re-validate all connections.")
             removeGeneratedFiles()
             resetVPNConfig(addon, 1)