X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=3c3b1d2a00112dbd7f780bfb5e375953f0348f2c;hb=04cfaea87edd1b4b742cb607ea69ece760c460aa;hp=b205f91c1d334fc00117bb8cb470dd26828add09;hpb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index b205f91c1..3c3b1d2a0 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * InspIRCd: (C) 2002-2010 InspIRCd Development Team * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see @@ -23,11 +23,10 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT }; /** * Tracks SASL authentication state like charybdis does. --nenolod */ -class SaslAuthenticator : public classbase +class SaslAuthenticator { private: InspIRCd *ServerInstance; - Module *Creator; std::string agent; User *user; SaslState state; @@ -35,11 +34,9 @@ class SaslAuthenticator : public classbase 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) + SaslAuthenticator(User *user_, std::string method, Module *ctor) + : user(user_), state(SASL_INIT), state_announced(false) { - this->user->Extend("sasl_authenticator", this); - parameterlist params; params.push_back("*"); params.push_back("SASL"); @@ -148,21 +145,17 @@ class SaslAuthenticator : public classbase this->state_announced = true; } - - ~SaslAuthenticator() - { - this->user->Shrink("sasl_authenticator"); - this->AnnounceState(); - } }; 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 std::vector& parameters, User *user) @@ -170,14 +163,17 @@ class CommandAuthenticate : public Command /* Only allow AUTHENTICATE on unregistered clients */ if (user->registered != REG_ALL) { - if (!user->GetExt("sasl")) + if (!cap.ext.get(user)) return CMD_FAILURE; - SaslAuthenticator *sasl; - if (!(user->GetExt("sasl_authenticator", sasl))) - sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator); + 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 - delete sasl; + { + sasl->AnnounceState(); + authExt.unset(user); + } } return CMD_FAILURE; } @@ -185,12 +181,11 @@ class CommandAuthenticate : public Command class CommandSASL : public Command { - Module* Creator; public: - CommandSASL(InspIRCd* Instance, Module* creator) : Command(Instance, "SASL", 0, 2), Creator(creator) + SimpleExtItem& authExt; + CommandSASL(Module* Creator, SimpleExtItem& ext) : Command(Creator, "SASL", 2), authExt(ext) { - this->source = "m_sasl.so"; - this->disabled = true; // should not be called by users + this->flags_needed = FLAG_SERVERONLY; // should not be called by users } CmdResult Handle(const std::vector& parameters, User *user) @@ -202,93 +197,80 @@ class CommandSASL : public Command return CMD_FAILURE; } - SaslAuthenticator *sasl; - if (!target->GetExt("sasl_authenticator", sasl)) + SaslAuthenticator *sasl = authExt.get(target); + if (!sasl) return CMD_FAILURE; SaslState state = sasl->ProcessInboundMessage(parameters); if (state == SASL_DONE) { - delete sasl; - target->Shrink("sasl"); + sasl->AnnounceState(); + authExt.unset(target); } return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; class ModuleSASL : public Module { + SimpleExtItem authExt; + GenericCap cap; CommandAuthenticate auth; CommandSASL sasl; public: - - ModuleSASL(InspIRCd* Me) - : Module(Me), auth(Me, this), sasl(Me, this) + ModuleSASL() + : authExt("sasl_auth", this), cap(this, "sasl"), auth(this, authExt, cap), sasl(this, authExt) { - Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect, I_OnCleanup }; - ServerInstance->Modules->Attach(eventlist, this, 5); + Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnSetConnectClass }; + ServerInstance->Modules->Attach(eventlist, this, 3); - ServerInstance->AddCommand(&auth); - ServerInstance->AddCommand(&sasl); + ServiceProvider* providelist[] = { &auth, &sasl, &authExt }; + ServerInstance->Modules->AddServices(providelist, 3); 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!"); } - virtual int OnUserRegister(User *user) + ModResult OnUserRegister(LocalUser *user) { - SaslAuthenticator *sasl_; - if (user->GetExt("sasl_authenticator", sasl_)) + SaslAuthenticator *sasl_ = authExt.get(user); + if (sasl_) { sasl_->Abort(); - delete sasl_; - user->Shrink("sasl_authenticator"); + authExt.unset(user); } - return 0; + return MOD_RES_PASSTHRU; } - virtual void OnCleanup(int target_type, void *item) + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) { - if (target_type == TYPE_USER) - OnUserDisconnect((User*)item); - } - - virtual void OnUserDisconnect(User *user) - { - SaslAuthenticator *sasl_; - if (user->GetExt("sasl_authenticator", sasl_)) + if (myclass->config->getBool("requiresasl")) { - delete sasl_; - user->Shrink("sasl_authenticator"); + const AccountExtItem* ext = GetAccountExtItem(); + if (ext && !ext->get(user)) + return MOD_RES_DENY; } + return MOD_RES_PASSTHRU; } - 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() + ~ModuleSASL() { } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$",VF_VENDOR,API_VERSION); + return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR); } - virtual void OnEvent(Event *ev) + void OnEvent(Event &ev) { - GenericCapHandler(ev, "sasl", "sasl"); + cap.HandleEvent(ev); } };