X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_sasl.cpp;h=a9f2f205c8c0438643c0aaf8b66a82d1e3d45030;hb=2df56b811b362dbf5a05a0bc7b0eee5ee4d77a40;hp=05206784cf5101d9a5e2a4cc73b9d377018939f2;hpb=96e1769b33a746ef30222444fe21752c3a0c3089;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 05206784c..a9f2f205c 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT }; /** * Tracks SASL authentication state like charybdis does. --nenolod */ -class SaslAuthenticator +class SaslAuthenticator : public classbase { private: InspIRCd *ServerInstance; @@ -35,8 +35,8 @@ class SaslAuthenticator bool state_announced; public: - SaslAuthenticator(User *user, std::string method, InspIRCd *instance, Module *ctor) - : ServerInstance(instance), Creator(ctor), user(user), state(SASL_INIT) + SaslAuthenticator(User *user_, std::string method, InspIRCd *instance, Module *ctor) + : ServerInstance(instance), Creator(ctor), user(user_), state(SASL_INIT), state_announced(false) { this->user->Extend("sasl_authenticator", this); @@ -48,16 +48,15 @@ class SaslAuthenticator params.push_back("S"); params.push_back(method); - Event e((char*)¶ms, Creator, "send_encap"); - e.Send(ServerInstance); + ServerInstance->PI->SendEncapsulatedData(params); } - SaslResult GetSaslResult(std::string &result) + SaslResult GetSaslResult(std::string &result_) { - if (result == "F") + if (result_ == "F") return SASL_FAIL; - if (result == "A") + if (result_ == "A") return SASL_ABORT; return SASL_OK; @@ -69,21 +68,20 @@ class SaslAuthenticator switch (this->state) { case SASL_INIT: - this->agent = msg[1]; - this->user->Write("AUTHENTICATE %s", msg[4].c_str()); + this->agent = msg[2]; + this->user->Write("AUTHENTICATE %s", msg[5].c_str()); this->state = SASL_COMM; break; case SASL_COMM: - if (msg[1] != this->agent) + if (msg[2] != this->agent) return this->state; - if (msg[3] != "D") - this->user->Write("AUTHENTICATE %s", msg[4].c_str()); + if (msg[4] != "D") + this->user->Write("AUTHENTICATE %s", msg[5].c_str()); else { this->state = SASL_DONE; - this->result = this->GetSaslResult(msg[4]); - this->AnnounceState(); + this->result = this->GetSaslResult(msg[5]); } break; @@ -97,10 +95,16 @@ class SaslAuthenticator return this->state; } - bool SendClientMessage(const char* const* parameters, int pcnt) + void Abort(void) + { + this->state = SASL_DONE; + this->result = SASL_ABORT; + } + + bool SendClientMessage(const std::vector& parameters) { if (this->state != SASL_COMM) - return; + return true; std::deque params; params.push_back("*"); @@ -109,17 +113,13 @@ class SaslAuthenticator params.push_back(this->agent); params.push_back("C"); - for (int i = 0; i < pcnt; ++i) - params.push_back(parameters[i]); + params.insert(params.end(), parameters.begin(), parameters.end()); - Event e((char*)¶ms, Creator, "send_encap"); - e.Send(ServerInstance); + ServerInstance->PI->SendEncapsulatedData(params); - if (*parameters[0] == '*') + if (parameters[0][0] == '*') { - this->state = SASL_DONE; - this->result = SASL_ABORT; - + this->Abort(); return false; } @@ -134,17 +134,19 @@ class SaslAuthenticator switch (this->result) { case SASL_OK: - this->user->WriteServ("903 %s :SASL authentication successful", this->user->nick); + this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str()); break; case SASL_ABORT: - this->user->WriteServ("906 %s :SASL authentication aborted", this->user->nick); + this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str()); break; case SASL_FAIL: - this->user->WriteServ("904 %s :SASL authentication failed", this->user->nick); + this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick.c_str()); break; default: break; } + + this->state_announced = true; } ~SaslAuthenticator() @@ -163,7 +165,7 @@ class CommandAuthenticate : public Command this->source = "m_sasl.so"; } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { /* Only allow AUTHENTICATE on unregistered clients */ if (user->registered != REG_ALL) @@ -174,7 +176,7 @@ class CommandAuthenticate : public Command SaslAuthenticator *sasl; if (!(user->GetExt("sasl_authenticator", sasl))) sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator); - else if (sasl->SendClientMessage(parameters, pcnt) == false) // IAL abort extension --nenolod + else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod delete sasl; } return CMD_FAILURE; @@ -186,12 +188,12 @@ class ModuleSASL : public Module { CommandAuthenticate* sasl; public: - + ModuleSASL(InspIRCd* Me) : Module(Me) { - Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect }; - ServerInstance->Modules->Attach(eventlist, this, 3); + 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); @@ -202,15 +204,33 @@ class ModuleSASL : public Module virtual int OnUserRegister(User *user) { - if (user->GetExt("sasl")) + SaslAuthenticator *sasl_; + if (user->GetExt("sasl_authenticator", sasl_)) { - user->WriteServ("906 %s :SASL authentication aborted", user->nick); - user->Shrink("sasl"); + sasl_->Abort(); + delete sasl_; + user->Shrink("sasl_authenticator"); } return 0; } + virtual void OnCleanup(int target_type, void *item) + { + if (target_type == TYPE_USER) + OnUserDisconnect((User*)item); + } + + virtual void OnUserDisconnect(User *user) + { + SaslAuthenticator *sasl_; + if (user->GetExt("sasl_authenticator", sasl_)) + { + delete sasl_; + user->Shrink("sasl_authenticator"); + } + } + virtual void OnPostConnect(User* user) { if (!IS_LOCAL(user)) @@ -219,14 +239,8 @@ class ModuleSASL : public Module std::string* str = NULL; if (user->GetExt("accountname", str)) - { - std::deque params; - params.push_back(user->uuid); - params.push_back("accountname"); - params.push_back(*str); - Event e((char*)¶ms, this, "send_metadata"); - e.Send(ServerInstance); - } + ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str); + return; } @@ -236,7 +250,7 @@ class ModuleSASL : public Module virtual Version GetVersion() { - return Version(1,2,0,1,VF_VENDOR,API_VERSION); + return Version("$Id$",VF_VENDOR,API_VERSION); } virtual void OnEvent(Event *ev) @@ -250,20 +264,23 @@ class ModuleSASL : public Module if ((*parameters)[1] != "SASL") return; - User* target = ServerInstance->FindNick((*parameters)[2]); + User* target = ServerInstance->FindNick((*parameters)[3]); if (!target) { - ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", (*parameters)[2].c_str()); + 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)) + SaslAuthenticator *sasl_; + if (!target->GetExt("sasl_authenticator", sasl_)) return; - SaslState state = sasl->ProcessInboundMessage(*parameters); + SaslState state = sasl_->ProcessInboundMessage(*parameters); if (state == SASL_DONE) - delete sasl; + { + delete sasl_; + target->Shrink("sasl"); + } } } };