p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #31311 -- Removed unneeded escapes in validator regexes. 

Special characters lose their special meaning inside sets of characters.

"-" lose its special meaning if it's placed as the first or last
character.
This commit is contained in:
kimbo 2020-02-26 11:09:22 -07:00 committed by Mariusz Felisiak
parent 984531f96e
commit 7c6b66383d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/core/validators.py
View File

@ -65,7 +65,7 @@ class URLValidator(RegexValidator):
# IP patterns # IP patterns
ipv4_re = r'(?:25[0-5]|2[0-4]\d|[0-1]?\d?\d)(?:\.(?:25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}' ipv4_re = r'(?:25[0-5]|2[0-4]\d|[0-1]?\d?\d)(?:\.(?:25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}'
ipv6_re = r'\[[0-9a-f:\.]+\]' # (simple regex, validated later) ipv6_re = r'\[[0-9a-f:.]+\]' # (simple regex, validated later)
# Host patterns # Host patterns
hostname_re = r'[a-z' + ul + r'0-9](?:[a-z' + ul + r'0-9-]{0,61}[a-z' + ul + r'0-9])?' hostname_re = r'[a-z' + ul + r'0-9](?:[a-z' + ul + r'0-9-]{0,61}[a-z' + ul + r'0-9])?'
@ -82,7 +82,7 @@ class URLValidator(RegexValidator):
host_re = '(' + hostname_re + domain_re + tld_re + '|localhost)' host_re = '(' + hostname_re + domain_re + tld_re + '|localhost)'
regex = _lazy_re_compile( regex = _lazy_re_compile(
r'^(?:[a-z0-9\.\-\+]*)://' # scheme is validated separately r'^(?:[a-z0-9.+-]*)://' # scheme is validated separately
r'(?:[^\s:@/]+(?::[^\s:@/]*)?@)?' # user:pass authentication r'(?:[^\s:@/]+(?::[^\s:@/]*)?@)?' # user:pass authentication
r'(?:' + ipv4_re + '|' + ipv6_re + '|' + host_re + ')' r'(?:' + ipv4_re + '|' + ipv6_re + '|' + host_re + ')'
r'(?::\d{2,5})?' # port r'(?::\d{2,5})?' # port
@ -163,7 +163,7 @@ class EmailValidator:
re.IGNORECASE) re.IGNORECASE)
literal_regex = _lazy_re_compile( literal_regex = _lazy_re_compile(
# literal form, ipv4 or ipv6 address (SMTP 4.1.3) # literal form, ipv4 or ipv6 address (SMTP 4.1.3)
r'\[([A-f0-9:\.]+)\]\Z', r'\[([A-f0-9:.]+)\]\Z',
re.IGNORECASE) re.IGNORECASE)
domain_whitelist = ['localhost'] domain_whitelist = ['localhost']