Skip to content

core: quit after SASL Auth failed #1971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgw merged 2 commits into from
Dec 24, 2020
Merged

core: quit after SASL Auth failed #1971

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9df08b
core: quit after SASL Auth failed
Exirel Oct 26, 2020
0557c43
core: quit when the SASL configuration is invalid
Exirel Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 25 additions & 5 deletions sopel/coretasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,11 @@ def receive_cap_list(bot, trigger):
if req.success:
req.success(bot, req.prefix + trigger)
if cap == 'sasl': # TODO why is this not done with bot.cap_req?
receive_cap_ack_sasl(bot)
try:
receive_cap_ack_sasl(bot)
except ConfigurationError as error:
LOGGER.error(str(error))
bot.quit('Wrong SASL configuration.')


def receive_cap_ls_reply(bot, trigger):
Expand Down Expand Up @@ -845,6 +849,19 @@ def sasl_success(bot, trigger):
bot.write(('CAP', 'END'))


@plugin.event(events.ERR_SASLFAIL)
@plugin.event(events.ERR_SASLTOOLONG)
@plugin.event(events.ERR_SASLABORTED)
@plugin.event(events.ERR_NICKLOCKED)
@plugin.unblockable
@plugin.thread(False)
def sasl_fail(bot, trigger):
"""SASL Auth Failed: log the error and quit."""
LOGGER.error(
'SASL Auth Failed; check your configuration: %s', str(trigger))
bot.quit('SASL Auth Failed')


@module.event(events.RPL_SASLMECHS)
@module.unblockable
def sasl_mechs(bot, trigger):
Expand Down Expand Up @@ -873,10 +890,13 @@ def sasl_mechs(bot, trigger):

See https://github.com/sopel-irc/sopel/issues/1780 for background
"""
raise ConfigurationError(
"Configured SASL mechanism '{}' is not advertised by this server. "
"Advertised values: {}"
.format(mech, ', '.join(supported_mechs)))
LOGGER.error(
"Configured SASL mechanism '%s' is not advertised by this server. "
"Advertised values: %s",
mech,
', '.join(supported_mechs),
)
bot.quit('Wrong SASL configuration.')


def _get_sasl_pass_and_mech(bot):
Expand Down