Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-23 11:09:23 +01:00
Code Issues Projects Releases Wiki Activity

Alias: correct unescaping of alias names when creating registry entries in Alias.__init__

Browse Source 
Only a problem when the rules on allowed alias names were relaxed, in which case backslashes were duplicated
every time the bot restarted.

Also factor out '.' and '|' checks into needsEscaping function
This commit is contained in:
jacksonmj 2015-08-22 09:46:56 +00:00
parent 711572b5b2
commit fd53d8c410
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/Alias/plugin.py
View File

@ -102,9 +102,12 @@ def findBiggestAt(alias):
else: else:
return 0 return 0
def needsEscaping(alias):
return '.' in alias or '|' in alias
def escapeAlias(alias): def escapeAlias(alias):
"""Encodes [a-z0-9.]+ into [a-z][a-z0-9]. """Encodes dots and pipes
Format: a<number of escaped chars>a(<index>d)+<word without dots>.""" Format: a<number of escaped chars>a(<index>(d|p))+<word without dots or pipes>."""
prefix = '' prefix = ''
new_alias = '' new_alias = ''
prefixes = 0 prefixes = 0
@ -242,19 +245,19 @@ class Alias(callbacks.Plugin):
# XXX This should go. aliases should be a space separate list, etc. # XXX This should go. aliases should be a space separate list, etc.
group = conf.supybot.plugins.Alias.aliases group = conf.supybot.plugins.Alias.aliases
group2 = conf.supybot.plugins.Alias.escapedaliases group2 = conf.supybot.plugins.Alias.escapedaliases
prefixLen = len(registry.split('supybot.plugins.alias.aliases'))
for (name, alias) in registry._cache.items(): for (name, alias) in registry._cache.items():
name = name.lower() name = name.lower()
if name.startswith('supybot.plugins.alias.aliases.'): nameSplit = registry.split(name)
name = name[len('supybot.plugins.alias.aliases.'):] if len(nameSplit) > prefixLen+1:
if '.' in name:
continue continue
if name.startswith('supybot.plugins.alias.aliases.'):
name = nameSplit[-1]
conf.registerGlobalValue(group, name, registry.String('', '')) conf.registerGlobalValue(group, name, registry.String('', ''))
conf.registerGlobalValue(group.get(name), 'locked', conf.registerGlobalValue(group.get(name), 'locked',
registry.Boolean(False, '')) registry.Boolean(False, ''))
elif name.startswith('supybot.plugins.alias.escapedaliases.'): elif name.startswith('supybot.plugins.alias.escapedaliases.'):
name = name[len('supybot.plugins.alias.escapedaliases.'):] name = nameSplit[-1]
if '.' in name:
continue
conf.registerGlobalValue(group2, name, conf.registerGlobalValue(group2, name,
registry.String('', '')) registry.String('', ''))
conf.registerGlobalValue(group2.get(name), conf.registerGlobalValue(group2.get(name),
@ -355,7 +358,7 @@ class Alias(callbacks.Plugin):
raise AliasError(format('Alias %q is locked.', name)) raise AliasError(format('Alias %q is locked.', name))
f = makeNewAlias(name, alias) f = makeNewAlias(name, alias)
f = types.MethodType(f, self) f = types.MethodType(f, self)
if '.' in name or '|' in name: if needsEscaping(name):
aliasGroup = self.registryValue('escapedaliases', value=False) aliasGroup = self.registryValue('escapedaliases', value=False)
confname = escapeAlias(name) confname = escapeAlias(name)
else: else:
@ -375,7 +378,7 @@ class Alias(callbacks.Plugin):
if name in self.aliases and self.isCommandMethod(name): if name in self.aliases and self.isCommandMethod(name):
if evenIfLocked or not self.aliases[name][1]: if evenIfLocked or not self.aliases[name][1]:
del self.aliases[name] del self.aliases[name]
if '.' in name or '|' in name: if needsEscaping(name):
conf.supybot.plugins.Alias.escapedaliases.unregister( conf.supybot.plugins.Alias.escapedaliases.unregister(
escapeAlias(name)) escapeAlias(name))
else: else: