diff options
| author |  jesopo | 2019-09-30 10:41:57 +0100 |
|---|---|---|
| committer | jesopo | 2019-09-30 10:41:57 +0100 |
| commit | 1d34363db420cc1623fad4b0c9024d469ac8a239 (patch) | |
| tree | 4ddc8be3c2f0f725dbb7170c2bad3845c2cdee77 /modules/ircv3_sasl | |
| parent | add github-token to bot.conf.example, use in github.py when available (diff) | |
| signature | ||
default sasl-hard-fail to false but add a bot-wide setting for it
Diffstat (limited to 'modules/ircv3_sasl')
| -rw-r--r-- | modules/ircv3_sasl/__init__.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modules/ircv3_sasl/__init__.py b/modules/ircv3_sasl/__init__.py index 805ccb71..5eb704f7 100644 --- a/modules/ircv3_sasl/__init__.py +++ b/modules/ircv3_sasl/__init__.py @@ -17,11 +17,14 @@ def _parse(value): mechanism, _, arguments = value.partition(" ") return {"mechanism": mechanism.upper(), "args": arguments} +HARDFAIL = utils.BoolSetting("sasl-hard-fail", + "Set whether a SASL failure should cause a disconnect") + @utils.export("serverset", utils.FunctionSetting(_parse, "sasl", "Set the sasl username/password for this server", example="PLAIN BitBot:hunter2")) -@utils.export("serverset", utils.BoolSetting("sasl-hard-fail", - "Set whether a SASL failure should cause a disconnect")) +@utils.export("serverset", HARDFAIL) +@utils.export("botset", HARDFAIL) class Module(ModuleManager.BaseModule): def _best_userpass_mechanism(self, mechanisms): for potential_mechanism in USERPASS_MECHANISMS: @@ -147,7 +150,8 @@ class Module(ModuleManager.BaseModule): self._end_sasl(event["server"]) def _panic(self, server, message): - if server.get_setting("sasl-hard-fail", True): + if server.get_setting("sasl-hard-fail", + self.bot.get_setting("sasl-hard-fail", False)): message = "SASL panic for %s: %s" % (str(server), message) if not server.from_init: self.log.error(message) |