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

Fix to global hostmask. Fix bug #SF3088559 and submitted as patch #SF3163843

Browse Source
This commit is contained in:
Valentin Lorentz 2011-01-22 10:17:32 +01:00
parent e6fc429701
commit 720b6d23eb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ircutils.py
View File

@ -196,7 +196,7 @@ def banmask(hostmask):
L[-1] = '*' L[-1] = '*'
return '*!*@' + ':'.join(L) return '*!*@' + ':'.join(L)
else: else:
if '.' in host: if len(host.split('.')) > 2: # If it is a subdomain
return '*!*@*%s' % host[host.find('.'):] return '*!*@*%s' % host[host.find('.'):]
else: else:
return '*!*@' + host return '*!*@' + host

4
test/test_ircutils.py
View File

@ -233,6 +233,10 @@ class FunctionsTestCase(SupyTestCase):
msg.prefix), msg.prefix),
'%r didn\'t match %r' % (msg.prefix, banmask)) '%r didn\'t match %r' % (msg.prefix, banmask))
self.assertEqual(ircutils.banmask('foobar!user@host'), '*!*@host') self.assertEqual(ircutils.banmask('foobar!user@host'), '*!*@host')
self.assertEqual(ircutils.banmask('foobar!user@host.tld'),
'*!*@host.tld')
self.assertEqual(ircutils.banmask('foobar!user@sub.host.tld'),
'*!*@*.host.tld')
self.assertEqual(ircutils.banmask('foo!bar@2001::'), '*!*@2001::*') self.assertEqual(ircutils.banmask('foo!bar@2001::'), '*!*@2001::*')
def testSeparateModes(self): def testSeparateModes(self):