Merge pull request #283 from mjtamlyn/ipv6-address-validation

Fixed #18779 -- URLValidator can't validate url with ipv6.
django · Aug 18, 2012 · e41c308 · e41c308
2 parents 16ab519 + bfa9fc6
commit e41c308
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/django/core/validators.py b/django/core/validators.py
@@ -44,7 +44,8 @@ class URLValidator(RegexValidator):
         r'^(?:http|ftp)s?://' # http:// or https://
         r'(?:(?:[A-Z0-9](?:[A-Z0-9-]{0,61}[A-Z0-9])?\.)+(?:[A-Z]{2,6}\.?|[A-Z0-9-]{2,}\.?)|' #domain...
         r'localhost|' #localhost...
-        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' # ...or ip
+        r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}|' # ...or ipv4
+        r'\[?[A-F0-9]*:[A-F0-9:]+\]?)' # ...or ipv6
         r'(?::\d+)?' # optional port
         r'(?:/?|[/?]\S+)$', re.IGNORECASE)
 

diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py
@@ -668,6 +668,18 @@ def test_urlfield_9(self):
             # Valid IDN
             self.assertEqual(url, f.clean(url))
 
+    def test_urlfield_10(self):
+        """Test URLField correctly validates IPv6 (#18779)."""
+        f = URLField()
+        urls = (
+            'http://::/',
+            'http://6:21b4:92/',
+            'http://[12:34:3a53]/',
+            'http://[a34:9238::]:8080/',
+        )
+        for url in urls:
+            self.assertEqual(url, f.clean(url))
+
     def test_urlfield_not_string(self):
         f = URLField(required=False)
         self.assertRaisesMessage(ValidationError, "'Enter a valid URL.'", f.clean, 23)