Ticket #17751: 17751-2.diff

django/utils/ipv6.py

@@ -1 +1 @@
 # This code was mostly based on ipaddr-py
 # Copyright 2007 Google Inc. http://code.google.com/p/ipaddr-py/
 # Licensed under the Apache License, Version 2.0 (the "License").
+import string
+
 from django.core.exceptions import ValidationError
 from django.utils.six.moves import xrange
 
@@ -154 +156 @@
     """
     from django.core.validators import validate_ipv4_address
 
+    # No whitespaces allowed
+    if any(c in string.whitespace for c in ip_str):
+        return False
+
     # We need to have at least one ':'.
     if ':' not in ip_str:
         return False

tests/modeltests/validators/tests.py

@@ -67 +67 @@
     (validate_ipv4_address, '25.1.1.', ValidationError),
     (validate_ipv4_address, '25,1,1,1', ValidationError),
     (validate_ipv4_address, '25.1 .1.1', ValidationError),
+    (validate_ipv4_address, ' 1.1.1.1', ValidationError),
 
     # validate_ipv6_address uses django.utils.ipv6, which
     # is tested in much greater detail in it's own testcase
@@ -77 +78 @@
     (validate_ipv6_address, '1:2', ValidationError),
     (validate_ipv6_address, '::zzz', ValidationError),
     (validate_ipv6_address, '12345::', ValidationError),
+    (validate_ipv6_address, ' fe80::1', ValidationError),
+    (validate_ipv6_address, 'fe80       ::1', ValidationError),
 
     (validate_ipv46_address, '1.1.1.1', None),
     (validate_ipv46_address, '255.0.0.0', None),