PsychoticNinja/ChanTracker
1
0
Fork 0
mirror of https://github.com/ncoevoet/ChanTracker.git synced 2025-04-27 13:31:10 -05:00
Code Issues Projects Releases Wiki Activity

fix cidr bans ValueError

Browse Source
This commit is contained in:
Nicolas Coevoet 2021-06-25 17:53:04 +00:00
parent b5d03d9718
commit 0b0b496b49
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugin.py
View File

@ -138,12 +138,12 @@ def matchHostmask(pattern, n, resolve):
n.ip = cache[n.prefix] = host.split('ip.')[1] n.ip = cache[n.prefix] = host.split('ip.')[1]
if n.ip != None and '@' in pattern and n.ip.find('*') == -1 and mcidr.match(pattern.split('@')[1]): if n.ip != None and '@' in pattern and n.ip.find('*') == -1 and mcidr.match(pattern.split('@')[1]):
address = IPAddress('%s' % n.ip) address = IPAddress('%s' % n.ip)
network = IPNetwork('%s' % pattern.split('@')[1], strict=False) network = IPNetwork(u'%s' % pattern.split('@')[1], strict=False)
if address in network: if address in network:
return '%s!%s@%s' % (nick, ident, n.ip) return '%s!%s@%s' % (nick, ident, n.ip)
elif n.ip != None and '@' in pattern and n.ip.find('*') == -1 and m6cidr.match(pattern.split('@')[1]): elif n.ip != None and '@' in pattern and n.ip.find('*') == -1 and m6cidr.match(pattern.split('@')[1]):
address = IPAddress('%s' % n.ip) address = IPAddress('%s' % n.ip)
network = IPNetwork('%s' % pattern.split('@')[1], strict=False) network = IPNetwork(u'%s' % pattern.split('@')[1], strict=False)
if address in network: if address in network:
return '%s!%s@%s' % (nick, ident, n.ip) return '%s!%s@%s' % (nick, ident, n.ip)
if ircutils.isUserHostmask(pattern): if ircutils.isUserHostmask(pattern):