X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=a9f2f205c8c0438643c0aaf8b66a82d1e3d45030;hb=2df56b811b362dbf5a05a0bc7b0eee5ee4d77a40;hp=fda574fb258f180aeb78147bf594ed17fe38b55c;hpb=cd8d817ac45a6a3db9faa20892b8a03f10caad1d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index fda574fb2..a9f2f205c 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -15,7 +15,146 @@ #include "m_cap.h" #include "account.h" -/* $ModDesc: Provides support for atheme SASL via AUTHENTICATE. */ +/* $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 }; + +/** + * Tracks SASL authentication state like charybdis does. --nenolod + */ +class SaslAuthenticator : public classbase +{ + private: + InspIRCd *ServerInstance; + Module *Creator; + std::string agent; + User *user; + SaslState state; + SaslResult result; + bool state_announced; + + public: + 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; + params.push_back("*"); + params.push_back("SASL"); + params.push_back(user->uuid); + params.push_back("*"); + params.push_back("S"); + params.push_back(method); + + ServerInstance->PI->SendEncapsulatedData(params); + } + + SaslResult GetSaslResult(std::string &result_) + { + if (result_ == "F") + return SASL_FAIL; + + if (result_ == "A") + return SASL_ABORT; + + return SASL_OK; + } + + /* checks for and deals with a state change. */ + SaslState ProcessInboundMessage(std::deque &msg) + { + switch (this->state) + { + case SASL_INIT: + this->agent = msg[2]; + this->user->Write("AUTHENTICATE %s", msg[5].c_str()); + this->state = SASL_COMM; + break; + case SASL_COMM: + if (msg[2] != this->agent) + return this->state; + + if (msg[4] != "D") + this->user->Write("AUTHENTICATE %s", msg[5].c_str()); + else + { + this->state = SASL_DONE; + this->result = this->GetSaslResult(msg[5]); + } + + break; + case SASL_DONE: + break; + default: + ServerInstance->Logs->Log("m_sasl", DEFAULT, "WTF: SaslState is not a known state (%d)", this->state); + break; + } + + return this->state; + } + + void Abort(void) + { + this->state = SASL_DONE; + this->result = SASL_ABORT; + } + + bool SendClientMessage(const std::vector& parameters) + { + if (this->state != SASL_COMM) + return true; + + std::deque params; + params.push_back("*"); + params.push_back("SASL"); + params.push_back(this->user->uuid); + params.push_back(this->agent); + params.push_back("C"); + + params.insert(params.end(), parameters.begin(), parameters.end()); + + ServerInstance->PI->SendEncapsulatedData(params); + + if (parameters[0][0] == '*') + { + this->Abort(); + return false; + } + + return true; + } + + void AnnounceState(void) + { + if (this->state_announced) + return; + + switch (this->result) + { + case SASL_OK: + this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str()); + break; + case SASL_ABORT: + this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str()); + break; + case SASL_FAIL: + 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(); + } +}; class CommandAuthenticate : public Command { @@ -26,21 +165,19 @@ 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) { - /* Only allow AUTHENTICATE on unregistered clients */ - std::deque params; - params.push_back("*"); - params.push_back("AUTHENTICATE"); - params.push_back(user->uuid); - - for (int i = 0; i < pcnt; ++i) - params.push_back(parameters[i]); + if (!user->GetExt("sasl")) + return CMD_FAILURE; - Event e((char*)¶ms, Creator, "send_encap"); - e.Send(ServerInstance); + SaslAuthenticator *sasl; + if (!(user->GetExt("sasl_authenticator", sasl))) + sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator); + else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod + delete sasl; } return CMD_FAILURE; } @@ -51,12 +188,12 @@ class ModuleSASL : public Module { CommandAuthenticate* sasl; public: - + ModuleSASL(InspIRCd* Me) : Module(Me) { - Implementation eventlist[] = { I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, 1); + 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); @@ -65,6 +202,47 @@ class ModuleSASL : public Module 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!"); } + virtual int OnUserRegister(User *user) + { + SaslAuthenticator *sasl_; + if (user->GetExt("sasl_authenticator", 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)) + return; + + std::string* str = NULL; + + if (user->GetExt("accountname", str)) + ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str); + + return; + } virtual ~ModuleSASL() { @@ -72,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) @@ -81,23 +259,28 @@ class ModuleSASL : public Module if (ev->GetEventID() == "encap_received") { - /* Received encap reply, look for AUTHENTICATE */ std::deque* parameters = (std::deque*)ev->GetData(); - User* target = ServerInstance->FindNick((*parameters)[0]); + if ((*parameters)[1] != "SASL") + return; - if (target) + User* target = ServerInstance->FindNick((*parameters)[3]); + if (!target) { - /* Found a user */ - parameters->pop_front(); - std::string line = irc::stringjoiner(" ", *parameters, 0, parameters->size() - 1).GetJoined(); - target->WriteServ("AUTHENTICATE %s", line.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_)) + return; + + SaslState state = sasl_->ProcessInboundMessage(*parameters); + if (state == SASL_DONE) + { + delete sasl_; + target->Shrink("sasl"); } - } - else if (ev->GetEventID() == "account_login") - { - AccountData* ac = (AccountData*)ev->GetData(); - ac->user->WriteServ("903 %s :SASL authentication successful", ac->user->nick); } } };