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

timeout sasl/AUTHENTICATE handshakes after 15 seconds. closes #195

Browse source
This commit is contained in:
jesopo 2019-10-30 11:20:07 +00:00
parent 0675285624
commit c0c1f85e83
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/ircv3_sasl/__init__.py
View file

@ -24,6 +24,8 @@ def _parse(value):
raise utils.SettingParseException("Unknown SASL mechanism '%s'" raise utils.SettingParseException("Unknown SASL mechanism '%s'"
% mechanism) % mechanism)
SASL_TIMEOUT = 15 # 15 seconds
HARDFAIL = utils.BoolSetting("sasl-hard-fail", HARDFAIL = utils.BoolSetting("sasl-hard-fail",
"Set whether a SASL failure should cause a disconnect") "Set whether a SASL failure should cause a disconnect")
@ -33,6 +35,10 @@ HARDFAIL = utils.BoolSetting("sasl-hard-fail",
@utils.export("serverset", HARDFAIL) @utils.export("serverset", HARDFAIL)
@utils.export("botset", HARDFAIL) @utils.export("botset", HARDFAIL)
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
@utils.hook("new.server")
def new_server(self, event):
event["server"]._sasl_timeout = None
def _best_userpass_mechanism(self, mechanisms): def _best_userpass_mechanism(self, mechanisms):
for potential_mechanism in USERPASS_MECHANISMS: for potential_mechanism in USERPASS_MECHANISMS:
if potential_mechanism in mechanisms: if potential_mechanism in mechanisms:
@ -71,9 +77,15 @@ class Module(ModuleManager.BaseModule):
mechanism = self._best_userpass_mechanism(server_mechanisms) mechanism = self._best_userpass_mechanism(server_mechanisms)
server.send_authenticate(mechanism) server.send_authenticate(mechanism)
timer = self.timers.add("sasl-timeout", self._sasl_timeout,
SASL_TIMEOUT, server=server)
server.sasl_mechanism = mechanism server.sasl_mechanism = mechanism
server.wait_for_capability("sasl") server.wait_for_capability("sasl")
def _sasl_timeout(self, timer):
server = timer.kwargs["server"]
self._panic(server, "SASL handshake timed out")
@utils.hook("received.authenticate") @utils.hook("received.authenticate")
def on_authenticate(self, event): def on_authenticate(self, event):
sasl = event["server"].get_setting("sasl") sasl = event["server"].get_setting("sasl")
@ -136,6 +148,9 @@ class Module(ModuleManager.BaseModule):
def _end_sasl(self, server): def _end_sasl(self, server):
server.capability_done("sasl") server.capability_done("sasl")
if not server._sasl_timeout == None:
server._sasl_timeout.cancel()
server._sasl_timeout = None
@utils.hook("received.908") @utils.hook("received.908")
def sasl_mechanisms(self, event): def sasl_mechanisms(self, event):