Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2025-02-18 06:30:57 +01:00
Code Issues Projects Releases Wiki Activity

Add command to manually initiate SASL

Browse Source
This commit is contained in:
Eric Mertens 2023-09-02 21:06:54 -07:00 committed by Val Lorentz
parent c66b973db0
commit 9e82e3f16c
2 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/Network/plugin.py
View File

@ -306,6 +306,17 @@ class Network(callbacks.Plugin):
irc.reply(format("%L", sorted(otherIrc.state.capabilities_ls))) irc.reply(format("%L", sorted(otherIrc.state.capabilities_ls)))
capabilities = wrap(capabilities, ['networkIrc']) capabilities = wrap(capabilities, ['networkIrc'])
def authenticate(self, irc, msg, args):
"""takes no arguments
Manually initiate SASL authentication.
"""
if 'sasl' in irc.state.capabilities_ack:
irc.startSasl(msg)
irc.replySuccess()
else:
irc.error(_('SASL not supported'))
authenticate = wrap(authenticate)
Class = Network Class = Network

39
src/irclib.py
View File

@ -559,14 +559,14 @@ class IrcStateFsm(object):
self.States.UNINITIALIZED, self.States.UNINITIALIZED,
]) ])
def on_sasl_cap(self, irc, msg): def on_sasl_start(self, irc, msg):
'''Whenever we see the 'sasl' capability in a CAP LS response''' '''Whenever we initiate a SASL transaction.'''
if self.state == self.States.INIT_CAP_NEGOTIATION: if self.state == self.States.INIT_CAP_NEGOTIATION:
self._transition(irc, msg, self.States.INIT_SASL) self._transition(irc, msg, self.States.INIT_SASL)
elif self.state == self.States.CONNECTED: elif self.state == self.States.CONNECTED:
self._transition(irc, msg, self.States.CONNECTED_SASL) self._transition(irc, msg, self.States.CONNECTED_SASL)
else: else:
raise ValueError('Got sasl cap while in state %s' % self.state) raise ValueError('Started SASL while in state %s' % self.state)
def on_sasl_auth_finished(self, irc, msg): def on_sasl_auth_finished(self, irc, msg):
'''When sasl auth either succeeded or failed.''' '''When sasl auth either succeeded or failed.'''
@ -1729,7 +1729,6 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
self.authenticate_decoder = None self.authenticate_decoder = None
self.sasl_next_mechanisms = [] self.sasl_next_mechanisms = []
self.sasl_current_mechanism = None self.sasl_current_mechanism = None
for mechanism in network_config.sasl.mechanisms(): for mechanism in network_config.sasl.mechanisms():
if mechanism == 'ecdsa-nist256p-challenge': if mechanism == 'ecdsa-nist256p-challenge':
if not crypto: if not crypto:
@ -1767,17 +1766,13 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
else: else:
self.sasl_next_mechanisms.append(mechanism) self.sasl_next_mechanisms.append(mechanism)
if self.sasl_next_mechanisms:
self.REQUEST_CAPABILITIES.add('sasl')
# Note: echo-message is only requested if labeled-response is available. # Note: echo-message is only requested if labeled-response is available.
REQUEST_CAPABILITIES = set(['account-notify', 'extended-join', REQUEST_CAPABILITIES = set(['account-notify', 'extended-join',
'multi-prefix', 'metadata-notify', 'account-tag', 'multi-prefix', 'metadata-notify', 'account-tag',
'userhost-in-names', 'invite-notify', 'server-time', 'userhost-in-names', 'invite-notify', 'server-time',
'chghost', 'batch', 'away-notify', 'message-tags', 'chghost', 'batch', 'away-notify', 'message-tags',
'msgid', 'setname', 'labeled-response', 'echo-message', 'msgid', 'setname', 'labeled-response', 'echo-message',
'standard-replies']) 'sasl', 'standard-replies'])
"""IRCv3 capabilities requested when they are available. """IRCv3 capabilities requested when they are available.
echo-message is special-cased to be requested only with labeled-response. echo-message is special-cased to be requested only with labeled-response.
@ -1901,17 +1896,21 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
def _maybeStartSasl(self, msg): def _maybeStartSasl(self, msg):
if not self.sasl_authenticated and \ if not self.sasl_authenticated and \
'sasl' in self.state.capabilities_ack: 'sasl' in self.state.capabilities_ack:
self.state.fsm.on_sasl_cap(self, msg) self.startSasl(msg)
assert 'sasl' in self.state.capabilities_ls, (
'Got "CAP ACK sasl" without receiving "CAP LS sasl" or ' def startSasl(self, msg):
'"CAP NEW sasl" first.') self.state.fsm.on_sasl_start(self, msg)
s = self.state.capabilities_ls['sasl'] assert 'sasl' in self.state.capabilities_ls, (
if s is not None: 'Starting SASL without receiving "CAP LS sasl" or '
available = set(map(str.lower, s.split(','))) '"CAP NEW sasl" first.')
self.sasl_next_mechanisms = [ self.resetSasl()
x for x in self.sasl_next_mechanisms s = self.state.capabilities_ls['sasl']
if x.lower() in available] if s is not None:
self.tryNextSaslMechanism(msg) available = set(map(str.lower, s.split(',')))
self.sasl_next_mechanisms = [
x for x in self.sasl_next_mechanisms
if x.lower() in available]
self.tryNextSaslMechanism(msg)
def doAuthenticate(self, msg): def doAuthenticate(self, msg):
self.state.fsm.expect_state([ self.state.fsm.expect_state([