LimnoriaPlugins/SnoParser
6
0
Fork 1
Code Issues 9 Pull Requests 1 Projects Releases Wiki Activity

Compare commits

base: LimnoriaPlugins:master
Branches Tags
LimnoriaPlugins:master
LimnoriaPlugins:improve
Georg:redis
Georg:master
Georg:devel
..
compare: Georg:redis
Branches Tags
Georg:redis
Georg:master
Georg:devel
LimnoriaPlugins:master
LimnoriaPlugins:improve

No commits in common. "master" and "redis" have entirely different histories.
master ... redis

3 changed files with 189 additions and 338 deletions
Show Stats Expand all files Collapse all files

215
config.py
View File

@ -28,24 +28,15 @@
### ###
from supybot import conf, registry, ircutils from supybot import conf, registry
try: try:
from supybot.i18n import PluginInternationalization from supybot.i18n import PluginInternationalization
_ = PluginInternationalization('SnoParser')
_ = PluginInternationalization("SnoParser")
except: except:
# Placeholder that allows to run the plugin on a bot # Placeholder that allows to run the plugin on a bot
# without the i18n module # without the i18n module
_ = lambda x: x _ = lambda x: x
# class ValidChannel(registry.string):
# """Value must be a valid channel"""
# def setValue(self, v):
# if not (ircutils.isChannel(v)):
# self.error()
# registry.String.setValue(self, v)
def configure(advanced): def configure(advanced):
# This will be called by supybot to configure this module. advanced is # This will be called by supybot to configure this module. advanced is
@ -53,181 +44,115 @@ def configure(advanced):
# user or not. You should effect your configuration by manipulating the # user or not. You should effect your configuration by manipulating the
# registry as appropriate. # registry as appropriate.
from supybot.questions import expect, anything, something, yn from supybot.questions import expect, anything, something, yn
conf.registerPlugin('SnoParser', True)
conf.registerPlugin("SnoParser", True)
SnoParser = conf.registerPlugin("SnoParser") SnoParser = conf.registerPlugin('SnoParser')
# This is where your configuration variables (if any) should go. For example: # This is where your configuration variables (if any) should go. For example:
# conf.registerGlobalValue(SnoParser, 'someConfigVariableName', # conf.registerGlobalValue(SnoParser, 'someConfigVariableName',
# registry.Boolean(False, _("""Help for someConfigVariableName."""))) # registry.Boolean(False, _("""Help for someConfigVariableName.""")))
# conf.registerNetworkValue(SnoParser, 'targetChannel', ValidChannel, conf.registerGlobalValue(SnoParser, 'targetChannel',
# ("", ("""Determines which channel the bot should send snolines"""))) registry.String(None, ("""Sends reformatted snolines to the <channel>""")))
conf.registerNetworkValue( conf.registerGlobalValue(SnoParser, 'AutoVhost',
SnoParser, registry.String('libcasa/user/', ("""Configure the vhost eg. libcasa/user/$account""")))
"targetChannel",
registry.String(
"",
("""Determines which channel the bot should snolines example: `#snotices`"""),
),
)
conf.registerGlobalValue( conf.registerGlobalValue(SnoParser, 'preventHighlight',
SnoParser, registry.Boolean(True, ("""Toggles in channel highlights with ZWSP""")))
"AutoVhost",
registry.String(
"libcasa/user/", ("""Configure the vhost eg. libcasa/user/$account""")
),
)
conf.registerGlobalValue( conf.registerGlobalValue(SnoParser, 'debug',
SnoParser, registry.Boolean('false',
"preventHighlight",
registry.Boolean(True, ("""Toggles in channel highlights with ZWSP""")),
)
conf.registerGlobalValue(
SnoParser,
"debug",
registry.Boolean(
"false",
""" """
SnoParser: Verbose output. Note: there is a seperate debug option for the `whois` client. SnoParser: Verbose output. Note: there is a seperate debug option for the `whois` client.
""", """
private=True, , private=True
), ))
)
### ###
# REDIS related settings below: # REDIS related settings below:
### ###
conf.registerGroup(SnoParser, "redis") conf.registerGroup(SnoParser, 'redis')
conf.registerGlobalValue( conf.registerGlobalValue(SnoParser.redis, 'db1',
SnoParser.redis, registry.Integer(1,
"db1",
registry.Integer(
1,
""" """
Redis: Database number for counting of NICKNAMES. Redis: Database number for counting of NICKNAMES.
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.redis, 'db2',
conf.registerGlobalValue( registry.Integer(2,
SnoParser.redis,
"db2",
registry.Integer(
2,
""" """
Redis: Database number for counting of IP ADDRESSES. Redis: Database number for counting of IP ADDRESSES.
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.redis, 'host',
conf.registerGlobalValue( registry.String('127.0.0.1',
SnoParser.redis,
"host",
registry.String(
"127.0.0.1",
""" """
Redis: IP address or hostname. Redis: IP address or hostname.
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.redis, 'port',
conf.registerGlobalValue( registry.Integer(6379,
SnoParser.redis,
"port",
registry.Integer(
6379,
""" """
Redis: Port. Redis: Port.
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.redis, 'username',
conf.registerGlobalValue( registry.String('',
SnoParser.redis,
"username",
registry.String(
"",
""" """
Redis: Username. This is optional and has not been tested. It is recommended to perform initial tests on a local instance with no username and password. Redis: Username. This is optional and has not been tested. It is recommended to perform initial tests on a local instance with no username and password.
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.redis, 'password',
conf.registerGlobalValue( registry.String('',
SnoParser.redis,
"password",
registry.String(
"",
""" """
Redis: Password. This is optional and has not been tested. It is recommended to perform initial tests on a local instance with no username and password. Redis: Password. This is optional and has not been tested. It is recommended to perform initial tests on a local instance with no username and password.
""", """
), ))
) conf.registerGlobalValue(SnoParser.redis, 'timeout',
conf.registerGlobalValue( registry.Integer(5,
SnoParser.redis,
"timeout",
registry.Integer(
5,
""" """
Redis: Socket Timeout. The developer does not know what to recommend here, but `5` seems to yield good results. Redis: Socket Timeout. The developer does not know what to recommend here, but `5` seems to yield good results.
""", """
), ))
)
### ###
## WHOIS related settings below: ## WHOIS related settings below:
### ###
conf.registerGroup(SnoParser, "whois") conf.registerGroup(SnoParser, 'whois')
conf.registerGlobalValue( conf.registerGlobalValue(SnoParser.whois, 'debug',
SnoParser.whois, registry.Boolean('false',
"debug",
registry.Boolean(
"false",
""" """
SnoParser: True: Very verbose console output. False: Mostly silent operation. SnoParser: True: Very verbose console output. False: Mostly silent operation.
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.whois, 'sample',
conf.registerGlobalValue( registry.String('',
SnoParser.whois,
"sample",
registry.String(
"",
""" """
SnoParser: This allows to set a testing IP address, if the plugin shall be evaluated on i.e. a local network. This will override all IP addresses from SNOTICES! SnoParser: This allows to set a testing IP address, if the plugin shall be evaluated on i.e. a local network. This will override all IP addresses from SNOTICES!
""", """
private=True, , private=True
), ))
) conf.registerGlobalValue(SnoParser.whois, 'ttl',
conf.registerGlobalValue( registry.Integer(3600,
SnoParser.whois,
"ttl",
registry.Integer(
3600,
""" """
SnoParser: How long to cache WHOIS entries for. SnoParser: How long to cache WHOIS entries for.
""", """
private=True, , private=True
), ))
) conf.registerGroup(SnoParser.whois, 'redis')
conf.registerGroup(SnoParser.whois, "redis") conf.registerGlobalValue(SnoParser.whois.redis, 'db',
conf.registerGlobalValue( registry.Integer(0,
SnoParser.whois.redis,
"db",
registry.Integer(
0,
""" """
Redis: Database number for WHOIS query caching. Redis: Database number for WHOIS query caching.
""", """
), ))
)
# vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79: # vim:set shiftwidth=4 tabstop=4 expandtab textwidth=79:

274
plugin.py
View File

@ -28,23 +28,11 @@
### ###
from supybot import ( from supybot import utils, plugins, ircutils, callbacks, ircdb, conf, log, world, ircmsgs
utils,
plugins,
ircutils,
callbacks,
ircdb,
conf,
log,
world,
ircmsgs,
)
from supybot.commands import * from supybot.commands import *
try: try:
from supybot.i18n import PluginInternationalization from supybot.i18n import PluginInternationalization
_ = PluginInternationalization('SnoParser')
_ = PluginInternationalization("SnoParser")
except ImportError: except ImportError:
# Placeholder that allows to run the plugin on a bot # Placeholder that allows to run the plugin on a bot
# without the i18n module # without the i18n module
@ -61,21 +49,19 @@ from datetime import timedelta
from ipwhois import IPWhois from ipwhois import IPWhois
import ipwhois import ipwhois
class SnoParser(callbacks.Plugin): class SnoParser(callbacks.Plugin):
"""Parses the Server Notices from ErgoIRCd""" """Parses the Server Notices from ErgoIRCd"""
threaded = True threaded = True
def redis_connect_whois(self) -> redis.client.Redis: def redis_connect_whois(self) -> redis.client.Redis:
try: try:
redis_client_whois = redis.Redis( redis_client_whois = redis.Redis(
host=self.registryValue("redis.host"), host = self.registryValue('redis.host'),
port=self.registryValue("redis.port"), port = self.registryValue('redis.port'),
password=self.registryValue("redis.password"), password = self.registryValue('redis.password'),
username=self.registryValue("redis.username"), username = self.registryValue('redis.username'),
db=self.registryValue("whois.redis.db"), db = self.registryValue('whois.redis.db'),
socket_timeout=int(self.registryValue("redis.timeout")), socket_timeout = int(self.registryValue('redis.timeout'))
) )
ping = redis_client_whois.ping() ping = redis_client_whois.ping()
if ping is True: if ping is True:
@ -86,12 +72,12 @@ class SnoParser(callbacks.Plugin):
def redis_connect_nicks(self) -> redis.client.Redis: def redis_connect_nicks(self) -> redis.client.Redis:
try: try:
redis_client_nicks = redis.Redis( redis_client_nicks = redis.Redis(
host=self.registryValue("redis.host"), host = self.registryValue('redis.host'),
port=self.registryValue("redis.port"), port = self.registryValue('redis.port'),
password=self.registryValue("redis.password"), password = self.registryValue('redis.password'),
username=self.registryValue("redis.username"), username = self.registryValue('redis.username'),
db=self.registryValue("redis.db1"), db = self.registryValue('redis.db1'),
socket_timeout=int(self.registryValue("redis.timeout")), socket_timeout = int(self.registryValue('redis.timeout'))
) )
ping = redis_client_nicks.ping() ping = redis_client_nicks.ping()
if ping is True: if ping is True:
@ -102,12 +88,12 @@ class SnoParser(callbacks.Plugin):
def redis_connect_ips(self) -> redis.client.Redis: def redis_connect_ips(self) -> redis.client.Redis:
try: try:
redis_client_ips = redis.Redis( redis_client_ips = redis.Redis(
host=self.registryValue("redis.host"), host = self.registryValue('redis.host'),
port=self.registryValue("redis.port"), port = self.registryValue('redis.port'),
password=self.registryValue("redis.password"), password = self.registryValue('redis.password'),
username=self.registryValue("redis.username"), username = self.registryValue('redis.username'),
db=self.registryValue("redis.db2"), db = self.registryValue('redis.db2'),
socket_timeout=int(self.registryValue("redis.timeout")), socket_timeout = int(self.registryValue('redis.timeout'))
) )
ping = redis_client_ips.ping() ping = redis_client_ips.ping()
if ping is True: if ping is True:
@ -115,6 +101,7 @@ class SnoParser(callbacks.Plugin):
except redis.AuthenticationError: except redis.AuthenticationError:
print("Could not authenticate to Redis backend.") print("Could not authenticate to Redis backend.")
def __init__(self, irc): def __init__(self, irc):
super().__init__(irc) super().__init__(irc)
self.redis_client_whois = self.redis_connect_whois() self.redis_client_whois = self.redis_connect_whois()
@ -124,19 +111,19 @@ class SnoParser(callbacks.Plugin):
def whois_fresh(self, sourceip: str) -> dict: def whois_fresh(self, sourceip: str) -> dict:
"""Data from WHOIS backend (IANA or respective RIR).""" """Data from WHOIS backend (IANA or respective RIR)."""
asn = 0 asn = 0
subnet = "" subnet = ''
try: try:
whois = IPWhois(sourceip) whois = IPWhois(sourceip)
whoisres = whois.lookup_rdap(depth=1,retry_count=0) whoisres = whois.lookup_rdap(depth=1,retry_count=0)
results = whoisres results = whoisres
if self.registryValue("whois.debug"): if self.registryValue('whois.debug'):
print(results) print(results)
asn = whoisres["asn_registry"] asn = whoisres['asn_registry']
country = whoisres["asn_country_code"] country = whoisres['asn_country_code']
description = whoisres["asn_description"] description = whoisres['asn_description']
whoisout = asn + " " + country + " " + description whoisout = asn + ' ' + country + ' ' + description
except ipwhois.exceptions.IPDefinedError: except ipwhois.exceptions.IPDefinedError:
whoisout = "RFC 4291 (Local)" whoisout = 'RFC 4291 (Local)'
response = whoisout response = whoisout
return response return response
@ -154,12 +141,8 @@ class SnoParser(callbacks.Plugin):
def whois_set_cache(self, key: str, value: str) -> bool: def whois_set_cache(self, key: str, value: str) -> bool:
"""Data to Redis.""" """Data to Redis."""
duration = int(self.registryValue("whois.ttl")) duration = int(self.registryValue('whois.ttl'))
state = self.redis_client_whois.setex( state = self.redis_client_whois.setex(key, timedelta(seconds=duration), value=value,)
key,
timedelta(seconds=duration),
value=value,
)
return state return state
def whois_run(self, sourceip: str) -> dict: def whois_run(self, sourceip: str) -> dict:
@ -168,22 +151,20 @@ class SnoParser(callbacks.Plugin):
data = self.whois_get_cache(key=sourceip) data = self.whois_get_cache(key=sourceip)
if data is not None: if data is not None:
data = json.loads(data) data = json.loads(data)
if self.registryValue("whois.debug"): if self.registryValue('whois.debug'):
print("SNOPARSER DEBUG - WHOIS_RUN WITH CACHE: TRUE") print("SNOPARSER DEBUG - WHOIS_RUN WITH CACHE: TRUE")
print(data) print(data)
print(sourceip) print(sourceip)
return data return data
else: else:
data = self.whois_fresh(sourceip) data = self.whois_fresh(sourceip)
if self.registryValue("whois.debug"): if self.registryValue('whois.debug'):
print("SNOPARSER DEBUG - WHOIS_RUN WITH CACHE: FALSE") print("SNOPARSER DEBUG - WHOIS_RUN WITH CACHE: FALSE")
print(data) print(data)
print(sourceip) print(sourceip)
if data.startswith: if data.startswith:
if self.registryValue("whois.debug"): if self.registryValue('whois.debug'):
print( print("SNOPARSER DEBUG - WHOIS_RUN WITH CACHE: FALSE AND CORRECT STARTING CHARACTER")
"SNOPARSER DEBUG - WHOIS_RUN WITH CACHE: FALSE AND CORRECT STARTING CHARACTER"
)
print(data) print(data)
data = json.dumps(data) data = json.dumps(data)
state = self.whois_set_cache(key=sourceip, value=data) state = self.whois_set_cache(key=sourceip, value=data)
@ -191,10 +172,8 @@ class SnoParser(callbacks.Plugin):
if state is True: if state is True:
return json.loads(data) return json.loads(data)
else: else:
if self.registryValue("whois.debug"): if self.registryValue('whois.debug'):
print( print("SNOPARSER DEBUG _ WHOIS_RUN WITH CACHE: FALSE AND WRONG STARTING CHARACTER")
"SNOPARSER DEBUG _ WHOIS_RUN WITH CACHE: FALSE AND WRONG STARTING CHARACTER"
)
print(data) print(data)
return data return data
@ -204,24 +183,24 @@ class SnoParser(callbacks.Plugin):
data = self.redis_client_nicks.get(nickname) data = self.redis_client_nicks.get(nickname)
if data is not None: if data is not None:
if self.registryValue("debug"): if self.registryValue('debug'):
print("SNOPARSER DEBUG - NICK_RUN, SEEN: TRUE") print("SNOPARSER DEBUG - NICK_RUN, SEEN: TRUE")
print(nickname) print(nickname)
print(data) print(data)
self.redis_client_nicks.incrby(nickname,amount=1) self.redis_client_nicks.incrby(nickname,amount=1)
if data: if data:
decoded = data.decode("utf-8") decoded = data.decode('utf-8')
return decoded return decoded
else: else:
return 0 return 0
else: else:
if self.registryValue("debug"): if self.registryValue('debug'):
print("SNOPARSER DEBUG _ NICK_RUN, SEEN: FALSE") print("SNOPARSER DEBUG _ NICK_RUN, SEEN: FALSE")
print(nickname) print(nickname)
print(data) print(data)
self.redis_client_nicks.set(nickname, value="1") self.redis_client_nicks.set(nickname,value='1')
if data: if data:
decoded = data.decode("utf-8") decoded = data.decode('utf-8')
return decoded return decoded
else: else:
return 0 return 0
@ -232,24 +211,24 @@ class SnoParser(callbacks.Plugin):
data = self.redis_client_ips.get(ipaddress) data = self.redis_client_ips.get(ipaddress)
if data is not None: if data is not None:
if self.registryValue("debug"): if self.registryValue('debug'):
print("SNOPARSER DEBUG - IP_RUN, SEEN: TRUE") print("SNOPARSER DEBUG - IP_RUN, SEEN: TRUE")
print(ipaddress) print(ipaddress)
print(data) print(data)
self.redis_client_ips.incrby(ipaddress,amount=1) self.redis_client_ips.incrby(ipaddress,amount=1)
if data: if data:
decoded = data.decode("utf-8") decoded = data.decode('utf-8')
return decoded return decoded
else: else:
return 0 return 0
else: else:
if self.registryValue("debug"): if self.registryValue('debug'):
print("SNOPARSER DEBUG _ IP_RUN, SEEN: FALSE") print("SNOPARSER DEBUG _ IP_RUN, SEEN: FALSE")
print(ipaddress) print(ipaddress)
print(data) print(data)
self.redis_client_ips.set(ipaddress, value="1") self.redis_client_ips.set(ipaddress,value='1')
if data: if data:
decoded = data.decode("utf-8") decoded = data.decode('utf-8')
return decoded return decoded
else: else:
return 0 return 0
@ -260,33 +239,30 @@ class SnoParser(callbacks.Plugin):
""" """
data = self.whois_get_cache(key=ipaddress) data = self.whois_get_cache(key=ipaddress)
decoded_data = data.decode("utf-8") decoded_data = data.decode('utf-8')
ttl = self.redis_client_whois.ttl(ipaddress) ttl = self.redis_client_whois.ttl(ipaddress)
count = self.redis_client_ips.get(ipaddress) count = self.redis_client_ips.get(ipaddress)
decoded_count = count.decode("utf-8") decoded_count = count.decode('utf-8')
print("SnoParser manual query: ", data, " ", ttl) print('SnoParser manual query: ', data, ' ', ttl)
irc.reply(f"{decoded_data} - Count: {decoded_count} - Remaining: {ttl}s") irc.reply(f'{decoded_data} - Count: {decoded_count} - Remaining: {ttl}s')
ipquery = wrap(ipquery, ['ip'])
ipquery = wrap(ipquery, ["ip"])
def doNotice(self, irc, msg): def doNotice(self, irc, msg):
(target, text) = msg.args (target, text) = msg.args
if target == irc.nick: if target == irc.nick:
# server notices CONNECT, KILL, XLINE, NICK, ACCOUNT, OPER, QUIT, # server notices CONNECT, KILL, XLINE, NICK, ACCOUNT
text = ircutils.stripFormatting(text) text = ircutils.stripFormatting(text)
# if 'CONNECT' in text: if 'CONNECT' in text:
RE_CLICONN = re.compile( connregex = "^-CONNECT- Client connected \[(.+)\] \[u\:~(.+)\] \[h\:(.+)\] \[ip\:(.+)\] \[r\:(.+)\]$"
r"^-CONNECT- Client connected \[(.+)\] \[u\:~(.+)\] \[h\:(.+)\] \[ip\:(.+)\] \[r\:(.+)\]$" couple = re.match(connregex, text)
)
couple = RE_CLICONN.match(text)
# check `if couple:` ie was there a match even? if yes proceed
if couple:
nickname = couple.group(1) nickname = couple.group(1)
username = couple.group(2) username = couple.group(2)
host = couple.group(3) host = couple.group(3)
if self.registryValue("whois.sample"): if self.registryValue('whois.sample'):
ip = self.registryValue("whois.sample") ip = self.registryValue('whois.sample')
else: else:
ip = couple.group(4) ip = couple.group(4)
realname = couple.group(5) realname = couple.group(5)
@ -295,74 +271,43 @@ class SnoParser(callbacks.Plugin):
nick_seen = self.nick_run(nickname=nickname) nick_seen = self.nick_run(nickname=nickname)
whois = self.whois_run(sourceip=ip) whois = self.whois_run(sourceip=ip)
snote_dict = { DictFromSnotice = {'notice': 'connect', 'nickname': nickname, 'username': username, 'host': host, 'ip': ip, 'realname': realname, 'ipCount': ip_seen, 'nickCount': nick_seen}
"notice": "connect", #repl = f"\x02\x1FNOTICE: {DictFromSnotice['notice']} \x0F\x11\x0303==>>\x0F \x02Nick:\x0F {DictFromSnotice['nickname']} \x02Username:\x0F {DictFromSnotice['username']} \x02Hostname:\x0F {DictFromSnotice['host']} \x02IP:\x0F {DictFromSnotice['ip']} \x02Realname:\x0F {DictFromSnotice['realname']} \x02IPcount:\x0F {DictFromSnotice['ipCount']} \x02NickCount:\x0F {DictFromSnotice['nickCount']}"
"nickname": nickname, repl = f"\x02\x1F{DictFromSnotice['notice']} \x0F\x11\x0303==>>\x0F \x02Nick:\x0F {DictFromSnotice['nickname']} \x02Username:\x0F {DictFromSnotice['username']} \x02Hostname:\x0F {DictFromSnotice['host']} \x02IP:\x0F {DictFromSnotice['ip']} {whois} \x02Realname:\x0F {DictFromSnotice['realname']} \x02IPcount:\x0F {DictFromSnotice['ipCount']} \x02NickCount:\x0F {DictFromSnotice['nickCount']}"
"username": username,
"host": host,
"ip": ip,
"realname": realname,
"ipCount": ip_seen,
"nickCount": nick_seen,
}
repl = f"\x02\x1F{snote_dict['notice']} \x0F\x11\x0303==>>\x0F \x02Nick:\x0F {snote_dict['nickname']} \x02Username:\x0F {snote_dict['username']} \x02Hostname:\x0F {snote_dict['host']} \x02IP:\x0F {snote_dict['ip']} {whois} \x02Realname:\x0F {snote_dict['realname']} \x02IPcount:\x0F {snote_dict['ipCount']} \x02NickCount:\x0F {snote_dict['nickCount']}"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
# if 'XLINE' in text and 'temporary' in text: if 'XLINE' in text and 'temporary' in text:
RE_XLINE = re.compile( xlineregex = "^-XLINE- (.+) \[(.+)\] added temporary \((.+)\) (K-Line|D-Line) for (.+)$"
r"^-XLINE- (.+) \[(.+)\] added temporary \((.+)\) (K-Line|D-Line) for (.+)$" couple = re.match(xlineregex, text)
)
couple = RE_XLINE.match(text)
if couple:
who = couple.group(1) who = couple.group(1)
who_operator = couple.group(2) who_operator = couple.group(2)
duration = couple.group(3) duration = couple.group(3)
which_line = couple.group(4) which_line = couple.group(4)
host_or_ip = couple.group(5) host_or_ip = couple.group(5)
snote_dict = { DictFromSnotice = {'notice': 'tempban', 'who': who, 'operator': who_operator, 'duration': duration, 'type': which_line, 'target': host_or_ip}
"notice": "tempban", repl = f"\x02\x1FNOTICE: {DictFromSnotice['notice']}\x0F \x11\x0303 X_X \x0F \x02BannedBy:\x0F {DictFromSnotice['who']} \x02BannedByOper:\x0F {DictFromSnotice['operator']} \x02Duration:\x0F {DictFromSnotice['duration']} \x02XLINE Type:\x0F {DictFromSnotice['type']} \x02Nick:\x0F {DictFromSnotice['target']}"
"who": who,
"operator": who_operator,
"duration": duration,
"type": which_line,
"target": host_or_ip,
}
repl = f"\x02\x1FNOTICE: {snote_dict['notice']}\x0F \x11\x0303 X_X \x0F \x02BannedBy:\x0F {snote_dict['who']} \x02BannedByOper:\x0F {snote_dict['operator']} \x02Duration:\x0F {snote_dict['duration']} \x02XLINE Type:\x0F {snote_dict['type']} \x02Nick:\x0F {snote_dict['target']}"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
# WHY THE FUCK IS IT elif ?? # WHY THE FUCK IS IT elif ??
elif "XLINE" in text and "temporary" not in text and "removed" not in text: elif 'XLINE' in text and 'temporary' not in text and 'removed' not in text:
perm_xline_regex = ( perm_xline_regex = "^-XLINE- (.+) \[(.+)\] added (D-Line|K-Line) for (.+)$"
"^-XLINE- (.+) \[(.+)\] added (D-Line|K-Line) for (.+)$"
)
couple = re.match(perm_xline_regex, text) couple = re.match(perm_xline_regex, text)
who = couple.group(1) who = couple.group(1)
who_operator = couple.group(2) who_operator = couple.group(2)
which_line = couple.group(3) which_line = couple.group(3)
host_or_ip = couple.group(4) host_or_ip = couple.group(4)
snote_dict = { DictFromSnotice = {'notice': 'Permaban', 'who': who, 'operator': who_operator, 'type': which_line, 'target': host_or_ip}
"notice": "Permaban", repl = f"\x02\x1FNOTICE: {DictFromSnotice['notice']} \x0F \x11\x0303 X_X \x0F \x02BannedBy:\x0F {DictFromSnotice['who']} \x02BannedByOper:\x0F {DictFromSnotice['operator']} \x02XLINE Type:\x0F {DictFromSnotice['type']} \x02Host/IP:\x0F {DictFromSnotice['target']}"
"who": who,
"operator": who_operator,
"type": which_line,
"target": host_or_ip,
}
repl = f"\x02\x1FNOTICE: {snote_dict['notice']} \x0F \x11\x0303 X_X \x0F \x02BannedBy:\x0F {snote_dict['who']} \x02BannedByOper:\x0F {snote_dict['operator']} \x02XLINE Type:\x0F {snote_dict['type']} \x02Host/IP:\x0F {snote_dict['target']}"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
elif "XLINE" in text and "removed" in text: elif 'XLINE' in text and 'removed' in text:
unxlineregex = "^-XLINE- (.+) removed (D-Line|K-Line) for (.+)$" unxlineregex = "^-XLINE- (.+) removed (D-Line|K-Line) for (.+)$"
couple = re.match(unxlineregex, text) couple = re.match(unxlineregex, text)
who = couple.group(1) who = couple.group(1)
which_line = couple.group(2) which_line = couple.group(2)
host_or_ip = couple.group(3) host_or_ip = couple.group(3)
snote_dict = { DictFromSnotice = {'notice': 'unxline', 'who': who, 'type': which_line, 'target': host_or_ip}
"notice": "unxline", repl = f"\x02\x1FNOTICE: {DictFromSnotice['notice']} \x0F\x11\x0303 :=D\x0F \x02UnbannedBy:\x0F {DictFromSnotice['who']} \x02XLINE type:\x0F {DictFromSnotice['type']} \x02Host/IP:\x0F {DictFromSnotice['target']}"
"who": who,
"type": which_line,
"target": host_or_ip,
}
repl = f"\x02\x1FNOTICE: {snote_dict['notice']} \x0F\x11\x0303 :=D\x0F \x02UnbannedBy:\x0F {snote_dict['who']} \x02XLINE type:\x0F {snote_dict['type']} \x02Host/IP:\x0F {snote_dict['target']}"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
if "KILL" in text: if 'KILL' in text:
killregex = "^-KILL- (.+) \[(.+)\] killed (\d) clients with a (KLINE|DLINE) \[(.+)\]$" killregex = "^-KILL- (.+) \[(.+)\] killed (\d) clients with a (KLINE|DLINE) \[(.+)\]$"
couple = re.match(killregex, text) couple = re.match(killregex, text)
who = couple.group(1) who = couple.group(1)
@ -370,69 +315,49 @@ class SnoParser(callbacks.Plugin):
clients = couple.group(3) clients = couple.group(3)
which_line = couple.group(4) which_line = couple.group(4)
nick = couple.group(5) nick = couple.group(5)
snote_dict = { DictFromSnotice = {'notice': 'kill', 'who': who, 'operator': who_operator, "client": clients, 'type': which_line, 'nick': nick}
"notice": "kill", repl = f"\x02\x1FNOTICE: {DictFromSnotice['notice']} \x0F\x11\x0303☠\x0F \x02KilledBy:\x0F {DictFromSnotice['who']} \x02KilledByOper:\x0F {DictFromSnotice['operator']} \x02NumofClientsAffected:\x0F {DictFromSnotice['client']} \x02XLINE Type:\x0F {DictFromSnotice['type']} \x02Nick:\x0F {DictFromSnotice['nick']}"
"who": who,
"operator": who_operator,
"client": clients,
"type": which_line,
"nick": nick,
}
repl = f"\x02\x1FNOTICE: {snote_dict['notice']} \x0F\x11\x0303☠\x0F \x02KilledBy:\x0F {snote_dict['who']} \x02KilledByOper:\x0F {snote_dict['operator']} \x02NumofClientsAffected:\x0F {snote_dict['client']} \x02XLINE Type:\x0F {snote_dict['type']} \x02Nick:\x0F {snote_dict['nick']}"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
if "NICK" in text and "changed nickname to" in text: if 'NICK' in text and 'changed nickname to' in text:
nickregex = "^-NICK- (.+) changed nickname to (.+)$" nickregex = "^-NICK- (.+) changed nickname to (.+)$"
couple = re.match(nickregex, text) couple = re.match(nickregex, text)
old_nick = couple.group(1) old_nick = couple.group(1)
new_nick = couple.group(2) new_nick = couple.group(2)
snote_dict = { DictFromSnotice = {'notice': 'nick change', 'old_nick': old_nick, 'new_nick': new_nick}
"notice": "nick change", repl = f"\x02\x1FNOTICE: {DictFromSnotice['notice']} ==> {DictFromSnotice['old_nick']} changed their nick to {DictFromSnotice['new_nick']}"
"old_nick": old_nick,
"new_nick": new_nick,
}
repl = f"\x02\x1FNOTICE: {snote_dict['notice']} ==> {snote_dict['old_nick']} changed their nick to {snote_dict['new_nick']}"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
if "QUIT" in text and "exited" in text: if 'QUIT' in text and 'exited' in text:
quitregex = "^-QUIT- (.+) exited the network$" quitregex = "^-QUIT- (.+) exited the network$"
couple = re.match(quitregex, text) couple = re.match(quitregex, text)
nick = couple.group(1) nick = couple.group(1)
snote_dict = {"notice": "quit", "nick": nick} DictFromSnotice = {'notice': 'quit', 'nick': nick}
repl = f"\x02\x1FNOTICE: quit nick: {nick} has exited the network" repl = f"\x02\x1FNOTICE: quit nick: {nick} has exited the network"
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
if "ACCOUNT" in text and "registered account" in text: if 'ACCOUNT' in text and 'registered account' in text:
accregex = "^-ACCOUNT- Client \[(.*)\] registered account \[(.*)\] from IP (.*)$" accregex = "^-ACCOUNT- Client \[(.*)\] registered account \[(.*)\] from IP (.*)$"
couple = re.match(accregex, text) couple = re.match(accregex, text)
hostmask = couple.group(1) hostmask = couple.group(1)
account = couple.group(2) account = couple.group(2)
ip = couple.group(3) ip = couple.group(3)
snote_dict = { DictFromSnotice = {'notice': 'accreg', 'hostmask': hostmask, 'account': account, 'ip': ip}
"notice": "accreg",
"hostmask": hostmask,
"account": account,
"ip": ip,
}
repl = f"\x02\x1FNOTICE: accreg -> [{account}] was registered by hostmask [{hostmask}] from IP {ip}" repl = f"\x02\x1FNOTICE: accreg -> [{account}] was registered by hostmask [{hostmask}] from IP {ip}"
# Trigger HS SET # Trigger HS SET
self._setvhost(irc, msg, account) self._setvhost(irc, msg, account)
self._sendSnotice(irc, msg, repl)
if ( self._sendSnotice(irc, msg, repl)
"ACCOUNT" in text if 'ACCOUNT' in text and 'registered account' in text and 'SAREGISTER' in text:
and "registered account" in text
and "SAREGISTER" in text
):
accregex = "^-ACCOUNT- Operator \[(.*)\] registered account \[(.*)\] with SAREGISTER$" accregex = "^-ACCOUNT- Operator \[(.*)\] registered account \[(.*)\] with SAREGISTER$"
couple = re.match(accregex, text) couple = re.match(accregex, text)
oper = couple.group(1) oper = couple.group(1)
account = couple.group(2) account = couple.group(2)
snote_dict = {"notice": "sareg", "oper": oper, "account": account} DictFromSnotice = {'notice': 'sareg', 'oper': oper, 'account': account}
repl = f"\x02\x1FNOTICE: sareg -> [{account}] was registered by operator [{oper}]" repl = f"\x02\x1FNOTICE: sareg -> [{account}] was registered by operator [{oper}]"
self._setvhost(irc, msg, account) self._setvhost(irc, msg, account)
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
if "OPER" in text and "Client opered up" in text: if 'OPER' in text and 'Client opered up' in text:
operregex = "^-OPER- Client opered up \[(.*)\, \ (.*)\]$" operregex = "^-OPER- Client opered up \[(.*)\, \ (.*)\]$"
couple = re.match(operregex, text) couple = re.match(operregex, text)
hostmask = couple.group(1) hostmask = couple.group(1)
@ -440,36 +365,41 @@ class SnoParser(callbacks.Plugin):
print(couple) print(couple)
snote_dict = {"notice": "opered", "hostmask": hostmask, "oper": oper} DictFromSnotice = {'notice': 'opered', 'hostmask': hostmask, 'oper': oper}
repl = f"\x02\x1FNOTICE:\x0F [{hostmask}] opered up as [{oper}]." repl = f"\x02\x1FNOTICE:\x0F [{hostmask}] opered up as [{oper}]."
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
if "OPER" in text and "Client deopered" in text: if 'OPER' in text and 'Client deopered' in text:
operregex = "^-OPER- Client deopered \[(.*)\]" operregex = "^-OPER- Client deopered \[(.*)\]"
couple = re.match(operregex, text) couple = re.match(operregex, text)
account = couple.group(1) account = couple.group(1)
snote_dict = {"notice": "deopered", "name": account} DictFromSnotice = {'notice': 'deopered', 'name': account}
repl = f"\x02\x1FNOTICE:\x0F [{account}] opered down." repl = f"\x02\x1FNOTICE:\x0F [{account}] opered down."
self._sendSnotice(irc, msg, repl) self._sendSnotice(irc, msg, repl)
# Post Registration # Post Registration
def _setvhost(self, irc, msg, account): def _setvhost(self, irc, msg, account):
arg = ["SET"] arg = ['SET']
arg.append(account) arg.append(account)
vhost = self.registryValue("AutoVhost") vhost = self.registryValue('AutoVhost')
arg.append(f"{vhost}{account}") arg.append(f'{vhost}{account}')
irc.sendMsg(msg=ircmsgs.IrcMsg(command="HS", args=arg)) irc.sendMsg(msg=ircmsgs.IrcMsg(command='HS',
args=arg))
# Send formatted SNO to channel # Send formatted SNO to channel
def _sendSnotice(self, irc, msg, repl): def _sendSnotice(self, irc, msg, repl):
try: try:
channel = self.registryValue("targetChannel") channel = self.registryValue('targetChannel')
if irc.isChannel(channel): if channel[0] == '#':
irc.queueMsg(msg=ircmsgs.IrcMsg(command="NOTICE", args=(channel, repl))) irc.queueMsg(msg=ircmsgs.IrcMsg(command='NOTICE',
args=(channel, repl)))
# what sort of exception does one raise # what sort of exception does one raise
except: except:
pass pass

4
requirements.txt
View File

@ -1,4 +0,0 @@
async-timeout==4.0.2
dnspython==2.0.0
ipwhois==1.2.0
redis==4.5.4