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

Support EXTERNAL sasl authentication

Browse source
This commit is contained in:
jesopo 2018-09-17 11:31:40 +01:00
parent bb5ff8ee0d
commit fad61c2664
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/sasl.py
View file

@ -13,8 +13,10 @@ class Module(object):
"validate": self._validate}) "validate": self._validate})
def _validate(self, s): def _validate(self, s):
mechanism = s
if " " in s: if " " in s:
return s.split(" ", 1) mechanism, arguments = s.split(" ", 1)
return {"mechanism": mechanism, "args": arguments}
def on_cap(self, event): def on_cap(self, event):
has_sasl = "sasl" in event["capabilities"] has_sasl = "sasl" in event["capabilities"]
@ -29,16 +31,26 @@ class Module(object):
def on_cap_ack(self, event): def on_cap_ack(self, event):
if "sasl" in event["capabilities"]: if "sasl" in event["capabilities"]:
event["server"].send_authenticate("PLAIN") sasl = event["server"].get_setting("sasl")
event["server"].send_authenticate(sasl["mechanism"].upper())
event["server"].wait_for_capability("sasl") event["server"].wait_for_capability("sasl")
def on_authenticate(self, event): def on_authenticate(self, event):
if event["message"] != "+": if event["message"] != "+":
event["server"].send_authenticate("*") event["server"].send_authenticate("*")
else: else:
sasl_nick, sasl_pass = event["server"].get_setting("sasl") sasl = event["server"].get_setting("sasl")
auth_text = "%s\0%s\0%s" % ( mechanism = sasl["mechanism"].upper()
sasl_nick, sasl_nick, sasl_pass)
if mechanism == "PLAIN":
sasl_nick, sasl_pass = sasl["args"].split(":", 1)
auth_text = "%s\0%s\0%s" % (sasl_nick, sasl_nick, sasl_pass)
elif mechanism == "EXTERNAL":
auth_text = "+"
else:
raise ValueError("unknown sasl mechanism '%s'" % mechanism)
if not auth_text == "+":
auth_text = base64.b64encode(auth_text.encode("utf8")) auth_text = base64.b64encode(auth_text.encode("utf8"))
auth_text = auth_text.decode("utf8") auth_text = auth_text.decode("utf8")
event["server"].send_authenticate(auth_text) event["server"].send_authenticate(auth_text)