MetaData rework

[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 1777fbc152160d6d58fcab1f85fcaeb812aa2ce2..08f1363741fa8ab4e3509d68dfb8428b87de6fd7 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -40,7 +40,7 @@ class SaslAuthenticator : public classbase
        {
                this->user->Extend("sasl_authenticator", this);
 
-               std::deque<std::string> params;
+               parameterlist params;
                params.push_back("*");
                params.push_back("SASL");
                params.push_back(user->uuid);
@@ -51,7 +51,7 @@ class SaslAuthenticator : public classbase
                ServerInstance->PI->SendEncapsulatedData(params);
        }
 
-       SaslResult GetSaslResult(std::string &result_)
+       SaslResult GetSaslResult(const std::string &result_)
        {
                if (result_ == "F")
                        return SASL_FAIL;
@@ -63,25 +63,25 @@ class SaslAuthenticator : public classbase
        }
 
        /* checks for and deals with a state change. */
-       SaslState ProcessInboundMessage(std::deque<std::string> &msg)
+       SaslState ProcessInboundMessage(const std::vector<std::string> &msg)
        {
                switch (this->state)
                {
                 case SASL_INIT:
-                       this->agent = msg[2];
-                       this->user->Write("AUTHENTICATE %s", msg[5].c_str());
+                       this->agent = msg[0];
+                       this->user->Write("AUTHENTICATE %s", msg[3].c_str());
                        this->state = SASL_COMM;
                        break;
                 case SASL_COMM:
-                       if (msg[2] != this->agent)
+                       if (msg[0] != this->agent)
                                return this->state;
 
-                       if (msg[4] != "D")
-                               this->user->Write("AUTHENTICATE %s", msg[5].c_str());
+                       if (msg[2] != "D")
+                               this->user->Write("AUTHENTICATE %s", msg[3].c_str());
                        else
                        {
                                this->state = SASL_DONE;
-                               this->result = this->GetSaslResult(msg[5]);
+                               this->result = this->GetSaslResult(msg[3]);
                        }
 
                        break;
@@ -106,7 +106,7 @@ class SaslAuthenticator : public classbase
                if (this->state != SASL_COMM)
                        return true;
 
-               std::deque<std::string> params;
+               parameterlist params;
                params.push_back("*");
                params.push_back("SASL");
                params.push_back(this->user->uuid);
@@ -183,20 +183,53 @@ class CommandAuthenticate : public Command
        }
 };
 
+class CommandSASL : public Command
+{
+       Module* Creator;
+ public:
+       CommandSASL(InspIRCd* Instance, Module* creator) : Command(Instance, "SASL", 0, 2), Creator(creator)
+       {
+               this->source = "m_sasl.so";
+               this->disabled = true; // should not be called by users
+       }
+
+       CmdResult Handle(const std::vector<std::string>& parameters, User *user)
+       {
+               User* target = ServerInstance->FindNick(parameters[1]);
+               if (!target)
+               {
+                       ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", parameters[1].c_str());
+                       return CMD_FAILURE;
+               }
+
+               SaslAuthenticator *sasl;
+               if (!target->GetExt("sasl_authenticator", sasl))
+                       return CMD_FAILURE;
+
+               SaslState state = sasl->ProcessInboundMessage(parameters);
+               if (state == SASL_DONE)
+               {
+                       delete sasl;
+                       target->Shrink("sasl");
+               }
+               return CMD_SUCCESS;
+       }
+};
 
 class ModuleSASL : public Module
 {
-       CommandAuthenticate* sasl;
+       CommandAuthenticate auth;
+       CommandSASL sasl;
  public:
 
        ModuleSASL(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), auth(Me, this), sasl(Me, this)
        {
                Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect, I_OnCleanup };
                ServerInstance->Modules->Attach(eventlist, this, 5);
 
-               sasl = new CommandAuthenticate(ServerInstance, this);
-               ServerInstance->AddCommand(sasl);
+               ServerInstance->AddCommand(&auth);
+               ServerInstance->AddCommand(&sasl);
 
                if (!ServerInstance->Modules->Find("m_services_account.so") || !ServerInstance->Modules->Find("m_cap.so"))
                        ServerInstance->Logs->Log("m_sasl", 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!");
@@ -239,7 +272,7 @@ class ModuleSASL : public Module
                std::string* str = NULL;
 
                if (user->GetExt("accountname", str))
-                       ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str);
+                       ServerInstance->PI->SendMetaData(user, "accountname", *str);
 
                return;
        }
@@ -256,32 +289,6 @@ class ModuleSASL : public Module
        virtual void OnEvent(Event *ev)
        {
                GenericCapHandler(ev, "sasl", "sasl");
-
-               if (ev->GetEventID() == "encap_received")
-               {
-                       std::deque<std::string>* parameters = (std::deque<std::string>*)ev->GetData();
-
-                       if ((*parameters)[1] != "SASL")
-                               return;
-
-                       User* target = ServerInstance->FindNick((*parameters)[3]);
-                       if (!target)
-                       {
-                               ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", (*parameters)[3].c_str());
-                               return;
-                       }
-
-                       SaslAuthenticator *sasl_;
-                       if (!target->GetExt("sasl_authenticator", sasl_))
-                               return;
-
-                       SaslState state = sasl_->ProcessInboundMessage(*parameters);
-                       if (state == SASL_DONE)
-                       {
-                               delete sasl_;
-                               target->Shrink("sasl");
-                       }
-               }
        }
 };