Add more URL patterns to make sure only valid URLs are matched

Author: linuxdaemon

plugins/link_announcer.py

@@ -7,6 +7,16 @@
 from cloudbot import hook
 from cloudbot.hook import Priority, Action
 
+ENCODED_CHAR = r"%[A-F0-9]{2}"
+PATH_SEG_CHARS = r"[A-Za-z0-9!$&'*-.:;=@_~\u00A0-\U0010FFFD]|" + ENCODED_CHAR
+QUERY_CHARS = PATH_SEG_CHARS + r"|/"
+FRAG_CHARS = QUERY_CHARS
+
+
+def no_parens(pattern):
+    return r"{0}|\(({0}|[\(\)])*\)".format(pattern)
+
+
 # This will match any URL, blacklist removed and abstracted to a priority/halting system
 url_re = re.compile(
     r"""
@@ -30,11 +40,11 @@
     
     (?::\d*)?  # port
     
-    (?:/(?:[A-Za-z0-9!$&-.:;=@_~\u00A0-\U0010FFFD]|%[A-F0-9]{2})*)*  # Path segment
+    (?:/(?:""" + no_parens(PATH_SEG_CHARS) + r""")*)*(?<![.,?!\]])  # Path segment
     
-    (?:\?(?:[A-Za-z0-9!$&-;=@_~\u00A0-\U0010FFFD]|%[A-F0-9]{2})*)?  # Query
+    (?:\?(?:""" + no_parens(QUERY_CHARS) + r""")*(?<![.,?!\]]))?  # Query
     
-    (?:\#(?:[A-Za-z0-9!$&-;=@_~\u00A0-\U0010FFFD]|%[A-F0-9]{2})*)?  # Fragment
+    (?:\#(?:""" + no_parens(FRAG_CHARS) + r""")*(?<![.,?!\]]))?  # Fragment
     """,
     re.IGNORECASE | re.VERBOSE
 )

tests/plugin_tests/test_link_announcer.py

@@ -31,6 +31,8 @@
 
 FAILS = (
     "http://",
+    "http://.",
+    "http://..",
     "http://?",
     "http://??",
     "http://??/",
@@ -50,6 +52,9 @@
     ":// should fail",
     "http://foo.bar/foo(bar)baz quux",
     "ftps://foo.bar/",
+    "https://foo.bar/baz.ext)",
+    "https://foo.bar/test.",
+    "https://foo.bar/test(test",
 )
 
 SEARCH = (