diff options
| author |  jesopo | 2019-02-06 15:38:59 +0000 |
|---|---|---|
| committer | jesopo | 2019-02-06 15:38:59 +0000 |
| commit | 09eb3d3314a044046c429c2ce453e3cf111aaf90 (patch) | |
| tree | d3ec9341c99b5b44c7e5e2bdd54af00ab4338ca8 /modules/sasl | |
| parent | Only send `auth_text` if it's not None (sasl) (diff) | |
| signature | ||
Only panic about a scram failure if it's a server-final-message failure (sasl)
Diffstat (limited to 'modules/sasl')
| -rw-r--r-- | modules/sasl/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
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) |