diff options
| -rw-r--r-- | django/core/validators.py | 3 | ||||
| -rw-r--r-- | tests/regressiontests/forms/tests/fields.py | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/django/core/validators.py b/django/core/validators.py index 1a714c5472..934f7d1d77 100644 --- 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 index feb2ade458..6efdb9682f 100644 --- a/tests/regressiontests/forms/tests/fields.py +++ b/tests/regressiontests/forms/tests/fields.py @@ -668,6 +668,18 @@ class FieldsTests(SimpleTestCase): # 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) |