mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #12989 - Fixed verification of IDN URLs. Thanks to Fraser Nevett for the report and patch.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2010-02-28 12:01:18 +00:00
parent d7abb33e70
commit 68f216a692
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
django/core/validators.py
View File

@@ -58,23 +58,18 @@ class URLValidator(RegexValidator):
except ValidationError, e:
# Trivial case failed. Try for possible IDN domain
if value:
original = value
value = smart_unicode(value)
splitted = urlparse.urlsplit(value)
scheme, netloc, path, query, fragment = urlparse.urlsplit(value)
try:
netloc_ace = splitted[1].encode('idna') # IDN -> ACE
netloc = netloc.encode('idna') # IDN -> ACE
except UnicodeError: # invalid domain part
raise e
value = value.replace(splitted[1], netloc_ace)
# If no URL path given, assume /
if not splitted[2]:
value += u'/'
super(URLValidator, self).__call__(value)
# After validation revert ACE encoded domain-part to
# original (IDN) value as suggested by RFC 3490
value = original
url = urlparse.urlunsplit((scheme, netloc, path, query, fragment))
super(URLValidator, self).__call__(url)
else:
raise
else:
url = value
if self.verify_exists:
import urllib2
@@ -86,7 +81,7 @@ class URLValidator(RegexValidator):
"User-Agent": self.user_agent,
}
try:
req = urllib2.Request(value, None, headers)
req = urllib2.Request(url, None, headers)
u = urllib2.urlopen(req)
except ValueError:
raise ValidationError(_(u'Enter a valid URL.'), code='invalid')