Firepup650/FireBot
2
0
Fork 1
Code Issues 5 Pull requests Activity Actions

cache dnsbl lookups (v3.0.19)

Browse source
This commit is contained in:
Firepup Sixfifty 2024-06-10 04:20:45 -05:00
parent 19ff5ee010
commit 433f57beb8
Signed by: Firepup650
GPG key ID: 7C92E2ABBBFAB9BA
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bare.py
View file

@ -45,6 +45,7 @@ class bot:
dnsblMode: str dnsblMode: str
statuses: dict[str, dict[str, str]] statuses: dict[str, dict[str, str]]
ops: dict[str, bool] ops: dict[str, bool]
dns: dict[str, dict[str, Union[str, list[str]]]]
def __init__(self, server: str): ... def __init__(self, server: str): ...

1
bot.py
View file

@ -85,6 +85,7 @@ class bot(bare.bot):
if "dnsblMode" in conf.servers[server] if "dnsblMode" in conf.servers[server]
else "none" else "none"
) )
self.dns = {}
self.lastfmLink = conf.lastfmLink self.lastfmLink = conf.lastfmLink
with open("mastermessages.txt") as f: with open("mastermessages.txt") as f:
TMFeed = [] TMFeed = []

9
commands.py
View file

@ -290,12 +290,15 @@ def check(bot: bare.bot, chan: str, name: str, message: str) -> None:
msg = message.split(" ", 1)[1] msg = message.split(" ", 1)[1]
nick = msg.split("!")[0] nick = msg.split("!")[0]
host = msg.split("@", 1)[1] host = msg.split("@", 1)[1]
cache = host in bot.dns
dnsbl, raws = conf.dnsblHandler(bot, nick, host, chan) dnsbl, raws = conf.dnsblHandler(bot, nick, host, chan)
bot.msg(f"Blacklist check: {dnsbl if dnsbl else 'Safe.'} ({raws})", chan) bot.msg(f"Blacklist check: {'(Cached) ' if cache else ''}{dnsbl if dnsbl else 'Safe.'} ({raws})", chan)
except IndexError: except IndexError:
try: try:
dnsbl, raws = conf.dnsblHandler(bot, "thisusernameshouldbetoolongtoeveractuallybeinuse", message.split(" ", 1)[1], chan) host = message.split(" ", 1)[1]
bot.msg(f"Blacklist check: {dnsbl if dnsbl else 'Safe.'} ({raws})", chan) cache = host in bot.dns
dnsbl, raws = conf.dnsblHandler(bot, "thisusernameshouldbetoolongtoeveractuallybeinuse", host, chan)
bot.msg(f"Blacklist check: {'(Cached) ' if cache else ''}{dnsbl if dnsbl else 'Safe.'} ({raws})", chan)
except Exception as E: except Exception as E:
bot.msg("Blacklist Lookup Failed. Error recorded to bot logs.", chan) bot.msg("Blacklist Lookup Failed. Error recorded to bot logs.", chan)
bot.log(str(E), "FATAL") bot.log(str(E), "FATAL")

5
config.py
View file

@ -32,7 +32,7 @@ ipbl = DNSBLIpChecker(providers=providers)
hsbl = DNSBLDomainChecker(providers=providers) hsbl = DNSBLDomainChecker(providers=providers)
load_dotenv() load_dotenv()
__version__ = "v3.0.18" __version__ = "v3.0.19"
npbase: str = ( npbase: str = (
"\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence] "\[\x0303last\.fm\x03\] [A-Za-z0-9_[\]{}\\|\-^]{1,$MAX} (is listening|last listened) to: \x02.+ - .*\x02( \([0-9]+ plays\)( \[.*\])?)?" # pyright: ignore [reportInvalidStringEscapeSequence]
) )
@ -198,7 +198,8 @@ def dnsblHandler(
dnsblStatus = "Not enabled" dnsblStatus = "Not enabled"
dnsblResps = {} dnsblResps = {}
if bot.dnsblMode != "none": if bot.dnsblMode != "none":
dnsblStatus, dnsblResps = dnsbl(hostname) dnsblStatus, dnsblResps = dnsbl(hostname) if not hostname in bot.dns else (bot.dns[hostname]["status"], bot.dns[hostname]["resps"])
bot.dns[hostname] = {"status": dnsblStatus, "resps": dnsblResps}
if dnsblStatus: if dnsblStatus:
match bot.dnsblMode: match bot.dnsblMode:
case "kickban": case "kickban":