summaryrefslogtreecommitdiff
path: root/django/forms
diff options
context:
space:
mode:
authorMichael Manfre <mike@manfre.net>2024-12-11 21:39:32 -0500
committerNatalia <124304+nessita@users.noreply.github.com>2025-01-14 08:42:24 -0300
commitca2be7724e1244a4cb723de40a070f873c6e94bf (patch)
treea9a2fd0652af954413e06a578624a7fb91de1533 /django/forms
parent9a2dd9789a2edeed7344a8ec0d17142ad27443a1 (diff)
Fixed CVE-2024-56374 -- Mitigated potential DoS in IPv6 validation.
Thanks Saravana Kumar for the report, and Sarah Boyce and Mariusz Felisiak for the reviews. Co-authored-by: Natalia <124304+nessita@users.noreply.github.com>
Diffstat (limited to 'django/forms')
-rw-r--r--django/forms/fields.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/django/forms/fields.py b/django/forms/fields.py
index 1a58a60743..202a6d72c8 100644
--- a/django/forms/fields.py
+++ b/django/forms/fields.py
@@ -46,7 +46,7 @@ from django.utils.choices import normalize_choices
from django.utils.dateparse import parse_datetime, parse_duration
from django.utils.deprecation import RemovedInDjango60Warning
from django.utils.duration import duration_string
-from django.utils.ipv6 import clean_ipv6_address
+from django.utils.ipv6 import MAX_IPV6_ADDRESS_LENGTH, clean_ipv6_address
from django.utils.regex_helper import _lazy_re_compile
from django.utils.translation import gettext_lazy as _
from django.utils.translation import ngettext_lazy
@@ -1303,6 +1303,7 @@ class GenericIPAddressField(CharField):
self.default_validators = validators.ip_address_validators(
protocol, unpack_ipv4
)
+ kwargs.setdefault("max_length", MAX_IPV6_ADDRESS_LENGTH)
super().__init__(**kwargs)
def to_python(self, value):
@@ -1310,7 +1311,9 @@ class GenericIPAddressField(CharField):
return ""
value = value.strip()
if value and ":" in value:
- return clean_ipv6_address(value, self.unpack_ipv4)
+ return clean_ipv6_address(
+ value, self.unpack_ipv4, max_length=self.max_length
+ )
return value