Fixes OpenToAllCTF#204 Change regex to capture complete URL

r00tdaemon · Jun 6, 2019 · bab4af2 · bab4af2
1 parent 40b4bb8
commit bab4af2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/handlers/linksave_handler.py b/handlers/linksave_handler.py
@@ -29,7 +29,8 @@ def execute(cls, slack_wrapper, args, timestamp, channel_id, user_id, user_is_ad
 
         message = slack_wrapper.get_message(channel_id, timestamp)["messages"][0]["text"]
         profile_details = slack_wrapper.get_member(user_id)["user"]["profile"]
-        url_regex = "((https?):\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?"
+        # http://www.noah.org/wiki/RegEx_Python#URL_regex_pattern
+        url_regex = "http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+"
         url = re.search(url_regex, message)
 
         if not url: