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

Add a setting to disable "hard" sasl failure

Browse source
This commit is contained in:
jesopo 2019-06-17 14:22:08 +01:00
parent 72ce880478
commit 47acd4adc3
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/ircv3_sasl/__init__.py
View file

@ -20,6 +20,9 @@ def _validate(s):
@utils.export("serverset", {"setting": "sasl", @utils.export("serverset", {"setting": "sasl",
"help": "Set the sasl username/password for this server", "help": "Set the sasl username/password for this server",
"validate": _validate, "example": "PLAIN BitBot:hunter2"}) "validate": _validate, "example": "PLAIN BitBot:hunter2"})
@utils.export("serverset", {"setting": "sasl-hard-fail",
"help": "Set whether a SASL failure should cause a disconnect",
"validate": utils.bool_or_none, "example": "on"})
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def _best_userpass_mechanism(self, mechanisms): def _best_userpass_mechanism(self, mechanisms):
for potential_mechanism in USERPASS_MECHANISMS: for potential_mechanism in USERPASS_MECHANISMS:
@ -144,9 +147,12 @@ class Module(ModuleManager.BaseModule):
self._end_sasl(event["server"]) self._end_sasl(event["server"])
def _panic(self, server, message): def _panic(self, server, message):
message = "SASL panic for %s: %s" % (str(server), message) if server.get_setting("sasl-hard-fail", True):
if not server.from_init: message = "SASL panic for %s: %s" % (str(server), message)
self.log.error(message) if not server.from_init:
self.bot.disconnect(server) self.log.error(message)
self.bot.disconnect(server)
else:
self.bot.panic(reason=message)
else: else:
self.bot.panic(reason=message) self._end_sasl()