From 5f817867ebf544a70d9afaa27bf5a4166399ff59 Mon Sep 17 00:00:00 2001
From: Dpeta <69427753+Dpeta@users.noreply.github.com>
Date: Sat, 25 Feb 2023 21:22:36 +0100
Subject: [PATCH] Allow more replies to end SASL auth

---
 irc.py                  | 15 +++++++++++----
 scripts/irc_protocol.py |  3 ++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/irc.py b/irc.py
index 05f4eb2..74b0be6 100644
--- a/irc.py
+++ b/irc.py
@@ -115,8 +115,10 @@ class PesterIRC(QtCore.QThread):
             "768": self._keynotset,
             "769": self._keynopermission,
             "770": self._metadatasubok,
+            "902": self._sasl_skill_issue,  # ERR_NICKLOCKED, account is not available...
             "903": self._saslsuccess,  # We did a SASL!! woo yeah!! (RPL_SASLSUCCESS)
-            "904": self._saslfail,  # oh no,,, cringe,,, (ERR_SASLFAIL)
+            "904": self._sasl_skill_issue,  # oh no,,, cringe,,, (ERR_SASLFAIL)
+            "905": self._sasl_skill_issue,  # ERR_SASLTOOLONG, we don't split so end.
             "error": self._error,
             "join": self._join,
             "kick": self._kick,
@@ -1046,13 +1048,18 @@ class PesterIRC(QtCore.QThread):
                 password=self.mainwindow.userprofile.getNickServPass(),
             )
 
-    def _saslfail(self, *_msg):
-        """Handle 'RPL_SASLSUCCESS' reply from server, SASL authentication succeeded! woo yeah!!"""
+    def _sasl_skill_issue(self, *_msg):
+        """Handles all responses from server that indicate SASL authentication failed.
+
+        Replies that indicate we can't authenticate include: 902, 904, 905."""
         if not self.registered_irc:
+            self._send_irc.authenticate(
+                "*"
+            )  # Abort SASL, optional since we send cap END anyway.
             self._send_irc.cap("END")
 
     def _saslsuccess(self, *_msg):
-        """Handle 'ERR_SASLFAIL' reply from server, SASL failed somehow."""
+        """Handle 'RPL_SASLSUCCESS' reply from server, SASL authentication succeeded! woo yeah!!"""
         if not self.registered_irc:
             self._send_irc.cap("END")
 
diff --git a/scripts/irc_protocol.py b/scripts/irc_protocol.py
index ce7ed4b..61092ba 100644
--- a/scripts/irc_protocol.py
+++ b/scripts/irc_protocol.py
@@ -176,7 +176,8 @@ class SendIRC:
             sasl_string_base64 = base64.b64encode(sasl_string_bytes).decode(
                 encoding="utf-8"
             )
-            # Woo yeah woo yeah
+            # SASL string needs to be under 400 bytes,
+            # splitting over multiple messages is in the protocol but not implemented here.
             self._send("AUTHENTICATE", text=sasl_string_base64)