X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=08f1363741fa8ab4e3509d68dfb8428b87de6fd7;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=97bb6ff8868166f246562e6091abba18971bb3ab;hpb=0471d95aa86b1e19e6346a0dd058fb8a5243d049;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 97bb6ff88..08f136374 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -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,12 +35,12 @@ 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); - std::deque params; + parameterlist params; params.push_back("*"); params.push_back("SASL"); params.push_back(user->uuid); @@ -48,42 +48,40 @@ 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(const std::string &result_) { - if (result == "F") + if (result_ == "F") return SASL_FAIL; - if (result == "A") + if (result_ == "A") return SASL_ABORT; return SASL_OK; } /* checks for and deals with a state change. */ - SaslState ProcessInboundMessage(std::deque &msg) + SaslState ProcessInboundMessage(const std::vector &msg) { switch (this->state) { case SASL_INIT: - this->agent = msg[1]; - this->user->Write("AUTHENTICATE %s", msg[4].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[1] != this->agent) + if (msg[0] != this->agent) return this->state; - if (msg[3] != "D") - this->user->Write("AUTHENTICATE %s", msg[4].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[4]); - this->AnnounceState(); + this->result = this->GetSaslResult(msg[3]); } break; @@ -97,23 +95,35 @@ class SaslAuthenticator return this->state; } - void 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; + parameterlist params; params.push_back("*"); params.push_back("SASL"); params.push_back(this->user->uuid); 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][0] == '*') + { + this->Abort(); + return false; + } + + return true; } void AnnounceState(void) @@ -124,21 +134,24 @@ 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() { + this->user->Shrink("sasl_authenticator"); this->AnnounceState(); } }; @@ -152,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) @@ -163,27 +176,60 @@ class CommandAuthenticate : public Command SaslAuthenticator *sasl; if (!(user->GetExt("sasl_authenticator", sasl))) sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator); - else - sasl->SendClientMessage(parameters, pcnt); + else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod + delete sasl; } return CMD_FAILURE; } }; +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& 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 }; - 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); + 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!"); @@ -191,15 +237,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)) @@ -208,14 +272,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, "accountname", *str); + return; } @@ -225,38 +283,12 @@ 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) { GenericCapHandler(ev, "sasl", "sasl"); - - if (ev->GetEventID() == "encap_received") - { - std::deque* parameters = (std::deque*)ev->GetData(); - - if ((*parameters)[1] != "SASL") - return; - - User* target = ServerInstance->FindNick((*parameters)[2]); - if (!target) - { - ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", (*parameters)[2].c_str()); - return; - } - - SaslAuthenticator *sasl; - if (!target->GetExt("sasl_authenticator", sasl)) - return; - - SaslState state = sasl->ProcessInboundMessage(*parameters); - if (state == SASL_DONE) - { - target->Shrink("sasl_authenticator"); - delete sasl; - } - } } };