Ticket #18349: django_ipv6_geoip.4.patch

django/contrib/gis/geoip/base.py

@@ -3 +3 @@
 from ctypes import c_char_p
 
 from django.core.validators import ipv4_re
+from django.utils.ipv6 import is_valid_ipv6_address
 from django.contrib.gis.geoip.libgeoip import GEOIP_SETTINGS
 from django.contrib.gis.geoip.prototypes import (
     GeoIPRecord, GeoIPTag, GeoIP_open, GeoIP_delete, GeoIP_database_info,
     GeoIP_lib_version, GeoIP_record_by_addr, GeoIP_record_by_name,
     GeoIP_country_code_by_addr, GeoIP_country_code_by_name,
-    GeoIP_country_name_by_addr, GeoIP_country_name_by_name)
+    GeoIP_country_name_by_addr, GeoIP_country_name_by_name,
+    GeoIP_country_code_by_addr_v6, GeoIP_country_name_by_addr_v6,
+    GeoIP_record_by_addr_v6)
 
 from django.utils import six
 
@@ -48 +51 @@
 
     # Paths to the city & country binary databases.
     _city_file = ''
+    _city6_file = ''
     _country_file = ''
+    _country6_file = ''
 
     # Initially, pointers to GeoIP file references are NULL.
     _city = None
+    _city6 = None
     _country = None
 
     def __init__(self, path=None, cache=0, country=None, city=None):
@@ -100 +106 @@
                 self._country = GeoIP_open(country_db, cache)
                 self._country_file = country_db
 
+            country6_db = os.path.join(path, country or GEOIP_SETTINGS.get('GEOIP_COUNTRY6', 'GeoIPv6.dat'))
+            if os.path.isfile(country6_db):
+                self._country6 = GeoIP_open(country6_db, cache)
+                self._country6_file = country6_db
+
             city_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY', 'GeoLiteCity.dat'))
             if os.path.isfile(city_db):
                 self._city = GeoIP_open(city_db, cache)
                 self._city_file = city_db
+
+            city6_db = os.path.join(path, city or GEOIP_SETTINGS.get('GEOIP_CITY6', 'GeoLiteCityv6.dat'))
+            if os.path.isfile(city6_db):
+                self._city6 = GeoIP_open(city6_db, cache)
+                self._city6_file = city6_db
+
         elif os.path.isfile(path):
             # Otherwise, some detective work will be needed to figure
             # out whether the given database path is for the GeoIP country
@@ -126 +143 @@
     def __del__(self):
         # Cleaning any GeoIP file handles lying around.
         if self._country: GeoIP_delete(self._country)
+        if self._country6: GeoIP_delete(self._country6)
         if self._city: GeoIP_delete(self._city)
+        if self._city6: GeoIP_delete(self._city6)
 
     def _check_query(self, query, country=False, city=False, city_or_country=False):
         "Helper routine for checking the query and database availability."
@@ -158 +177 @@
         if ipv4_re.match(query):
             # If an IP address was passed in
             return GeoIP_record_by_addr(self._city, c_char_p(query))
+        elif is_valid_ipv6_address(query) and self._city6:
+            # If an IPv6 address was passed in
+            return GeoIP_record_by_addr_v6(self._city6, c_char_p(query))
         else:
             # If a FQDN was passed in.
             return GeoIP_record_by_name(self._city, c_char_p(query))
@@ -165 +187 @@
     def country_code(self, query):
         "Returns the country code for the given IP Address or FQDN."
         query = self._check_query(query, city_or_country=True)
-        if self._country:
+        if self._country6 and is_valid_ipv6_address(query):
+            return GeoIP_country_code_by_addr_v6(self._country6, query)
+        elif self._country:
             if ipv4_re.match(query):
                 return GeoIP_country_code_by_addr(self._country, query)
             else:
@@ -176 +200 @@
     def country_name(self, query):
         "Returns the country name for the given IP Address or FQDN."
         query = self._check_query(query, city_or_country=True)
-        if self._country:
+        if self._country6 and is_valid_ipv6_address(query):
+            return GeoIP_country_name_by_addr_v6(self._country6, query)
+        elif self._country:
             if ipv4_re.match(query):
                 return GeoIP_country_name_by_addr(self._country, query)
             else:

django/contrib/gis/geoip/prototypes.py

@@ -73 +73 @@
     return func
 GeoIP_record_by_addr = record_output(lgeoip.GeoIP_record_by_addr)
 GeoIP_record_by_name = record_output(lgeoip.GeoIP_record_by_name)
-
+GeoIP_record_by_addr_v6 = record_output(lgeoip.GeoIP_record_by_addr_v6) 
 
 # For opening & closing GeoIP database files.
 GeoIP_open = lgeoip.GeoIP_open
@@ -106 +106 @@
 GeoIP_country_code_by_addr = string_output(lgeoip.GeoIP_country_code_by_addr)
 GeoIP_country_code_by_name = string_output(lgeoip.GeoIP_country_code_by_name)
 GeoIP_country_name_by_addr = string_output(lgeoip.GeoIP_country_name_by_addr)
+GeoIP_country_code_by_addr_v6 = string_output(lgeoip.GeoIP_country_code_by_addr_v6)
+GeoIP_country_name_by_addr_v6 = string_output(lgeoip.GeoIP_country_name_by_addr_v6)
 GeoIP_country_name_by_name = string_output(lgeoip.GeoIP_country_name_by_name)

django/contrib/gis/geoip/tests.py

@@ -105 +105 @@
         d = g.city('62.224.93.23')
         self.assertEqual('Schümberg', d['city'])
 
+    def test07_ipv6_query(self):
+        "Testing that GeoIP can lookup ipv6 addresses."
+        g = GeoIP()
+        d = g.city('2a03:2880:2110:3f01:face:b00c::')
+        self.assertNotEqual(d, None)
+
     def test06_unicode_query(self):
         "Testing that GeoIP accepts unicode string queries, see #17059."
         g = GeoIP()