innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #31548 -- Fixed URLValidator crash on non-strings.

This commit is contained in:
Yash Saini 2020-05-08 14:34:08 +05:30 committed by Mariusz Felisiak
parent bda6ade7b7
commit ccb1cfb64e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/core/validators.py
View File

@ -97,7 +97,9 @@ class URLValidator(RegexValidator):
self.schemes = schemes self.schemes = schemes
def __call__(self, value): def __call__(self, value):
# Check first if the scheme is valid if not isinstance(value, str):
raise ValidationError(self.message, code=self.code)
# Check if the scheme is valid.
scheme = value.split('://')[0].lower() scheme = value.split('://')[0].lower()
if scheme not in self.schemes: if scheme not in self.schemes:
raise ValidationError(self.message, code=self.code) raise ValidationError(self.message, code=self.code)

2
tests/validators/tests.py
View File

@ -222,6 +222,8 @@ TEST_DATA = [
(URLValidator(EXTENDED_SCHEMES), 'git+ssh://git@github.com/example/hg-git.git', None), (URLValidator(EXTENDED_SCHEMES), 'git+ssh://git@github.com/example/hg-git.git', None),
(URLValidator(EXTENDED_SCHEMES), 'git://-invalid.com', ValidationError), (URLValidator(EXTENDED_SCHEMES), 'git://-invalid.com', ValidationError),
(URLValidator(), None, ValidationError),
(URLValidator(), 56, ValidationError),
(URLValidator(), 'no_scheme', ValidationError), (URLValidator(), 'no_scheme', ValidationError),
# Trailing newlines not accepted # Trailing newlines not accepted
(URLValidator(), 'http://www.djangoproject.com/\n', ValidationError), (URLValidator(), 'http://www.djangoproject.com/\n', ValidationError),