Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 7695b6f626143091709999b8a13dc6741a1a323c..3893ad5bf3b22df33072b95a18000a3782669b9a 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -15,6 +15,7 @@
 #include "channels.h"
 #include "modules.h"
 #include "inspircd.h"
+#include "wildcard.h"
 #include <vector>
 
 /* $ModDesc: Provides aliases of commands. */
@@ -34,12 +35,18 @@ class Alias : public classbase
        bool uline;
        /** Requires oper? */
        bool operonly;
+       /* is case sensitive params */
+       bool case_sensitive;
+       /** Format that must be matched for use */
+       std::string format;
 };
 
 class ModuleAlias : public Module
 {
  private:
+       /** We cant use a map, there may be multiple aliases with the same name */
        std::vector<Alias> Aliases;
+       std::map<std::string, int> AliasMap;
        std::vector<std::string> pars;
 
        virtual void ReadAliases()
@@ -47,6 +54,7 @@ class ModuleAlias : public Module
                ConfigReader MyConf(ServerInstance);
 
                Aliases.clear();
+               AliasMap.clear();
                for (int i = 0; i < MyConf.Enumerate("alias"); i++)
                {
                        Alias a;
@@ -57,7 +65,10 @@ class ModuleAlias : public Module
                        a.requires = MyConf.ReadValue("alias", "requires", i);
                        a.uline = MyConf.ReadFlag("alias", "uline", i);
                        a.operonly = MyConf.ReadFlag("alias", "operonly", i);
+                       a.format = MyConf.ReadValue("alias", "format", i);
+                       a.case_sensitive = MyConf.ReadFlag("alias", "matchcase", i);
                        Aliases.push_back(a);
+                       AliasMap[txt] = 1;
                }
        }
 
@@ -93,8 +104,6 @@ class ModuleAlias : public Module
                bool everything_after = (varname == "-");
                std::string word = "";
 
-               ServerInstance->Log(DEBUG,"Get var %d%s", index , everything_after ? " and all after it" : "");
-
                for (int j = 0; j < index; j++)
                        word = ss.GetToken();
 
@@ -108,8 +117,6 @@ class ModuleAlias : public Module
                        }
                }
 
-               ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
-
                return word;
        }
 
@@ -127,18 +134,40 @@ class ModuleAlias : public Module
        virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
        {
                userrec *u = NULL;
-               irc::string c = command.c_str();
-               /* If the command is valid, we dont want to know,
-                * and if theyre not registered yet, we dont want
-                * to know either
+
+               /* If theyre not registered yet, we dont want
+                * to know.
                 */
-               if ((validated) || (user->registered != REG_ALL))
+               if (user->registered != REG_ALL)
+                       return 0;
+
+               /* We dont have any commands looking like this, dont bother with the loop */
+               if (AliasMap.find(command) == AliasMap.end())
                        return 0;
-               
+
+               irc::string c = command.c_str();
+               /* The parameters for the command in their original form, with the command stripped off */
+               std::string compare = original_line.substr(command.length());
+               while (*(compare.c_str()) == ' ')
+                       compare.erase(compare.begin());
+
+               std::string safe(original_line);
+
+               /* Escape out any $ symbols in the user provided text */
+
+               SearchAndReplace(safe, "$", "\r");
+
                for (unsigned int i = 0; i < Aliases.size(); i++)
                {
                        if (Aliases[i].text == c)
                        {
+                               /* Does it match the pattern? */
+                               if (!Aliases[i].format.empty())
+                               {
+                                       if (!match(Aliases[i].case_sensitive, compare.c_str(), Aliases[i].format.c_str()))
+                                               continue;
+                               }
+
                                if ((Aliases[i].operonly) && (!*user->oper))
                                        return 0;
 
@@ -167,19 +196,16 @@ class ModuleAlias : public Module
 
                                if (crlf == std::string::npos)
                                {
-                                       ServerInstance->Log(DEBUG,"Single line alias: '%s'", Aliases[i].replace_with.c_str());
-                                       DoCommand(Aliases[i].replace_with, user, original_line);
+                                       DoCommand(Aliases[i].replace_with, user, safe);
                                        return 1;
                                }
                                else
                                {
-                                       ServerInstance->Log(DEBUG,"Multi line alias: '%s'", Aliases[i].replace_with.c_str());
                                        irc::sepstream commands(Aliases[i].replace_with, '\n');
                                        std::string command = "*";
                                        while ((command = commands.GetToken()) != "")
                                        {
-                                               ServerInstance->Log(DEBUG,"Execute: '%s'", command.c_str());
-                                               DoCommand(command, user, original_line);
+                                               DoCommand(command, user, safe);
                                        }
                                        return 1;
                                }
@@ -222,30 +248,23 @@ class ModuleAlias : public Module
                SearchAndReplace(newline, "$host", user->host);
                SearchAndReplace(newline, "$vhost", user->dhost);
 
+               /* Unescape any variable names in the user text before sending */
+               SearchAndReplace(newline, "\r", "$");
+
                irc::tokenstream ss(newline);
                const char* parv[127];
                int x = 0;
 
-               while ((pars[x] = ss.GetToken()) != "")
+               while (ss.GetToken(pars[x]))
                {
                        parv[x] = pars[x].c_str();
-                       ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
                        x++;
                }
 
-               ServerInstance->Log(DEBUG,"Call command handler on %s", parv[0]);
-
-               if (ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID)
-               {
-                       ServerInstance->Log(DEBUG,"Unknown command or not enough parameters");
-               }
-               else
-               {
-                       ServerInstance->Log(DEBUG,"Command handler called successfully.");
-               }
+               ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user);
        }
  
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                ReadAliases();
        }