ProtocolInterface::SendEncapsulatedData() changes

[user/henk/code/inspircd.git] / src / modules / m_sasl.cpp

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 45915ab4d1bd9ce588772d459be2b481191f7602..074362651925cc1b5fb8737ec3086bb68b3196dc 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -24,8 +24,6 @@
 #include "modules/sasl.h"
 #include "modules/ssl.h"
 
-/* $ModDesc: Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE. */
-
 enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE };
 enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 
@@ -33,7 +31,7 @@ static std::string sasl_target = "*";
 
 static void SendSASL(const parameterlist& params)
 {
-       if (!ServerInstance->PI->SendEncapsulatedData(params))
+       if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params))
        {
                SASLFallback(NULL, params);
        }
@@ -56,8 +54,6 @@ class SaslAuthenticator
                : user(user_), state(SASL_INIT), state_announced(false)
        {
                parameterlist params;
-               params.push_back(sasl_target);
-               params.push_back("SASL");
                params.push_back(user->uuid);
                params.push_back("*");
                params.push_back("S");
@@ -93,26 +89,29 @@ 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;
 
-                       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(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str());
 
                        break;
                 case SASL_DONE:
                        break;
                 default:
-                       ServerInstance->Logs->Log("m_sasl", LOG_DEFAULT, "WTF: SaslState is not a known state (%d)", this->state);
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WTF: SaslState is not a known state (%d)", this->state);
                        break;
                }
 
@@ -131,8 +130,6 @@ class SaslAuthenticator
                        return true;
 
                parameterlist params;
-               params.push_back(sasl_target);
-               params.push_back("SASL");
                params.push_back(this->user->uuid);
                params.push_back(this->agent);
                params.push_back("C");
@@ -158,13 +155,13 @@ class SaslAuthenticator
                switch (this->result)
                {
                 case SASL_OK:
-                       this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str());
+                       this->user->WriteNumeric(903, ":SASL authentication successful");
                        break;
                 case SASL_ABORT:
-                       this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str());
+                       this->user->WriteNumeric(906, ":SASL authentication aborted");
                        break;
                 case SASL_FAIL:
-                       this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick.c_str());
+                       this->user->WriteNumeric(904, ":SASL authentication failed");
                        break;
                 default:
                        break;
@@ -220,7 +217,7 @@ class CommandSASL : public Command
                User* target = ServerInstance->FindNick(parameters[1]);
                if ((!target) || (IS_SERVER(target)))
                {
-                       ServerInstance->Logs->Log("m_sasl", LOG_DEBUG, "User not found in sasl ENCAP event: %s", parameters[1].c_str());
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User not found in sasl ENCAP event: %s", parameters[1].c_str());
                        return CMD_FAILURE;
                }
 
@@ -258,18 +255,11 @@ class ModuleSASL : public Module
 
        void init() CXX11_OVERRIDE
        {
-               OnRehash(NULL);
-               Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-
-               ServiceProvider* providelist[] = { &auth, &sasl, &authExt };
-               ServerInstance->Modules->AddServices(providelist, 3);
-
                if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so"))
-                       ServerInstance->Logs->Log("m_sasl", LOG_DEFAULT, "WARNING: m_services_account.so and m_cap.so are not loaded! m_sasl.so will NOT function correctly until these two modules are loaded!");
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "WARNING: m_services_account.so and m_cap.so are not loaded! m_sasl.so will NOT function correctly until these two modules are loaded!");
        }
 
-       void OnRehash(User*) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*");
        }