From fd57589b17c7eb5d29346651dd354b790454c68e Mon Sep 17 00:00:00 2001 From: Mantas Mikulėnas Date: Sat, 11 Jan 2014 23:41:16 +0200 Subject: Handle SASL failures during SASL_INIT (wrong mechanism, etc.) --- src/modules/m_sasl.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index b67111987..64960448e 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -93,9 +93,8 @@ class SaslAuthenticator { case SASL_INIT: this->agent = msg[0]; - this->user->Write("AUTHENTICATE %s", msg[3].c_str()); this->state = SASL_COMM; - break; + /* fall through */ case SASL_COMM: if (msg[0] != this->agent) return this->state; -- cgit v1.2.3 From 1c89cb1002c915a18abd1dda2204b5c3ea1b5515 Mon Sep 17 00:00:00 2001 From: Mantas Mikulėnas Date: Sat, 11 Jan 2014 23:42:34 +0200 Subject: Support SASL messages other than 'C' and 'D' --- src/modules/m_sasl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 64960448e..66efcfe4e 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -99,13 +99,17 @@ class SaslAuthenticator if (msg[0] != this->agent) return this->state; - if (msg[2] != "D") + if (msg[2] == "C") this->user->Write("AUTHENTICATE %s", msg[3].c_str()); - else + else if (msg[2] == "D") { this->state = SASL_DONE; this->result = this->GetSaslResult(msg[3]); } + else if (msg[2] == "M") + this->user->WriteNumeric(908, "%s %s :are available SASL mechanisms", this->user->nick.c_str(), msg[3].c_str()); + else + ServerInstance->Logs->Log("m_sasl", DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str()); break; case SASL_DONE: -- cgit v1.2.3