Fixed regular expression for FTP URL autolinking

0087740d · Dan Pascu · 36f16526 · 0087740d
Commit 0087740d authored Nov 25, 2016 by Dan Pascu
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

chatwindow.py blink/chatwindow.py +6 -1

No files found.
--- a/blink/chatwindow.py
+++ b/blink/chatwindow.py
@@ -2556,7 +2556,12 @@ class HtmlProcessor(object):
                                  (?:\?(?:[\w/%!$@#*&='~:;,.+-]*(?:\([\w/%!$@#*&='~:;,.+-]*\))?)*)?  # [ ? query]
                                )
                                """, re.I|re.U|re.X),
-                    re.compile(r"(?P<body>ftps?://(?:[^:@]+(?::[^@]*)?@)?(?P<host>[a-z0-9.-]+)(?::\d*)?(?:/(?:[\w/%!?$@*&='~:,.+-]*(?:\([\w/%!?$@*&='~:,.+-]*\))?)*(?:;type=[aid])?)?)", re.I|re.U),
+                    re.compile(r"""
+                                (?P<body>
+                                  ftps?://(?:[^:@/]+(?::[^@]*)?@)?(?P<host>[a-z0-9.-]+)(?::\d*)?                  # scheme :// [ user [ : password ] @ ] host [ : port ]
+                                  (?:/(?:[\w/%!?$@*&='~:,.+-]*(?:\([\w/%!?$@*&='~:,.+-]*\))?)*(?:;type=[aid])?)?  # [ / path [ ;type=a/i/d ] ]
+                                )
+                                """, re.I|re.U|re.X),
                    re.compile(r'mailto:(?P<body>[\w.-]+@(?P<host>[a-z0-9.-]+))', re.I|re.U)]
    @classmethod