Update dependency django-ipware to v7 (#935)

* Update dependency django-ipware to v7 * fixing is_private method --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: shankar ambady <[email protected]>
mitodl · May 21, 2024 · 6bbdf4a · 6bbdf4a
1 parent 9f07465
commit 6bbdf4a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/authentication/models.py b/authentication/models.py
@@ -5,7 +5,7 @@
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.utils.safestring import mark_safe
-from ipware.utils import is_private_ip
+from python_ipware import IpWare
 
 from main.models import TimestampedModel
 
@@ -40,11 +40,13 @@ class BlockedIPRange(TimestampedModel):
     ip_end = models.GenericIPAddressField(null=False, blank=False)
 
     def clean(self):
+        ipw = IpWare()
         for ip in (self.ip_start, self.ip_end):
             if ip is None:
                 msg = "IP cannot be null"
                 raise ValidationError(msg, code="invalid")
-            if is_private_ip(ip):
+            ipw_ip = ipw.parse_ip_address(ip)
+            if ipw_ip.is_private:
                 msg = f"IP {ip} is not routable"
                 raise ValidationError(msg, code="invalid")
         if ip_address(self.ip_start) > ip_address(self.ip_end):

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,7 +29,7 @@ django-filter = "^2.4.0"
 django-guardian = "^2.4.0"
 django-hijack = "^3.4.1"
 django-imagekit = "^5.0.0"
-django-ipware = "^3.0.7"
+django-ipware = "^7.0.0"
 django-json-widget = "^1.0.0"
 django-redis = "^5.2.0"
 django-server-status = "^0.7.0"