fix linkify regex plus add unit test

diff --git a/tornado/escape.py b/tornado/escape.py
index 174c71cea355bbc11794eef967bb31fc88e80e06..306a13dfc915cda777861595eb742a4e3960d72a 100644 (file)
--- a/tornado/escape.py
+++ b/tornado/escape.py
@@ -95,9 +95,12 @@ def utf8(value):
     return value
 
 
-# Regex from http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-# Modified to capture protocol and to avoid HTML character entities other than &
-_URL_RE = re.compile(ur"""(?i)\b((?:([a-z][\w-]+):(?:(/{1,3})|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>&]+|&amp;|\(([^\s()<>&]+|(\([^\s()<>&]+\)))*\))+(?:\(([^\s()<>&]+|(\([^\s()<>&]+\)))*\)|[^\s`!()\[\]{};:'".,<>?\xab\xbb\u201c\u201d\u2018\u2019&]))""")
+# I originally used the regex from 
+# http://daringfireball.net/2010/07/improved_regex_for_matching_urls
+# but it gets all exponential on certain patterns (such as too many trailing
+# dots), causing the regex matcher to never return.
+# This regex should avoid those problems.
+_URL_RE = re.compile(ur"""\b((?:([\w-]+):(/{1,3})|www[.])(?:(?:(?:[^\s&()]|&amp;|&quot;)*(?:[^!"#$%&'()*+,.:;<=>?@\[\]^`{|}~\s]))|(?:\((?:[^\s&()]|&amp;|&quot;)*\)))+)""")
 
 
 def linkify(text, shorten=False, extra_params="",

diff --git a/tornado/test/escape_test.py b/tornado/test/escape_test.py
new file mode 100644 (file)
index 0000000..39f28e9
--- /dev/null
+++ b/tornado/test/escape_test.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env python
+
+import tornado.escape
+import unittest
+
+linkify_tests = [
+    # (input, linkify_kwargs, expected_output)
+
+    ("hello http://world.com/!", {},
+     u'hello <a href="http://world.com/">http://world.com/</a>!'),
+
+    ("hello http://world.com/with?param=true&stuff=yes", {},
+     u'hello <a href="http://world.com/with?param=true&amp;stuff=yes">http://world.com/with?param=true&amp;stuff=yes</a>'),
+
+    # an opened paren followed by many chars killed Gruber's regex
+    ("http://url.com/w(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", {},
+     u'<a href="http://url.com/w">http://url.com/w</a>(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'),
+
+    # as did too many dots at the end
+    ("http://url.com/withmany.......................................", {},
+     u'<a href="http://url.com/withmany">http://url.com/withmany</a>.......................................'),
+
+    ("http://url.com/withmany((((((((((((((((((((((((((((((((((a)", {},
+     u'<a href="http://url.com/withmany">http://url.com/withmany</a>((((((((((((((((((((((((((((((((((a)'),
+
+    # some examples from http://daringfireball.net/2009/11/liberal_regex_for_matching_urls
+    # plus a fex extras (such as multiple parentheses).
+    ("http://foo.com/blah_blah", {},
+     u'<a href="http://foo.com/blah_blah">http://foo.com/blah_blah</a>'),
+
+    ("http://foo.com/blah_blah/", {},
+     u'<a href="http://foo.com/blah_blah/">http://foo.com/blah_blah/</a>'),
+
+    ("(Something like http://foo.com/blah_blah)", {},
+     u'(Something like <a href="http://foo.com/blah_blah">http://foo.com/blah_blah</a>)'),
+
+    ("http://foo.com/blah_blah_(wikipedia)", {},
+     u'<a href="http://foo.com/blah_blah_(wikipedia)">http://foo.com/blah_blah_(wikipedia)</a>'),
+
+    ("http://foo.com/blah_(blah)_(wikipedia)_blah", {},
+     u'<a href="http://foo.com/blah_(blah)_(wikipedia)_blah">http://foo.com/blah_(blah)_(wikipedia)_blah</a>'),
+
+    ("(Something like http://foo.com/blah_blah_(wikipedia))", {},
+     u'(Something like <a href="http://foo.com/blah_blah_(wikipedia)">http://foo.com/blah_blah_(wikipedia)</a>)'),
+
+    ("http://foo.com/blah_blah.", {},
+     u'<a href="http://foo.com/blah_blah">http://foo.com/blah_blah</a>.'),
+
+    ("http://foo.com/blah_blah/.", {},
+     u'<a href="http://foo.com/blah_blah/">http://foo.com/blah_blah/</a>.'),
+
+    ("<http://foo.com/blah_blah>", {},
+     u'&lt;<a href="http://foo.com/blah_blah">http://foo.com/blah_blah</a>&gt;'),
+
+    ("<http://foo.com/blah_blah/>", {},
+     u'&lt;<a href="http://foo.com/blah_blah/">http://foo.com/blah_blah/</a>&gt;'),
+
+    ("http://foo.com/blah_blah,", {},
+     u'<a href="http://foo.com/blah_blah">http://foo.com/blah_blah</a>,'),
+
+    ("http://www.example.com/wpstyle/?p=364.", {},
+     u'<a href="http://www.example.com/wpstyle/?p=364">http://www.example.com/wpstyle/?p=364</a>.'),
+
+    ("rdar://1234", 
+     {"permitted_protocols": ["http", "rdar"]},
+     u'<a href="rdar://1234">rdar://1234</a>'),
+
+    ("rdar:/1234", 
+     {"permitted_protocols": ["rdar"]},
+     u'<a href="rdar:/1234">rdar:/1234</a>'),
+
+    ("http://userid:password@example.com:8080", {},
+     u'<a href="http://userid:password@example.com:8080">http://userid:password@example.com:8080</a>'),
+
+    ("http://userid@example.com", {},
+     u'<a href="http://userid@example.com">http://userid@example.com</a>'),
+
+    ("http://userid@example.com:8080", {},
+     u'<a href="http://userid@example.com:8080">http://userid@example.com:8080</a>'),
+
+    ("http://userid:password@example.com", {},
+     u'<a href="http://userid:password@example.com">http://userid:password@example.com</a>'),
+
+    ("message://%3c330e7f8409726r6a4ba78dkf1fd71420c1bf6ff@mail.gmail.com%3e",
+     {"permitted_protocols": ["http", "message"]},
+     u'<a href="message://%3c330e7f8409726r6a4ba78dkf1fd71420c1bf6ff@mail.gmail.com%3e">message://%3c330e7f8409726r6a4ba78dkf1fd71420c1bf6ff@mail.gmail.com%3e</a>'),
+
+    (u"http://\u27a1.ws/\u4a39", {},
+     u'<a href="http://\u27a1.ws/\u4a39">http://\u27a1.ws/\u4a39</a>'),
+
+    ("<tag>http://example.com</tag>", {},
+     u'&lt;tag&gt;<a href="http://example.com">http://example.com</a>&lt;/tag&gt;'),
+
+    ("Just a www.example.com link.", {},
+     u'Just a <a href="http://www.example.com">www.example.com</a> link.'),
+
+    ("Just a www.example.com link.", 
+     {"require_protocol": True},
+     u'Just a www.example.com link.'),
+
+    ("A http://reallylong.com/link/that/exceedsthelenglimit.html",
+     {"require_protocol": True, "shorten": True},
+     u'A <a href="http://reallylong.com/link/that/exceedsthelenglimit.html" title="http://reallylong.com/link/that/exceedsthelenglimit.html">http://reallylong.com/link...</a>'),
+
+    ("A http://reallylongdomainnamethatwillbetoolong.com/hi!",
+     {"shorten": True},
+     u'A <a href="http://reallylongdomainnamethatwillbetoolong.com/hi" title="http://reallylongdomainnamethatwillbetoolong.com/hi">http://reallylongdomainnametha...</a>!'),
+
+    ("A file:///passwords.txt and http://web.com link", {},
+     u'A file:///passwords.txt and <a href="http://web.com">http://web.com</a> link'),
+
+    ("A file:///passwords.txt and http://web.com link",
+     {"permitted_protocols": ["file"]},
+     u'A <a href="file:///passwords.txt">file:///passwords.txt</a> and http://web.com link'),
+
+    ("www.external-link.com",
+     {"extra_params": 'rel="nofollow" class="external"'},
+     u'<a href="http://www.external-link.com" rel="nofollow" class="external">www.external-link.com</a>'),
+]
+
+
+class EscapeTestCase(unittest.TestCase):
+    def test_linkify(self):
+        for text, kwargs, html in linkify_tests:
+            linked = tornado.escape.linkify(text, **kwargs)
+            self.assertEqual(linked, html)
+

diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py
index 1dedb6d1525128e4c1a05be70bbba3169ab08907..b19152ba7f2ad5a8ec5e56521bad283cc978e42e 100755 (executable)
--- a/tornado/test/runtests.py
+++ b/tornado/test/runtests.py
@@ -3,6 +3,7 @@ import unittest
 
 TEST_MODULES = [
     'tornado.httputil.doctests',
+    'tornado.test.escape_test',
     'tornado.test.httpserver_test',
     'tornado.test.ioloop_test',
     'tornado.test.iostream_test',