Merge pull request #1168 from SaberUK/master+fix-configure-cache-parser

[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 c96b8703400c75ebd3d4bc66ddf3fbff0730692f..639fe677863ece5a76dd5c39448393298cce6813 100644 (file)
--- a/src/modules/m_sasl.cpp
+++ b/src/modules/m_sasl.cpp
@@ -24,6 +24,41 @@
 #include "modules/sasl.h"
 #include "modules/ssl.h"
 
+class SASLCap : public Cap::Capability
+{
+       std::string mechlist;
+
+       bool OnRequest(LocalUser* user, bool adding) CXX11_OVERRIDE
+       {
+               // Requesting this cap is allowed anytime
+               if (adding)
+                       return true;
+
+               // But removing it can only be done when unregistered
+               return (user->registered != REG_ALL);
+       }
+
+       const std::string* GetValue(LocalUser* user) const CXX11_OVERRIDE
+       {
+               return &mechlist;
+       }
+
+ public:
+       SASLCap(Module* mod)
+               : Cap::Capability(mod, "sasl")
+       {
+       }
+
+       void SetMechlist(const std::string& newmechlist)
+       {
+               if (mechlist == newmechlist)
+                       return;
+
+               mechlist = newmechlist;
+               NotifyValueChange();
+       }
+};
+
 enum SaslState { SASL_INIT, SASL_COMM, SASL_DONE };
 enum SaslResult { SASL_OK, SASL_FAIL, SASL_ABORT };
 
@@ -96,6 +131,9 @@ class SaslAuthenticator
                        if (msg[0] != this->agent)
                                return this->state;
 
+                       if (msg.size() < 4)
+                               return this->state;
+
                        if (msg[2] == "C")
                                this->user->Write("AUTHENTICATE %s", msg[3].c_str());
                        else if (msg[2] == "D")
@@ -104,7 +142,7 @@ class SaslAuthenticator
                                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());
+                               this->user->WriteNumeric(908, msg[3], "are available SASL mechanisms");
                        else
                                ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Services sent an unknown SASL message \"%s\" \"%s\"", msg[2].c_str(), msg[3].c_str());
 
@@ -156,13 +194,13 @@ class SaslAuthenticator
                switch (this->result)
                {
                 case SASL_OK:
-                       this->user->WriteNumeric(903, ":SASL authentication successful");
+                       this->user->WriteNumeric(903, "SASL authentication successful");
                        break;
                 case SASL_ABORT:
-                       this->user->WriteNumeric(906, ":SASL authentication aborted");
+                       this->user->WriteNumeric(906, "SASL authentication aborted");
                        break;
                 case SASL_FAIL:
-                       this->user->WriteNumeric(904, ":SASL authentication failed");
+                       this->user->WriteNumeric(904, "SASL authentication failed");
                        break;
                 default:
                        break;
@@ -176,8 +214,8 @@ class CommandAuthenticate : public Command
 {
  public:
        SimpleExtItem<SaslAuthenticator>& authExt;
-       GenericCap& cap;
-       CommandAuthenticate(Module* Creator, SimpleExtItem<SaslAuthenticator>& ext, GenericCap& Cap)
+       Cap::Capability& cap;
+       CommandAuthenticate(Module* Creator, SimpleExtItem<SaslAuthenticator>& ext, Cap::Capability& Cap)
                : Command(Creator, "AUTHENTICATE", 1), authExt(ext), cap(Cap)
        {
                works_before_reg = true;
@@ -185,10 +223,8 @@ class CommandAuthenticate : public Command
 
        CmdResult Handle (const std::vector<std::string>& parameters, User *user)
        {
-               /* Only allow AUTHENTICATE on unregistered clients */
-               if (user->registered != REG_ALL)
                {
-                       if (!cap.ext.get(user))
+                       if (!cap.get(user))
                                return CMD_FAILURE;
 
                        SaslAuthenticator *sasl = authExt.get(user);
@@ -215,8 +251,8 @@ class CommandSASL : public Command
 
        CmdResult Handle(const std::vector<std::string>& parameters, User *user)
        {
-               User* target = ServerInstance->FindNick(parameters[1]);
-               if ((!target) || (IS_SERVER(target)))
+               User* target = ServerInstance->FindUUID(parameters[1]);
+               if (!target)
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User not found in sasl ENCAP event: %s", parameters[1].c_str());
                        return CMD_FAILURE;
@@ -244,7 +280,7 @@ class CommandSASL : public Command
 class ModuleSASL : public Module
 {
        SimpleExtItem<SaslAuthenticator> authExt;
-       GenericCap cap;
+       SASLCap cap;
        CommandAuthenticate auth;
        CommandSASL sasl;
        Events::ModuleEventProvider sasleventprov;
@@ -252,7 +288,7 @@ class ModuleSASL : public Module
  public:
        ModuleSASL()
                : authExt("sasl_auth", ExtensionItem::EXT_USER, this)
-               , cap(this, "sasl")
+               , cap(this)
                , auth(this, authExt, cap)
                , sasl(this, authExt)
                , sasleventprov(this, "event/sasl")
@@ -283,9 +319,15 @@ class ModuleSASL : public Module
                return MOD_RES_PASSTHRU;
        }
 
+       void OnDecodeMetaData(Extensible* target, const std::string& extname, const std::string& extdata) CXX11_OVERRIDE
+       {
+               if ((target == NULL) && (extname == "saslmechlist"))
+                       cap.SetMechlist(extdata);
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
-               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);
        }
 };