mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #35091 -- Allowed GeoIP2 querying using IPv4Address/IPv6Address.

Browse Source
This commit is contained in:
Nick Pope
2024-01-07 07:15:40 +00:00
committed by GitHub
parent 53fc6ac649
commit cc56c22a24
4 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
django/contrib/gis/geoip2.py
View File

@@ -12,6 +12,7 @@ Grab GeoLite2-Country.mmdb.gz and GeoLite2-City.mmdb.gz, and unzip them in the
directory corresponding to settings.GEOIP_PATH.
"""
import ipaddress
import socket
import warnings
@@ -172,10 +173,10 @@ class GeoIP2:
def _check_query(self, query, city=False, city_or_country=False):
"Check the query and database availability."
# Making sure a string was passed in for the query.
if not isinstance(query, str):
if not isinstance(query, (str, ipaddress.IPv4Address, ipaddress.IPv6Address)):
raise TypeError(
"GeoIP query must be a string, not type %s" % type(query).__name__
"GeoIP query must be a string or instance of IPv4Address or "
"IPv6Address, not type %s" % type(query).__name__,
)
# Extra checks for the existence of country and city databases.