X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4477123de1254afa80243f7f9eab62c5cbf7b786..467acacf99ab52ad53af0fc9e95b5be4ca304ea8:/modules/subtext.py diff --git a/modules/subtext.py b/modules/subtext.py index 3290050..88a2368 100644 --- a/modules/subtext.py +++ b/modules/subtext.py @@ -1,6 +1,7 @@ # Erebus IRC bot - Author: Erebus Team # vim: fileencoding=utf-8 # module for 's/regex/replacement/' style correction +# warning: arbitrary regex's are generally capable of various DoS attacks on CPU/memory usage. use with caution. # see for usage examples: https://github.com/zonidjan/erebus/commit/d7e9802778477f1faa26a03078cb1b3c018a5e5c # This file is released into the public domain; see http://unlicense.org/ @@ -22,7 +23,7 @@ modstop = lib.modstop # module code import re from collections import namedtuple -re_findsub = re.compile(r"s(.)(?P[^\1]+)\1(?P[^\1]+)\1(?Pg)?;?") +re_findsub = re.compile(r"""s([/'";:!@#$%^&-_=`~])(?P.+?)\1(?P.+?)(?:\1(?Pg)?|$)""") Line = namedtuple('Line', ['sender', 'msg']) lastline = {} @lib.hooknum("PRIVMSG")