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

Prevent the 'hostmask' converter from returning '*!*@*' while 'foo!*@*' was given.

Browse Source
This commit is contained in:
Valentin Lorentz 2011-12-27 11:55:50 +01:00 committed by James McCoy
parent 8ab33bccb4
commit b7bc11deea
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Channel/test.py
View File

@ -205,11 +205,19 @@ class ChannelTestCase(ChannelPluginTestCase):
def testIgnore(self): def testIgnore(self):
orig = conf.supybot.protocols.irc.banmask() orig = conf.supybot.protocols.irc.banmask()
def ignore(given, expect=None):
if expect is None:
expect = given
self.assertNotError('channel ignore add %s' % given)
self.assertResponse('channel ignore list', "'%s'" % expect)
self.assertNotError('channel ignore remove %s' % expect)
self.assertRegexp('channel ignore list', 'not currently')
try: try:
ignore('foo!bar@baz', '*!bar@baz')
ignore('foo!*@*')
conf.supybot.protocols.irc.banmask.setValue(['exact']) conf.supybot.protocols.irc.banmask.setValue(['exact'])
self.assertNotError('channel ignore add foo!bar@baz') ignore('foo!bar@baz')
self.assertResponse('channel ignore list', "'foo!bar@baz'") ignore('foo!*@*')
self.assertNotError('channel ignore remove foo!bar@baz')
self.assertError('ban add not!a.hostmask') self.assertError('ban add not!a.hostmask')
finally: finally:
conf.supybot.protocols.irc.banmask.setValue(orig) conf.supybot.protocols.irc.banmask.setValue(orig)

3
src/conf.py
View File

@ -946,6 +946,9 @@ class Banmask(registry.SpaceSeparatedSetOfStrings):
bhost = host bhost = host
elif option == 'exact': elif option == 'exact':
return hostmask return hostmask
if (bnick, buser, bhost) == ('*', '*', '*') and \
ircutils.isUserHostmask(hostmask):
return hostmask
return ircutils.joinHostmask(bnick, buser, bhost) return ircutils.joinHostmask(bnick, buser, bhost)
registerChannelValue(supybot.protocols.irc, 'banmask', registerChannelValue(supybot.protocols.irc, 'banmask',