github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

toolbar: Match reddit subdomains due to framing restrictions.

Browse Source
This commit is contained in:
Max Goodman
2013-11-20 23:10:37 -08:00
parent e76936aae3
commit b2a4888496
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
r2/r2/controllers/toolbar.py
View File

@@ -62,6 +62,16 @@ def demangle_url(path):
return path
def match_current_reddit_subdomain(url):
# due to X-Frame-Options: SAMEORIGIN headers, we can't frame mismatched
# reddit subdomains
parsed = UrlParser(url)
if parsed.is_reddit_url():
parsed.hostname = request.host
return parsed.unparse()
else:
return url
def force_html():
"""Because we can take URIs like /s/http://.../foo.png, and we can
guarantee that the toolbar will never be used with a non-HTML
@@ -120,10 +130,12 @@ class ToolbarController(RedditController):
else:
thumbnail = None
res = Frame(title = link.title,
url = link.url,
thumbnail = thumbnail,
fullname = link._fullname)
res = Frame(
title=link.title,
url=match_current_reddit_subdomain(link.url),
thumbnail=thumbnail,
fullname=link._fullname,
)
return spaceCompress(res.render())
def GET_s(self, rest):
@@ -170,7 +182,10 @@ class ToolbarController(RedditController):
return self.redirect(add_sr("/tb/" + link._id36))
title = utils.domain(path)
res = Frame(title = title, url = path)
res = Frame(
title=title,
url=match_current_reddit_subdomain(path),
)
# we don't want clients to think that this URL is actually a
# valid URL for search-indexing or the like
@@ -241,7 +256,11 @@ class ToolbarController(RedditController):
if not link:
return self.abort404()
res = InnerToolbarFrame(link = link, expanded = auto_expand_panel(link))
res = InnerToolbarFrame(
link=link,
url=match_current_reddit_subdomain(link.url),
expanded=auto_expand_panel(link),
)
return spaceCompress(res.render())
@validate(link = VLink('linkoid'))

4
r2/r2/lib/pages/pages.py
View File

@@ -4064,8 +4064,8 @@ class PromoteReport(Templated):
self.campaign_report = sorted(campaign_report, key=lambda r: r['link'])
class InnerToolbarFrame(Templated):
def __init__(self, link, expanded = False):
Templated.__init__(self, link = link, expanded = expanded)
def __init__(self, link, url, expanded=False):
Templated.__init__(self, link=link, url=url, expanded=expanded)
class RawString(Templated):
def __init__(self, s):

2
r2/r2/templates/innertoolbarframe.html
View File

@@ -37,6 +37,6 @@
</head>
<body class="${'expanded' if thing.expanded else ''}" id="inner_toolbar" onload="window.frames[1].focus()">
<iframe frameborder="0" src="${add_sr('/toolbar/comments/'+thing.link._id36)}" id="reddit_panel" name="reddit_panel"></iframe>
<iframe frameborder="0" src="${thing.link.url}" id="reddit_link" name="reddit_link" sandbox="allow-scripts allow-forms"></iframe>
<iframe frameborder="0" src="${thing.url}" id="reddit_link" name="reddit_link" sandbox="allow-scripts allow-forms"></iframe>
</body>
</html>