github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-11 07:04:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

set_subreddit: Protect against IDNA encoding errors.

Browse Source
This commit is contained in:
Ricky Ramirez
2013-11-14 10:35:01 -08:00
committed by Brian Simpson
parent c827dea143
commit 1f4682ce8a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
r2/r2/controllers/reddit_base.py
View File

@@ -392,9 +392,12 @@ def set_subreddit():
#if we didn't find a subreddit, check for a domain listing
if not sr_name and isinstance(c.site, DefaultSR) and domain:
# Redirect IDN to their IDNA name if necessary
idna = _force_unicode(domain).encode("idna")
if idna != domain:
redirect_to("/domain/%s%s" % (idna, request.environ["PATH_INFO"]))
try:
idna = _force_unicode(domain).encode("idna")
if idna != domain:
redirect_to("/domain/%s%s" % (idna, request.environ["PATH_INFO"]))
except UnicodeError:
domain = '' # Ensure valid_ascii_domain fails
if not c.error_page and not valid_ascii_domain.match(domain):
abort(404)
c.site = DomainSR(domain)