diff options
| author | Christopher Grebs <cg@webshox.org> | 2016-01-22 05:33:34 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2016-06-28 15:44:07 -0400 |
| commit | 712838a53d03fd6644da8bce4c3a7b2e19f56df2 (patch) | |
| tree | 60a034f15fb5e8d9024d1bf481f7a195d22dc53c | |
| parent | 87584a0af162aa6c84ef40613fdab090e970bf20 (diff) | |
[1.10.x] Fixed #26119 -- Fixed URLValidator crash on URLs with brackets.
Backport of a9e188ccd6315d278795355a53bce6c1a63f5a50 from master
| -rw-r--r-- | django/core/validators.py | 5 | ||||
| -rw-r--r-- | tests/validators/invalid_urls.txt | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/django/core/validators.py b/django/core/validators.py index 57e8d6e054..3c731f1459 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -124,7 +124,10 @@ class URLValidator(RegexValidator): except ValidationError as e: # Trivial case failed. Try for possible IDN domain if value: - scheme, netloc, path, query, fragment = urlsplit(value) + try: + scheme, netloc, path, query, fragment = urlsplit(value) + except ValueError: # for example, "Invalid IPv6 URL" + raise ValidationError(self.message, code=self.code) try: netloc = netloc.encode('idna').decode('ascii') # IDN -> ACE except UnicodeError: # invalid domain part diff --git a/tests/validators/invalid_urls.txt b/tests/validators/invalid_urls.txt index 701dc991ed..04a0b5fb1b 100644 --- a/tests/validators/invalid_urls.txt +++ b/tests/validators/invalid_urls.txt @@ -56,3 +56,4 @@ http://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.example. http://example.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.com http://example.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa http://aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.aaaaaaaaaaaaaaaaaaaaaaaaa +https://test.[com |