X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=db96f9dfaa0039439214d173e0549d987c4a8c0e;hb=d0cd749a70646f2c2bbd616a9934fada22ad1ffd;hp=f8d8c5322d26788da4d6aae37bf3a478c5a39010;hpb=929ef50908605ee49e0455ebb07c390a29c826ef;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index f8d8c5322..db96f9dfa 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -51,10 +51,26 @@ class SaslAuthenticator
 	SaslResult result;
 	bool state_announced;
 
+	void SendHostIP()
+	{
+		parameterlist params;
+		params.push_back(sasl_target);
+		params.push_back("SASL");
+		params.push_back(user->uuid);
+		params.push_back("*");
+		params.push_back("H");
+		params.push_back(user->host);
+		params.push_back(user->GetIPString());
+
+		SendSASL(params);
+	}
+
  public:
-	SaslAuthenticator(User *user_, std::string method, Module *ctor)
+	SaslAuthenticator(User* user_, const std::string& method)
 		: user(user_), state(SASL_INIT), state_announced(false)
 	{
+		SendHostIP();
+
 		parameterlist params;
 		params.push_back(sasl_target);
 		params.push_back("SASL");
@@ -93,20 +109,26 @@ class SaslAuthenticator
 		{
 		 case SASL_INIT:
 			this->agent = msg[0];
-			this->user->Write("AUTHENTICATE %s", msg[3].c_str());
 			this->state = SASL_COMM;
-			break;
+			/* fall through */
 		 case SASL_COMM:
 			if (msg[0] != this->agent)
 				return this->state;
 
-			if (msg[2] != "D")
+			if (msg.size() < 4)
+				return this->state;
+
+			if (msg[2] == "C")
 				this->user->Write("AUTHENTICATE %s", msg[3].c_str());
-			else
+			else if (msg[2] == "D")
 			{
 				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:
@@ -141,7 +163,7 @@ class SaslAuthenticator
 
 		SendSASL(params);
 
-		if (parameters[0][0] == '*')
+		if (parameters[0].c_str()[0] == '*')
 		{
 			this->Abort();
 			return false;
@@ -183,6 +205,7 @@ class CommandAuthenticate : public Command
 		: Command(Creator, "AUTHENTICATE", 1), authExt(ext), cap(Cap)
 	{
 		works_before_reg = true;
+		allow_empty_last_param = false;
 	}
 
 	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
@@ -193,9 +216,12 @@ class CommandAuthenticate : public Command
 			if (!cap.ext.get(user))
 				return CMD_FAILURE;
 
+			if (parameters[0].find(' ') != std::string::npos || parameters[0][0] == ':')
+				return CMD_FAILURE;
+
 			SaslAuthenticator *sasl = authExt.get(user);
 			if (!sasl)
-				authExt.set(user, new SaslAuthenticator(user, parameters[0], creator));
+				authExt.set(user, new SaslAuthenticator(user, parameters[0]));
 			else if (sasl->SendClientMessage(parameters) == false)	// IAL abort extension --nenolod
 			{
 				sasl->AnnounceState();
@@ -258,7 +284,7 @@ class ModuleSASL : public Module
 	void init()
 	{
 		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnEvent, I_OnUserRegister, I_OnRehash };
+		Implementation eventlist[] = { I_OnEvent, I_OnUserConnect, I_OnRehash };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 		ServiceProvider* providelist[] = { &auth, &sasl, &authExt };
@@ -273,7 +299,7 @@ class ModuleSASL : public Module
 		sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*");
 	}
 
-	ModResult OnUserRegister(LocalUser *user)
+	void OnUserConnect(LocalUser *user)
 	{
 		SaslAuthenticator *sasl_ = authExt.get(user);
 		if (sasl_)
@@ -281,13 +307,11 @@ class ModuleSASL : public Module
 			sasl_->Abort();
 			authExt.unset(user);
 		}
-
-		return MOD_RES_PASSTHRU;
 	}
 
 	Version GetVersion()
 	{
-		return Version("Provides support for IRC Authentication Layer (aka: atheme SASL) via AUTHENTICATE.",VF_VENDOR);
+		return Version("Provides support for IRC Authentication Layer (aka: SASL) via AUTHENTICATE.", VF_VENDOR);
 	}
 
 	void OnEvent(Event &ev)