X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=48e07ef6d58b2aa278c1f5277a96f7a24e2ef08d;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=91443ab4bdd2b1ec88c98845dbd1d50225fc4ff5;hpb=34bb0fb31f0ab94bcd4bc72c47f591e2b27e8b10;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 91443ab4b..48e07ef6d 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. @@ -15,90 +15,252 @@ #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; + std::string agent; + User *user; + SaslState state; + SaslResult result; + bool state_announced; + + public: + SaslAuthenticator(User *user_, std::string method, Module *ctor) + : user(user_), state(SASL_INIT), state_announced(false) + { + parameterlist 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(const 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(const std::vector &msg) + { + switch (this->state) + { + case SASL_INIT: + this->agent = msg[0]; + this->user->Write("AUTHENTICATE %s", msg[3].c_str()); + this->state = SASL_COMM; + break; + case SASL_COMM: + if (msg[0] != this->agent) + return this->state; + + if (msg[2] != "D") + this->user->Write("AUTHENTICATE %s", msg[3].c_str()); + else + { + this->state = SASL_DONE; + this->result = this->GetSaslResult(msg[3]); + } + + 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; + + parameterlist 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; + } +}; class CommandAuthenticate : public Command { - Module* Creator; public: - CommandAuthenticate (InspIRCd* Instance, Module* creator) : Command(Instance,"AUTHENTICATE", 0, 1, true), Creator(creator) + SimpleExtItem& authExt; + GenericCap& cap; + CommandAuthenticate(Module* Creator, SimpleExtItem& ext, GenericCap& Cap) + : Command(Creator, "AUTHENTICATE", 1), authExt(ext), cap(Cap) { - this->source = "m_sasl.so"; + works_before_reg = true; } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { - ServerInstance->Logs->Log("m_sasl", DEBUG,"AUTHENTICATE"); + /* Only allow AUTHENTICATE on unregistered clients */ if (user->registered != REG_ALL) { - ServerInstance->Logs->Log("m_sasl", DEBUG,"Sending ENCAP for AUTHENTICATE"); - /* 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]); - - Event e((char*)¶ms, Creator, "send_encap"); - e.Send(ServerInstance); + if (!cap.ext.get(user)) + return CMD_FAILURE; + + SaslAuthenticator *sasl = authExt.get(user); + if (!sasl) + authExt.set(user, new SaslAuthenticator(user, parameters[0], creator)); + else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod + { + sasl->AnnounceState(); + authExt.unset(user); + } } return CMD_FAILURE; } }; - -class ModuleSASL : public Module +class CommandSASL : public Command { - CommandAuthenticate* sasl; - public: - - ModuleSASL(InspIRCd* Me) - : Module(Me) + SimpleExtItem& authExt; + CommandSASL(Module* Creator, SimpleExtItem& ext) : Command(Creator, "SASL", 2), authExt(ext) { - Implementation eventlist[] = { I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, 1); - - sasl = new CommandAuthenticate(ServerInstance, this); - ServerInstance->AddCommand(sasl); + this->disabled = true; // should not be called by users } - - virtual ~ModuleSASL() + 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 = authExt.get(target); + if (!sasl) + return CMD_FAILURE; + + SaslState state = sasl->ProcessInboundMessage(parameters); + if (state == SASL_DONE) + { + sasl->AnnounceState(); + authExt.unset(target); + } + return CMD_SUCCESS; } - virtual Version GetVersion() + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - return Version(1,2,0,1,VF_VENDOR,API_VERSION); + return ROUTE_BROADCAST; } +}; - virtual void OnEvent(Event *ev) +class ModuleSASL : public Module +{ + SimpleExtItem authExt; + GenericCap cap; + CommandAuthenticate auth; + CommandSASL sasl; + public: + ModuleSASL() + : authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt) { - GenericCapHandler(ev, "sasl", "sasl"); + Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 5); - if (ev->GetEventID() == "encap_received") - { - /* Received encap reply, look for AUTHENTICATE */ - std::deque* parameters = (std::deque*)ev->GetData(); + ServerInstance->AddCommand(&auth); + ServerInstance->AddCommand(&sasl); - User* target = ServerInstance->FindNick((*parameters)[0]); + Extensible::Register(&authExt); + 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!"); + } - 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()); - } - } - else if (ev->GetEventID() == "account_login") + ModResult OnUserRegister(User *user) + { + SaslAuthenticator *sasl_ = authExt.get(user); + if (sasl_) { - AccountData* ac = (AccountData*)ev->GetData(); - ac->user->WriteServ("903 %s :SASL authentication successful", ac->user->nick); + sasl_->Abort(); + authExt.unset(user); } + + return MOD_RES_PASSTHRU; + } + + ~ModuleSASL() + { + } + + Version GetVersion() + { + return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR,API_VERSION); + } + + void OnEvent(Event *ev) + { + cap.HandleEvent(ev); } };