X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=48e07ef6d58b2aa278c1f5277a96f7a24e2ef08d;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=5241a14e57c085c5a58d3e9fe10eb700d3ea8306;hpb=219993bc9018d9f0d9568330d7a972b68b785d27;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp index 5241a14e5..48e07ef6d 100644 --- a/src/modules/m_sasl.cpp +++ b/src/modules/m_sasl.cpp @@ -27,7 +27,6 @@ class SaslAuthenticator : public classbase { 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"); @@ -51,7 +48,7 @@ class SaslAuthenticator : public classbase ServerInstance->PI->SendEncapsulatedData(params); } - SaslResult GetSaslResult(std::string &result_) + SaslResult GetSaslResult(const std::string &result_) { if (result_ == "F") return SASL_FAIL; @@ -63,25 +60,25 @@ class SaslAuthenticator : public classbase } /* checks for and deals with a state change. */ - SaslState ProcessInboundMessage(parameterlist &msg) + SaslState ProcessInboundMessage(const std::vector &msg) { switch (this->state) { case SASL_INIT: - this->agent = msg[2]; - this->user->Write("AUTHENTICATE %s", msg[5].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[2] != this->agent) + if (msg[0] != this->agent) return this->state; - if (msg[4] != "D") - this->user->Write("AUTHENTICATE %s", msg[5].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[5]); + this->result = this->GetSaslResult(msg[3]); } break; @@ -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,117 +163,104 @@ 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; } }; - -class ModuleSASL : public Module +class CommandSASL : public Command { - CommandAuthenticate sasl; public: - - ModuleSASL(InspIRCd* Me) - : Module(Me), sasl(Me, this) + SimpleExtItem& authExt; + CommandSASL(Module* Creator, SimpleExtItem& ext) : Command(Creator, "SASL", 2), authExt(ext) { - Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect, I_OnCleanup }; - ServerInstance->Modules->Attach(eventlist, this, 5); - - 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!"); + this->disabled = true; // should not be called by users } - virtual int OnUserRegister(User *user) + CmdResult Handle(const std::vector& parameters, User *user) { - SaslAuthenticator *sasl_; - if (user->GetExt("sasl_authenticator", sasl_)) + User* target = ServerInstance->FindNick(parameters[1]); + if (!target) { - sasl_->Abort(); - delete sasl_; - user->Shrink("sasl_authenticator"); + ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", parameters[1].c_str()); + return CMD_FAILURE; } - return 0; - } - - virtual void OnCleanup(int target_type, void *item) - { - if (target_type == TYPE_USER) - OnUserDisconnect((User*)item); - } + SaslAuthenticator *sasl = authExt.get(target); + if (!sasl) + return CMD_FAILURE; - virtual void OnUserDisconnect(User *user) - { - SaslAuthenticator *sasl_; - if (user->GetExt("sasl_authenticator", sasl_)) + SaslState state = sasl->ProcessInboundMessage(parameters); + if (state == SASL_DONE) { - delete sasl_; - user->Shrink("sasl_authenticator"); + sasl->AnnounceState(); + authExt.unset(target); } + return CMD_SUCCESS; } - virtual void OnPostConnect(User* user) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - if (!IS_LOCAL(user)) - return; + return ROUTE_BROADCAST; + } +}; - std::string* str = NULL; +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) + { + Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect, I_OnUserDisconnect, I_OnCleanup }; + ServerInstance->Modules->Attach(eventlist, this, 5); - if (user->GetExt("accountname", str)) - ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str); + ServerInstance->AddCommand(&auth); + ServerInstance->AddCommand(&sasl); - return; + 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!"); } - virtual ~ModuleSASL() + ModResult OnUserRegister(User *user) { + SaslAuthenticator *sasl_ = authExt.get(user); + if (sasl_) + { + sasl_->Abort(); + authExt.unset(user); + } + + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + ~ModuleSASL() { - return Version("$Id$",VF_VENDOR,API_VERSION); } - virtual void OnEvent(Event *ev) + Version GetVersion() { - GenericCapHandler(ev, "sasl", "sasl"); - - if (ev->GetEventID() == "encap_received") - { - parameterlist* parameters = (parameterlist*)ev->GetData(); - - if ((*parameters)[1] != "SASL") - return; - - User* target = ServerInstance->FindNick((*parameters)[3]); - if (!target) - { - 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; + return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR,API_VERSION); + } - SaslState state = sasl_->ProcessInboundMessage(*parameters); - if (state == SASL_DONE) - { - delete sasl_; - target->Shrink("sasl"); - } - } + void OnEvent(Event *ev) + { + cap.HandleEvent(ev); } };