Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 14:40:51 +01:00
Code Issues Projects Releases Wiki Activity

Aka: Prevent infinite loop (+ memory bomb) when nesting Akas using $*.

Browse Source
This commit is contained in:
Valentin Lorentz 2013-08-08 14:11:44 +02:00
parent f8bfb03dee
commit 23dfa23f31
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/Aka/plugin.py
View File

@ -298,14 +298,17 @@ class Aka(callbacks.Plugin):
replace(tokens, lambda s: atRe.sub(regexpReplace, s)) replace(tokens, lambda s: atRe.sub(regexpReplace, s))
if wildcard: if wildcard:
def everythingReplace(tokens): def everythingReplace(tokens):
new_tokens = []
for (i, token) in enumerate(tokens): for (i, token) in enumerate(tokens):
if isinstance(token, list): if isinstance(token, list):
if everythingReplace(token): if everythingReplace(token):
return return
if token == '$*': if token == '$*':
tokens[i:i+1] = args new_tokens.extend(args)
elif '$*' in token: else:
tokens[i] = token.replace('$*', ' '.join(args)) new_tokens.append(
token.replace('$*', ' '.join(args)))
tokens[:] = new_tokens
return False return False
everythingReplace(tokens) everythingReplace(tokens)
self.Proxy(irc, msg, tokens) self.Proxy(irc, msg, tokens)

6
plugins/Aka/test.py
View File

@ -157,6 +157,10 @@ class AkaChannelTestCase(ChannelPluginTestCase):
self.assertResponse('fact 4', '24') self.assertResponse('fact 4', '24')
self.assertRegexp('fact 50', 'more nesting') self.assertRegexp('fact 50', 'more nesting')
def testDollarStarNesting(self):
self.assertNotError('aka add alias aka $*')
self.assertNotError('alias add a+ aka add $*')
class AkaTestCase(PluginTestCase): class AkaTestCase(PluginTestCase):
plugins = ('Aka', 'Alias', 'User', 'Utilities') plugins = ('Aka', 'Alias', 'User', 'Utilities')
@ -198,6 +202,4 @@ class AkaTestCase(PluginTestCase):
self.assertResponse('aka spam', 'egg') self.assertResponse('aka spam', 'egg')
# vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 softtabstop=4 expandtab textwidth=79: