Allow the maximum length of a chanfilter message to be configured.

[user/henk/code/inspircd.git] / src / modules / m_sasl.cpp

diff --git a/src/modules/m_sasl.cpp b/src/modules/m_sasl.cpp
index 64631a691fb713dee7fbf6d9560c979f0d138d2e..2fc0725a98a4e1007fa7bef2d499d370b0c74844 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -23,7 +23,7 @@
 #include "modules/account.h"
 #include "modules/sasl.h"
 #include "modules/ssl.h"
-#include "modules/spanningtree.h"
+#include "modules/server.h"
 
 enum
 {
@@ -37,7 +37,7 @@ enum
 
 static std::string sasl_target;
 
-class ServerTracker : public SpanningTreeEventListener
+class ServerTracker : public ServerEventListener
 {
        bool online;
 
@@ -65,7 +65,7 @@ class ServerTracker : public SpanningTreeEventListener
 
  public:
        ServerTracker(Module* mod)
-               : SpanningTreeEventListener(mod)
+               : ServerEventListener(mod)
        {
                Reset();
        }
@@ -143,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));
@@ -166,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:
@@ -184,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_)
@@ -251,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] == '*')
                {
@@ -312,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))
@@ -349,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)
@@ -371,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;
        }
@@ -406,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();
        }