Don't try to abort SASL authentication if it has already been aborted

luk3yx · Apr 8, 2022 · 951ec8d · 951ec8d
1 parent 0af9bba
commit 951ec8d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,15 @@ Notes:
  - This changelog may contain typographical errors, it is still a
     work-in-progress.
 
+## 1.8.1 - 2022-04-08
+
+### Changed
+
+ - Don't try and abort SASL authentication when receiving 904 numerics if it
+   has already been aborted. This prevents miniirc from constantly trying to
+   cancel authentication on InspIRCd 3 servers if the supplied credentials are
+   incorrect.
+
 ## 1.8.0 - 2022-01-11
 
 ### Added

diff --git a/miniirc.py b/miniirc.py
@@ -8,9 +8,9 @@
 import atexit, errno, threading, time, socket, ssl, sys, warnings
 
 # The version string and tuple
-ver = __version_info__ = (1,8,0)
-version = 'miniirc IRC framework v1.8.0'
-__version__ = '1.8.0'
+ver = __version_info__ = (1,8,1)
+version = 'miniirc IRC framework v1.8.1'
+__version__ = '1.8.1'
 
 # __all__ and _default_caps
 __all__ = ['CmdHandler', 'Handler', 'IRC']
@@ -634,8 +634,9 @@ def _handler(irc, hostmask, args):
 
 @Handler('904', '905')
 def _handler(irc, hostmask, args):
-    irc._sasl = False
-    irc.quote('AUTHENTICATE *', force=True)
+    if irc._sasl:
+        irc._sasl = False
+        irc.quote('AUTHENTICATE *', force=True)
 
 @Handler('902', '903', '904', '905')
 def _handler(irc, hostmask, args):

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name        = 'miniirc',
-    version     = '1.8.0',
+    version     = '1.8.1',
     py_modules  = ['miniirc'],
     author      = 'luk3yx',
     description = 'A lightweight IRC framework.',