Merge pull request #1971 from Exirel/core-sasl-fail

core: quit after SASL Auth failed

Author: dgw

sopel/coretasks.py

@@ -684,7 +684,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):
@@ -852,6 +856,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):
@@ -880,10 +897,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):