We still need to 'CAP REQ :sasl' when we get 'CAP NEW :sasl' (sasl)

This commit is contained in:
jesopo 2019-02-09 02:58:25 +00:00
parent 697ce2ba30
commit 6018cc098d

View file

@ -19,6 +19,7 @@ def _scram_xor(s1, s2):
"help": "Set the sasl username/password for this server", "help": "Set the sasl username/password for this server",
"validate": _validate}) "validate": _validate})
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
@utils.hook("received.cap.new")
@utils.hook("received.cap.ls") @utils.hook("received.cap.ls")
def on_cap(self, event): def on_cap(self, event):
has_sasl = "sasl" in event["capabilities"] has_sasl = "sasl" in event["capabilities"]
@ -37,7 +38,6 @@ class Module(ModuleManager.BaseModule):
event["server"].queue_capability("sasl") event["server"].queue_capability("sasl")
@utils.hook("received.cap.ack") @utils.hook("received.cap.ack")
@utils.hook("received.cap.new")
def on_cap_ack(self, event): def on_cap_ack(self, event):
if "sasl" in event["capabilities"]: if "sasl" in event["capabilities"]:
sasl = event["server"].get_setting("sasl") sasl = event["server"].get_setting("sasl")