X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=a9f2f205c8c0438643c0aaf8b66a82d1e3d45030;hb=45805210f8c9bbce6222c50863a1671f562ccfbb;hp=89e8a379e14e593014f950f2c2c13e4ffdd74084;hpb=0ab6b96ca770654ece519fd67031dc13714d1d16;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 89e8a379e..a9f2f205c 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 /**
  * Tracks SASL authentication state like charybdis does. --nenolod
  */
-class SaslAuthenticator
+class SaslAuthenticator : public classbase
 {
  private:
 	InspIRCd *ServerInstance;
@@ -48,8 +48,7 @@ class SaslAuthenticator
 		params.push_back("S");
 		params.push_back(method);
 
-		Event e((char*)&params, Creator, "send_encap");
-		e.Send(ServerInstance);
+		ServerInstance->PI->SendEncapsulatedData(params);
 	}
 
 	SaslResult GetSaslResult(std::string &result_)
@@ -96,7 +95,13 @@ class SaslAuthenticator
 		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 true;
@@ -108,17 +113,13 @@ class SaslAuthenticator
 		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*)&params, 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;
 		}
 
@@ -133,13 +134,13 @@ class SaslAuthenticator
 		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;
@@ -164,7 +165,7 @@ class CommandAuthenticate : public Command
 		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)
@@ -175,7 +176,7 @@ class CommandAuthenticate : public Command
 			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;
@@ -187,12 +188,12 @@ class ModuleSASL : public Module
 {
 	CommandAuthenticate* sasl;
  public:
-	
+
 	ModuleSASL(InspIRCd* Me)
 		: Module(Me)
 	{
-		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);
@@ -203,15 +204,33 @@ class ModuleSASL : public Module
 
 	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))
@@ -220,14 +239,8 @@ class ModuleSASL : public Module
 		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*)&params, this, "send_metadata");
-			e.Send(ServerInstance);
-		}
+			ServerInstance->PI->SendMetaData(user, TYPE_USER, "accountname", *str);
+
 		return;
 	}
 
@@ -237,7 +250,7 @@ class ModuleSASL : public Module
 
 	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)
@@ -266,7 +279,7 @@ class ModuleSASL : public Module
 			if (state == SASL_DONE)
 			{
 				delete sasl_;
-				user->Shrink("sasl");
+				target->Shrink("sasl");
 			}
 		}
 	}