* | 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.
/**
* Tracks SASL authentication state like charybdis does. --nenolod
*/
-class SaslAuthenticator
+class SaslAuthenticator : public classbase
{
private:
InspIRCd *ServerInstance;
bool state_announced;
public:
- SaslAuthenticator(User *user, std::string method, InspIRCd *instance, Module *ctor)
- : ServerInstance(instance), Creator(ctor), user(user), state(SASL_INIT)
+ 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<std::string> params;
+ parameterlist params;
params.push_back("*");
params.push_back("SASL");
params.push_back(user->uuid);
params.push_back("S");
params.push_back(method);
- Event e((char*)¶ms, Creator, "send_encap");
- e.Send(ServerInstance);
+ ServerInstance->PI->SendEncapsulatedData(params);
}
- SaslResult GetSaslResult(std::string &result)
+ SaslResult GetSaslResult(const std::string &result_)
{
- if (result == "F")
+ if (result_ == "F")
return SASL_FAIL;
- if (result == "A")
+ if (result_ == "A")
return SASL_ABORT;
return SASL_OK;
}
/* checks for and deals with a state change. */
- SaslState ProcessInboundMessage(std::deque<std::string> &msg)
+ SaslState ProcessInboundMessage(const std::vector<std::string> &msg)
{
switch (this->state)
{
case SASL_INIT:
- this->agent = msg[1];
- 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[1] != 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->AnnounceState();
+ this->result = this->GetSaslResult(msg[3]);
}
break;
return this->state;
}
- bool SendClientMessage(const char* const* parameters, int pcnt)
+ void Abort(void)
+ {
+ this->state = SASL_DONE;
+ this->result = SASL_ABORT;
+ }
+
+ bool SendClientMessage(const std::vector<std::string>& parameters)
{
if (this->state != SASL_COMM)
- return;
+ return true;
- std::deque<std::string> params;
+ parameterlist params;
params.push_back("*");
params.push_back("SASL");
params.push_back(this->user->uuid);
params.push_back(this->agent);
params.push_back("C");
- for (int i = 0; i < pcnt; ++i)
- params.push_back(parameters[i]);
+ params.insert(params.end(), parameters.begin(), parameters.end());
- Event e((char*)¶ms, Creator, "send_encap");
- e.Send(ServerInstance);
+ ServerInstance->PI->SendEncapsulatedData(params);
- if (*parameters[0] == '*')
+ if (parameters[0][0] == '*')
{
- this->state = SASL_DONE;
- this->result = SASL_ABORT;
-
+ this->Abort();
return false;
}
switch (this->result)
{
case SASL_OK:
- this->user->WriteServ("903 %s :SASL authentication successful", this->user->nick);
+ this->user->WriteNumeric(903, "%s :SASL authentication successful", this->user->nick.c_str());
break;
case SASL_ABORT:
- this->user->WriteServ("906 %s :SASL authentication aborted", this->user->nick);
+ this->user->WriteNumeric(906, "%s :SASL authentication aborted", this->user->nick.c_str());
break;
case SASL_FAIL:
- this->user->WriteServ("904 %s :SASL authentication failed", this->user->nick);
+ this->user->WriteNumeric(904, "%s :SASL authentication failed", this->user->nick.c_str());
break;
default:
break;
}
+
+ this->state_announced = true;
}
~SaslAuthenticator()
this->source = "m_sasl.so";
}
- CmdResult Handle (const char* const* parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string>& parameters, User *user)
{
/* Only allow AUTHENTICATE on unregistered clients */
if (user->registered != REG_ALL)
SaslAuthenticator *sasl;
if (!(user->GetExt("sasl_authenticator", sasl)))
sasl = new SaslAuthenticator(user, parameters[0], ServerInstance, Creator);
- else if (sasl->SendClientMessage(parameters, pcnt) == false) // IAL abort extension --nenolod
+ else if (sasl->SendClientMessage(parameters) == false) // IAL abort extension --nenolod
delete sasl;
}
return CMD_FAILURE;
}
};
+class CommandSASL : public Command
+{
+ Module* Creator;
+ public:
+ CommandSASL(InspIRCd* Instance, Module* creator) : Command(Instance, "SASL", 0, 2), Creator(creator)
+ {
+ this->source = "m_sasl.so";
+ this->disabled = true; // should not be called by users
+ }
+
+ CmdResult Handle(const std::vector<std::string>& 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;
+ if (!target->GetExt("sasl_authenticator", sasl))
+ return CMD_FAILURE;
+
+ SaslState state = sasl->ProcessInboundMessage(parameters);
+ if (state == SASL_DONE)
+ {
+ delete sasl;
+ target->Shrink("sasl");
+ }
+ return CMD_SUCCESS;
+ }
+};
class ModuleSASL : public Module
{
- CommandAuthenticate* sasl;
+ CommandAuthenticate auth;
+ CommandSASL sasl;
public:
-
+
ModuleSASL(InspIRCd* Me)
- : Module(Me)
+ : Module(Me), auth(Me, this), sasl(Me, this)
{
- Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnPostConnect };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ 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);
+ ServerInstance->AddCommand(&auth);
+ 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!");
virtual int OnUserRegister(User *user)
{
- if (user->GetExt("sasl"))
+ SaslAuthenticator *sasl_;
+ if (user->GetExt("sasl_authenticator", sasl_))
{
- user->WriteServ("906 %s :SASL authentication aborted", user->nick);
- user->Shrink("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))
std::string* str = NULL;
if (user->GetExt("accountname", str))
- {
- std::deque<std::string> params;
- params.push_back(user->uuid);
- params.push_back("accountname");
- params.push_back(*str);
- Event e((char*)¶ms, this, "send_metadata");
- e.Send(ServerInstance);
- }
+ ServerInstance->PI->SendMetaData(user, "accountname", *str);
+
return;
}
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)
{
GenericCapHandler(ev, "sasl", "sasl");
-
- if (ev->GetEventID() == "encap_received")
- {
- std::deque<std::string>* parameters = (std::deque<std::string>*)ev->GetData();
-
- if ((*parameters)[1] != "SASL")
- return;
-
- User* target = ServerInstance->FindNick((*parameters)[2]);
- if (!target)
- {
- ServerInstance->Logs->Log("m_sasl", DEBUG,"User not found in sasl ENCAP event: %s", (*parameters)[2].c_str());
- return;
- }
-
- SaslAuthenticator *sasl;
- if (!target->GetExt("sasl_authenticator", sasl))
- return;
-
- SaslState state = sasl->ProcessInboundMessage(*parameters);
- if (state == SASL_DONE)
- delete sasl;
- }
}
};
projects / user / henk / code / inspircd.git / blobdiff