coretasks: backport SASL abort from #2187

tl;dr: If the server sends something unrecognized, the correct behavior is to abort authentication explicitly rather than silently ignoring it.
sopel-irc · Oct 5, 2021 · 2d07271 · 2d07271 · dgw · Oct 11, 2021
1 parent a992d56
commit 2d07271
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/sopel/coretasks.py b/sopel/coretasks.py
@@ -1045,6 +1045,10 @@ def auth_proceed(bot, trigger):
     """
     if trigger.args[0] != '+':
         # How did we get here? I am not good with computer.
+        LOGGER.warning("Aborting SASL: unexpected server reply '%s'" % trigger)
+        # Send `authenticate-abort` command
+        # See https://ircv3.net/specs/extensions/sasl-3.1#the-authenticate-command
+        bot.write(('AUTHENTICATE', '*'))
         return
     # Is this right?
     if bot.config.core.auth_method == 'sasl':