github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 15:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add is_subdomain helper for proper subdomain checking.

Browse Source
This commit is contained in:
Max Goodman
2011-10-17 12:28:50 -07:00
parent 23b268b849
commit 60ac992522
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
r2/r2/lib/utils/utils.py
View File

@@ -52,8 +52,7 @@ def randstr(len, reallyrandom = False):
for i in range(len))
def is_authorized_cname(domain, cnames):
return any((domain == cname or domain.endswith('.' + cname))
for cname in cnames)
return any(is_subdomain(domain, cname) for cname in cnames)
class Storage(dict):
"""
@@ -212,6 +211,10 @@ def strip_www(domain):
else:
return domain
def is_subdomain(subdomain, base):
"""Check if a domain is equal to or a subdomain of a base domain."""
return subdomain == base or subdomain.endswith('.' + base)
r_base_url = re.compile("(?i)(?:.+?://)?(?:www[\d]*\.)?([^#]*[^#/])/?")
def base_url(url):
res = r_base_url.findall(url)
@@ -513,10 +516,10 @@ class UrlParser(object):
"""
from pylons import g
return (not self.hostname or
self.hostname.endswith(g.domain) or
is_subdomain(self.hostname, g.domain) or
is_authorized_cname(self.hostname, g.authorized_cnames) or
(subreddit and subreddit.domain and
self.hostname.endswith(subreddit.domain)))
is_subdomain(self.hostname, subreddit.domain)))
def path_add_subreddit(self, subreddit):
"""