aboutsummaryrefslogtreecommitdiff
path: root/modules/sasl/__init__.py
diff options
context:
space:
mode:
authorGravatar jesopo2019-02-06 11:07:50 +0000
committerGravatar jesopo2019-02-06 11:07:50 +0000
commita7554b835e7f54897b8903fbf04fe4873f30862a (patch)
treea52d1ee24f083660db97aba7686e30a07befe34b /modules/sasl/__init__.py
parentType annotate scram.py and don't pass base64 data to scram.py functions (diff)
"+" as part of a SASL handshake is irc-specific so remove it from scram.py
Diffstat (limited to 'modules/sasl/__init__.py')
-rw-r--r--modules/sasl/__init__.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/sasl/__init__.py b/modules/sasl/__init__.py
index d7a768ae..2861d482 100644
--- a/modules/sasl/__init__.py
+++ b/modules/sasl/__init__.py
@@ -78,10 +78,12 @@ class Module(ModuleManager.BaseModule):
if current_scram.state == scram.SCRAMState.ClientFirst:
auth_text = current_scram.server_first(data)
elif current_scram.state == scram.SCRAMState.ClientFinal:
- auth_text = current_scram.server_final(data)
+ verified = current_scram.server_final(data)
del event["server"]._scram
- if current_scram.state == scram.SCRAMState.VerifyFailed:
+ if verified:
+ auth_text = "+"
+ else:
event["server"].disconnect()
raise ValueError("Server SCRAM verification failed")