CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Allow @ in urls

Browse Source 
(imported from commit cb2ffe4a8f050e732bb06ab4609997be35577417)
This commit is contained in:
Leo Franchi 2013-03-29 15:17:33 -04:00 committed by Keegan McAllister
parent d127d6f19f
commit a5643efa14
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zephyr/lib/bugdown/__init__.py
View File

@ -239,9 +239,10 @@ class Emoji(markdown.inlinepatterns.Pattern):
return orig_syntax
return make_emoji(name, orig_syntax)
def fixup_link(link):
def fixup_link(link, target_blank=True):
"""Set certain attributes we want on every link."""
link.set('target', '_blank')
if target_blank:
link.set('target', '_blank')
link.set('title', link.get('href'))
@ -257,6 +258,11 @@ def sanitize_url(url):
# Bad url - so bad it couldn't be parsed.
return ''
# If there is no scheme or netloc and there is a '@' in the path,
# treat it as a mailto: and set the appropriate scheme
if scheme == '' and netloc == '' and '@' in path:
scheme = 'mailto'
# Humbug modification: If scheme is not specified, assume http://
# It's unlikely that users want relative links within humbughq.com.
# We re-enter sanitize_url because netloc etc. need to be re-parsed.
@ -287,23 +293,19 @@ def sanitize_url(url):
# the colon check, which would also forbid a lot of legitimate URLs.
# Url passes all tests. Return url as-is.
return urlparse.urlunparse(parts)
return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))
def url_to_a(url):
a = markdown.util.etree.Element('a')
if '@' in url:
href = 'mailto:' + url
else:
href = url
href = sanitize_url(href)
href = sanitize_url(url)
if href is None:
# Rejected by sanitize_url; render it as plain text.
return url
a.set('href', href)
a.text = url
fixup_link(a)
fixup_link(a, not 'mailto:' in href[:7])
return a
class AutoLink(markdown.inlinepatterns.Pattern):

11
zephyr/tests.py
View File

@ -2016,6 +2016,8 @@ int x = 3
'http://web.archive.org/web/20120630032016/http://web.mit.edu/mitcard/idpolicies.html'),
('https://www.dropbox.com/sh/7d0ved3h5kf7dj8/_aD5_ceDFY?lst#f:Humbug-062-subscriptions-page-3rd-ver.fw.png',
'<p>%s</p>', 'https://www.dropbox.com/sh/7d0ved3h5kf7dj8/_aD5_ceDFY?lst#f:Humbug-062-subscriptions-page-3rd-ver.fw.png'),
('http://www.postgresql.org/message-id/14040.1364490185@sss.pgh.pa.us', '<p>%s</p>',
'http://www.postgresql.org/message-id/14040.1364490185@sss.pgh.pa.us'),
# XSS sanitization; URL is rendered as plain text
('javascript:alert(\'hi\');.com', "<p>javascript:alert('hi');.com</p>", ''),
@ -2039,8 +2041,7 @@ int x = 3
'<p>[foo](javascript:&lt;i&gt;"foo&amp;bar"&lt;/i&gt;)</p>', ''),
# Emails
('Sent to othello@humbughq.com', "<p>Sent to %s</p>", 'othello@humbughq.com'),
#('http://leo@foo.com/my/file', "<p>http://leo@foo.com/my/file</p>", ''), #broken for now
('http://leo@foo.com/my/file', "<p>%s</p>", 'http://leo@foo.com/my/file'),
('http://example.com/something?with,commas,in,url, but not at end',
"<p>%s, but not at end</p>", 'http://example.com/something?with,commas,in,url'),
@ -2076,7 +2077,11 @@ NY-Haskell/events/108707682/?a=co1.1_grp&amp;rv=co1.1\">Haskell NYC Meetup</a></
"http://htmlpreview.github.com/?https://github.com/becdot/jsset/index.html">link</a></p>'),
('[YOLO](http://en.wikipedia.org/wiki/YOLO_(motto))',
'<p><a href="http://en.wikipedia.org/wiki/YOLO_(motto)" target="_blank" title="http://en.wikipedia.org/wiki/YOLO_(motto)"\
>YOLO</a></p>')
>YOLO</a></p>'),
('Sent to http_something_real@humbughq.com', '<p>Sent to <a href="mailto:http_something_real@humbughq.com" \
title="mailto:http_something_real@humbughq.com">http_something_real@humbughq.com</a></p>'),
('Sent to othello@humbughq.com', '<p>Sent to <a href="mailto:othello@humbughq.com" title="mailto:othello@humbughq.com">\
othello@humbughq.com</a></p>')
)
for input, output in urls: