From 09eb3d3314a044046c429c2ce453e3cf111aaf90 Mon Sep 17 00:00:00 2001
From: jesopo
Date: Wed, 6 Feb 2019 15:38:59 +0000
Subject: Only panic about a scram failure if it's a server-final-message
 failure (sasl)

---
 modules/sasl/__init__.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/sasl/__init__.py b/modules/sasl/__init__.py
index 415b1abe..bf1698e4 100644
--- a/modules/sasl/__init__.py
+++ b/modules/sasl/__init__.py
@@ -83,8 +83,10 @@ class Module(ModuleManager.BaseModule):
                     if verified:
                         auth_text = "+"
                     else:
-                        event["server"].disconnect()
-                        raise ValueError("Server SCRAM verification failed")
+                        if current_scram.state == scram.SCRAMState.VerifyFailed:
+                            event["server"].disconnect()
+                            raise ValueError("Server SCRAM verification failed")
+                        self._end_sasl(event["server"])
 
         else:
             raise ValueError("unknown sasl mechanism '%s'" % mechanism)
-- 
cgit v1.3.1-10-gc9f91