Commit 06627ef2 authored by Dheerendra Rathor's avatar Dheerendra Rathor Committed by Tim Graham
Browse files

Fixed #25635 -- Made URLValidator allow '+' in scheme.

parent 5ce84b80

django/core/validators.py

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class URLValidator(RegexValidator): 
    host_re = '(' + hostname_re + domain_re + tld_re + '|localhost)'



    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'(?:' + ipv4_re + '|' + ipv6_re + '|' + host_re + ')'

        r'(?::\d{2,5})?'  # port

tests/validators/tests.py

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ from django.test.utils import str_prefix 
from django.utils._os import upath



NOW = datetime.now()

EXTENDED_SCHEMES = ['http', 'https', 'ftp', 'ftps', 'git', 'file']

EXTENDED_SCHEMES = ['http', 'https', 'ftp', 'ftps', 'git', 'file', 'git+ssh']



TEST_DATA = [

    # (validator, value, expected),
@@ -205,6 +205,7 @@ TEST_DATA = [ 


    (URLValidator(EXTENDED_SCHEMES), 'file://localhost/path', None),

    (URLValidator(EXTENDED_SCHEMES), 'git://example.com/', None),

    (URLValidator(EXTENDED_SCHEMES), 'git+ssh://git@github.com/example/hg-git.git', None),



    (URLValidator(EXTENDED_SCHEMES), 'git://-invalid.com', ValidationError),

    # Trailing newlines not accepted