X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sasl.cpp;h=2fc0725a98a4e1007fa7bef2d499d370b0c74844;hb=4132a44396d8fa3d23f87b5cbea5b928aa09769f;hp=6e28a91aa4fa80980a64102a00e9a01bdc24340a;hpb=407b2e004cf66e442771ec5d2bbe700dee1f3760;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 6e28a91aa..2fc0725a9 100644
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,20 +23,21 @@
 #include "modules/account.h"
 #include "modules/sasl.h"
 #include "modules/ssl.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 enum
 {
 	// From IRCv3 sasl-3.1
 	RPL_SASLSUCCESS = 903,
 	ERR_SASLFAIL = 904,
+	ERR_SASLTOOLONG = 905,
 	ERR_SASLABORTED = 906,
 	RPL_SASLMECHS = 908
 };
 
 static std::string sasl_target;
 
-class ServerTracker : public SpanningTreeEventListener
+class ServerTracker : public ServerEventListener
 {
 	bool online;
 
@@ -64,7 +65,7 @@ class ServerTracker : public SpanningTreeEventListener
 
  public:
 	ServerTracker(Module* mod)
-		: SpanningTreeEventListener(mod)
+		: ServerEventListener(mod)
 	{
 		Reset();
 	}
@@ -142,8 +143,14 @@ enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 
 static Events::ModuleEventProvider* saslevprov;
 
-static void SendSASL(const parameterlist& params)
+static void SendSASL(LocalUser* user, const std::string& agent, char mode, const parameterlist& parameters)
 {
+	parameterlist params(parameters.size() + 3);
+	params.push_back(user->uuid);
+	params.push_back(agent);
+	params.push_back(ConvToStr(mode));
+	params.insert(params.end(), parameters.begin(), parameters.end());
+
 	if (!ServerInstance->PI->SendEncapsulatedData(sasl_target, "SASL", params))
 	{
 		FOREACH_MOD_CUSTOM(*saslevprov, SASLEventListener, OnSASLAuth, (params));
@@ -165,15 +172,11 @@ class SaslAuthenticator
 	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->GetRealHost());
 		params.push_back(user->GetIPString());
+		params.push_back(SSLIOHook::IsSSL(&user->eh) ? "S" : "P");
 
-		SendSASL(params);
+		SendSASL(user, "*", 'H', params);
 	}
 
  public:
@@ -183,16 +186,13 @@ class SaslAuthenticator
 		SendHostIP();
 
 		parameterlist params;
-		params.push_back(user->uuid);
-		params.push_back("*");
-		params.push_back("S");
 		params.push_back(method);
 
 		const std::string fp = SSLClientCert::GetFingerprint(&user->eh);
 		if (fp.size())
 			params.push_back(fp);
 
-		SendSASL(params);
+		SendSASL(user, "*", 'S', params);
 	}
 
 	SaslResult GetSaslResult(const std::string &result_)
@@ -250,14 +250,7 @@ class SaslAuthenticator
 		if (this->state != SASL_COMM)
 			return true;
 
-		parameterlist params;
-		params.push_back(this->user->uuid);
-		params.push_back(this->agent);
-		params.push_back("C");
-
-		params.insert(params.end(), parameters.begin(), parameters.end());
-
-		SendSASL(params);
+		SendSASL(this->user, this->agent, 'C', parameters);
 
 		if (parameters[0].c_str()[0] == '*')
 		{
@@ -295,6 +288,10 @@ class SaslAuthenticator
 
 class CommandAuthenticate : public SplitCommand
 {
+ private:
+	 // The maximum length of an AUTHENTICATE request.
+	 static const size_t MAX_AUTHENTICATE_SIZE = 400;
+
  public:
 	SimpleExtItem<SaslAuthenticator>& authExt;
 	Cap::Capability& cap;
@@ -307,7 +304,7 @@ class CommandAuthenticate : public SplitCommand
 		allow_empty_last_param = false;
 	}
 
-	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
+	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE
 	{
 		{
 			if (!cap.get(user))
@@ -316,6 +313,12 @@ class CommandAuthenticate : public SplitCommand
 			if (parameters[0].find(' ') != std::string::npos || parameters[0][0] == ':')
 				return CMD_FAILURE;
 
+			if (parameters[0].length() > MAX_AUTHENTICATE_SIZE)
+			{
+				user->WriteNumeric(ERR_SASLTOOLONG, "SASL message too long");
+				return CMD_FAILURE;
+			}
+
 			SaslAuthenticator *sasl = authExt.get(user);
 			if (!sasl)
 				authExt.set(user, new SaslAuthenticator(user, parameters[0]));
@@ -338,7 +341,7 @@ class CommandSASL : public Command
 		this->flags_needed = FLAG_SERVERONLY; // should not be called by users
 	}
 
-	CmdResult Handle(const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE
 	{
 		User* target = ServerInstance->FindUUID(parameters[1]);
 		if (!target)
@@ -360,7 +363,7 @@ class CommandSASL : public Command
 		return CMD_SUCCESS;
 	}
 
-	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters) CXX11_OVERRIDE
 	{
 		return ROUTE_BROADCAST;
 	}
@@ -395,7 +398,11 @@ class ModuleSASL : public Module
 
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		sasl_target = ServerInstance->Config->ConfValue("sasl")->getString("target", "*");
+		std::string target = ServerInstance->Config->ConfValue("sasl")->getString("target");
+		if (target.empty())
+			throw ModuleException("<sasl:target> must be set to the name of your services server!");
+
+		sasl_target = target;
 		servertracker.Reset();
 	}