Ticket #26378: 26378.diff

django/db/models/fields/__init__.py

@@ -18 +18 @@
 # When the _meta object was formalized, this exception was moved to
 # django.core.exceptions. It is retained here for backwards compatibility
 # purposes.
-from django.core.exceptions import FieldDoesNotExist  # NOQA
+from django.core.exceptions import FieldDoesNotExist, ValidationError  # NOQA
 from django.db import connection, connections, router
 from django.db.models.query_utils import QueryWrapper, RegisterLookupMixin
 from django.utils import six, timezone
@@ -1994 +1994 @@
         if not isinstance(value, six.string_types):
             value = force_text(value)
         value = value.strip()
+        if not self.unpack_ipv4 and ':' in value and '.' in value:
+            raise ValidationError(_('Mixed IPv4 and IPv6 representation is not allowed when unpack_ipv4 is disabled'),
+                                  code='invalid')
         if ':' in value:
             return clean_ipv6_address(value,
                 self.unpack_ipv4, self.error_messages['invalid'])

tests/model_fields/tests.py

@@ -904 +904 @@
         with self.assertRaises(ValidationError):
             form_field.clean('127.0.0.1')
 
+    def test_genericipaddressfield_formfield_unpack_ipv4(self):
+        """
+        Test that GenericIPAddressField will reject a mixed IPv4 and IPv6 IP adress if unpack_ipv4=False.
+        See #26378
+        """
+        unpack_ip_field = models.GenericIPAddressField(null=False, protocol='both', unpack_ipv4=True)
+        not_unpack_ip_field = models.GenericIPAddressField(protocol='both', unpack_ipv4=False)
+        unpack_ip_field.clean('::ffff:0.0.0.0', None)
+        with self.assertRaises(ValidationError):
+            not_unpack_ip_field.clean('::ffff:0.0.0.0', None)
+        with self.assertRaises(ValidationError):
+            not_unpack_ip_field.clean('::ffff:2.0.0.0', None)
+
     def test_null_value(self):
         """
         Null values should be resolved to None in Python (#24078).