Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

panic() if a sasl dance fails on first connection, disconnect on reconnect sasl

Browse source 
fail
This commit is contained in:
jesopo 2019-06-17 14:07:44 +01:00
parent 9121a868a8
commit 0c02368023
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ircv3_sasl/__init__.py
View file

@ -111,8 +111,7 @@ class Module(ModuleManager.BaseModule):
else: else:
if current_scram.state == scram.SCRAMState.VerifyFailed: if current_scram.state == scram.SCRAMState.VerifyFailed:
# server gave a bad verification so we should panic # server gave a bad verification so we should panic
event["server"].disconnect() self._panic(event["server"], "SCRAM VerifyFailed")
raise ValueError("Server SCRAM verification failed")
else: else:
raise ValueError("unknown sasl mechanism '%s'" % mechanism) raise ValueError("unknown sasl mechanism '%s'" % mechanism)
@ -138,10 +137,16 @@ class Module(ModuleManager.BaseModule):
self._end_sasl(event["server"]) self._end_sasl(event["server"])
@utils.hook("received.904") @utils.hook("received.904")
def sasl_failure(self, event): def sasl_failure(self, event):
self.log.warn("SASL failure for %s: %s", self._panic(event["server"], "ERR_SASLFAIL (%s)" % event["args"][1])
[str(event["server"]), event["args"][1]])
self._end_sasl(event["server"])
@utils.hook("received.907") @utils.hook("received.907")
def sasl_already(self, event): def sasl_already(self, event):
self._end_sasl(event["server"]) self._end_sasl(event["server"])
def _panic(self, server, message):
message = "SASL panic for %s: %s" % (str(server), message)
if server.reconnected:
self.log.error(message)
self.bot.disconnect(server)
else:
self.bot.panic(reason=message)