From 0f89e12f4d89f20430292d4086e826bc982337d4 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 28 May 2014 12:45:07 +0300 Subject: [PATCH 1/3] src/conf.py: set default banmask to host. `*!user@host` is very easy to evade as most of users don't have identd server. This makes bans a little more difficult to evade. See also: * weechat/weechat#18 * ProgVal/Limnoria#689 --- src/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf.py b/src/conf.py index c5a321d22..fe6669986 100644 --- a/src/conf.py +++ b/src/conf.py @@ -1054,7 +1054,7 @@ class Banmask(registry.SpaceSeparatedSetOfStrings): return ircutils.joinHostmask(bnick, buser, bhost) registerChannelValue(supybot.protocols.irc, 'banmask', - Banmask(['user', 'host'], _("""Determines what will be used as the + Banmask(['host'], _("""Determines what will be used as the default banmask style."""))) registerGlobalValue(supybot.protocols.irc, 'strictRfc', From 4d81a5524132483b38448136ed0d2539205da427 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 28 May 2014 12:59:43 +0300 Subject: [PATCH 2/3] Channel: fix test.py . --- plugins/Channel/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Channel/test.py b/plugins/Channel/test.py index e40bc220b..c98b3799f 100644 --- a/plugins/Channel/test.py +++ b/plugins/Channel/test.py @@ -228,7 +228,7 @@ class ChannelTestCase(ChannelPluginTestCase): self.assertResponse('channel ignore list', "'%s'" % expect) self.assertNotError('channel ignore remove %s' % expect) self.assertRegexp('channel ignore list', 'not currently') - ignore('foo!bar@baz', '*!bar@baz') + ignore('*!*@baz', '*!*@baz') ignore('foo!*@*') with conf.supybot.protocols.irc.banmask.context(['exact']): ignore('foo!bar@baz') From f486bdbdbaba9f45cf28b5f68ab86912160d931d Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 28 May 2014 18:34:41 +0300 Subject: [PATCH 3/3] fix previous commit --- plugins/Channel/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Channel/test.py b/plugins/Channel/test.py index c98b3799f..33d4b2367 100644 --- a/plugins/Channel/test.py +++ b/plugins/Channel/test.py @@ -228,7 +228,7 @@ class ChannelTestCase(ChannelPluginTestCase): self.assertResponse('channel ignore list', "'%s'" % expect) self.assertNotError('channel ignore remove %s' % expect) self.assertRegexp('channel ignore list', 'not currently') - ignore('*!*@baz', '*!*@baz') + ignore('foo!bar@baz', '*!*@baz') ignore('foo!*@*') with conf.supybot.protocols.irc.banmask.context(['exact']): ignore('foo!bar@baz')