X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=9cb5592d1f8d1e2c1af817739d02c9d7552107a3;hb=e2dd99fa342b45364590ec72746e3118f1779538;hp=0bbe76838b5f5b5fc126c90443e167e17df406a5;hpb=c798703113cd96b8925d666f2831d420ee8176d2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 0bbe76838..9cb5592d1 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -1,108 +1,304 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "m_cap.h" #include "account.h" +#include "sasl.h" +#include "ssl.h" -/* $ModDesc: Provides support for atheme SASL via AUTHENTICATE. */ +/* $ModDesc: Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE. */ -class CommandAuthenticate : public Command +enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE }; +enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT }; + +static std::string sasl_target = "*"; + +static void SendSASL(const parameterlist& params) +{ + if (!ServerInstance->PI->SendEncapsulatedData(params)) + { + SASLFallback(NULL, params); + } +} + +/** + * Tracks SASL authentication state like charybdis does. --nenolod + */ +class SaslAuthenticator { - Module* Creator; + private: + std::string agent; + User *user; + SaslState state; + SaslResult result; + bool state_announced; + public: - CommandAuthenticate (InspIRCd* Instance, Module* creator) : Command(Instance,"AUTHENTICATE", 0, 1, true), Creator(creator) + SaslAuthenticator(User* user_, const std::string& method) + : user(user_), state(SASL_INIT), state_announced(false) + { + parameterlist params; + params.push_back(sasl_target); + params.push_back("SASL"); + params.push_back(user->uuid); + params.push_back("*"); + params.push_back("S"); + params.push_back(method); + + if (method == "EXTERNAL" && IS_LOCAL(user_)) + { + SocketCertificateRequest req(&((LocalUser*)user_)->eh, ServerInstance->Modules->Find("m_sasl.so")); + std::string fp = req.GetFingerprint(); + + if (fp.size()) + params.push_back(fp); + } + + SendSASL(params); + } + + SaslResult GetSaslResult(const std::string &result_) { - this->source = "m_sasl.so"; + if (result_ == "F") + return SASL_FAIL; + + if (result_ == "A") + return SASL_ABORT; + + return SASL_OK; } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + /* checks for and deals with a state change. */ + SaslState ProcessInboundMessage(const std::vector &msg) { - if (user->registered != REG_ALL) + switch (this->state) { - /* Only act if theyve enabled CAP REQ sasl */ - if (user->GetExt("sasl")) + case SASL_INIT: + this->agent = msg[0]; + this->state = SASL_COMM; + /* fall through */ + case SASL_COMM: + if (msg[0] != this->agent) + return this->state; + + if (msg.size() < 4) + return this->state; + + if (msg[2] == "C") + this->user->Write("AUTHENTICATE %s", msg[3].c_str()); + else if (msg[2] == "D") { - /* Only allow AUTHENTICATE on unregistered clients */ - std::deque params; - params.push_back("*"); - params.push_back("AUTHENTICATE"); - params.push_back(user->uuid); + this->state = SASL_DONE; + this->result = this->GetSaslResult(msg[3]); + } + else if (msg[2] == "M") + this->user->WriteNumeric(908, "%s %s :are available SASL mechanisms", this->user->nick.c_str(), msg[3].c_str()); + else + ServerInstance->Logs->Log("m_sasl", DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str()); + + 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(sasl_target); + 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()); + + SendSASL(params); + + if (parameters[0].c_str()[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; + } - for (int i = 0; i < pcnt; ++i) - params.push_back(parameters[i]); + this->state_announced = true; + } +}; + +class CommandAuthenticate : public Command +{ + public: + SimpleExtItem& authExt; + GenericCap& cap; + CommandAuthenticate(Module* Creator, SimpleExtItem& ext, GenericCap& Cap) + : Command(Creator, "AUTHENTICATE", 1), authExt(ext), cap(Cap) + { + works_before_reg = true; + } + + CmdResult Handle (const std::vector& parameters, User *user) + { + /* Only allow AUTHENTICATE on unregistered clients */ + if (user->registered != REG_ALL) + { + if (!cap.ext.get(user)) + return CMD_FAILURE; - Event e((char*)¶ms, Creator, "send_encap"); - e.Send(ServerInstance); + SaslAuthenticator *sasl = authExt.get(user); + if (!sasl) + authExt.set(user, new SaslAuthenticator(user, parameters[0])); + 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); + this->flags_needed = FLAG_SERVERONLY; // should not be called by users + } - sasl = new CommandAuthenticate(ServerInstance, this); - ServerInstance->AddCommand(sasl); + CmdResult Handle(const std::vector& parameters, User *user) + { + User* target = ServerInstance->FindNick(parameters[1]); + if ((!target) || (IS_SERVER(target))) + { + ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", parameters[1].c_str()); + return CMD_FAILURE; + } - 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!"); - } + 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 ~ModuleSASL() + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { + return ROUTE_BROADCAST; } +}; - virtual Version GetVersion() +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) { - return Version(1,2,0,1,VF_VENDOR,API_VERSION); } - virtual void OnEvent(Event *ev) + void init() { - GenericCapHandler(ev, "sasl", "sasl"); + OnRehash(NULL); + Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - if (ev->GetEventID() == "encap_received") - { - /* Received encap reply, look for AUTHENTICATE */ - std::deque* parameters = (std::deque*)ev->GetData(); + ServiceProvider* providelist[] = { &auth, &sasl, &authExt }; + ServerInstance->Modules->AddServices(providelist, 3); - User* target = ServerInstance->FindNick((*parameters)[0]); + 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") + void OnRehash(User*) + { + sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*"); + } + + ModResult OnUserRegister(LocalUser *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; + } + + Version GetVersion() + { + return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR); + } + + void OnEvent(Event &ev) + { + cap.HandleEvent(ev); } };