Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Alias: add hard-coded check that alias names are valid registry names

This commit is contained in:
jacksonmj 2015-08-22 13:18:19 +00:00
parent 4507771ce7
commit f5c66afe4f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Alias/plugin.py
View File

@ -319,10 +319,17 @@ class Alias(callbacks.Plugin):
group.unregister(name)
def setLocked(name, value):
def setLocked(self, name, value):
self.aliases[name][1] = value
self.aliasRegistryNode(name).locked.setValue(value)
def isValidName(self, name):
if not re.search(self.registryValue('validName'), name):
return False
if not registry.isValidRegistryName(name):
return False
return True
@internationalizeDocstring
def lock(self, irc, msg, args, name):
"""<alias>
@ -350,7 +357,7 @@ class Alias(callbacks.Plugin):
unlock = wrap(unlock, [('checkCapability', 'admin'), 'commandName'])
def addAlias(self, irc, name, alias, lock=False):
if not re.search(self.registryValue('validName'), name):
if not self.isValidName(name):
raise AliasError('Invalid alias name.')
realName = callbacks.canonicalName(name)
if name != realName: