* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
#include "inspircd.h"
-#include <vector>
+#include "wildcard.h"
/* $ModDesc: Provides aliases of commands. */
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()
ConfigReader MyConf(ServerInstance);
Aliases.clear();
+ AliasMap.clear();
for (int i = 0; i < MyConf.Enumerate("alias"); i++)
{
Alias a;
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;
}
}
public:
-
+
ModuleAlias(InspIRCd* Me)
- : Module::Module(Me)
+ : Module(Me)
{
ReadAliases();
- pars.resize(127);
- }
+ Me->Modules->Attach(I_OnPreCommand, this);
+ Me->Modules->Attach(I_OnRehash, this);
- void Implements(char* List)
- {
- List[I_OnPreCommand] = List[I_OnRehash] = 1;
}
virtual ~ModuleAlias()
virtual Version GetVersion()
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version(1,2,0,1,VF_VENDOR,API_VERSION);
}
std::string GetVar(std::string varname, const std::string &original_line)
int index = *(varname.begin()) - 48;
varname.erase(varname.begin());
bool everything_after = (varname == "-");
- std::string word = "";
-
- ServerInstance->Log(DEBUG,"Get var %d%s", index , everything_after ? " and all after it" : "");
+ std::string word;
for (int j = 0; j < index; j++)
- word = ss.GetToken();
+ ss.GetToken(word);
if (everything_after)
{
- std::string more = "*";
- while ((more = ss.GetToken()) != "")
+ std::string more;
+ while (ss.GetToken(more))
{
word.append(" ");
word.append(more);
}
}
- ServerInstance->Log(DEBUG,"Var is '%s'", word.c_str());
-
return word;
}
}
}
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+ virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *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
+ User *u = NULL;
+
+ /* 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)
{
- if ((Aliases[i].operonly) && (!*user->oper))
+ /* Does it match the pattern? */
+ if (!Aliases[i].format.empty())
+ {
+ if (!match(Aliases[i].case_sensitive, compare, Aliases[i].format))
+ continue;
+ }
+
+ if ((Aliases[i].operonly) && (!IS_OPER(user)))
return 0;
- if (Aliases[i].requires != "")
+ if (!Aliases[i].requires.empty())
{
u = ServerInstance->FindNick(Aliases[i].requires);
if (!u)
{
- user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
+ user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is currently unavailable. Please try again later.");
return 1;
}
}
- if ((u != NULL) && (Aliases[i].requires != "") && (Aliases[i].uline))
+ if ((u != NULL) && (!Aliases[i].requires.empty()) && (Aliases[i].uline))
{
if (!ServerInstance->ULine(u->server))
{
- ServerInstance->WriteOpers("*** NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
- user->WriteServ("401 "+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
+ ServerInstance->SNO->WriteToSnoMask('A', "NOTICE -- Service "+Aliases[i].requires+" required by alias "+std::string(Aliases[i].text.c_str())+" is not on a u-lined server, possibly underhanded antics detected!");
+ user->WriteNumeric(401, ""+std::string(user->nick)+" "+Aliases[i].requires+" :is an imposter! Please inform an IRC operator as soon as possible.");
return 1;
}
}
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()) != "")
+ std::string scommand;
+ while (commands.GetToken(scommand))
{
- ServerInstance->Log(DEBUG,"Execute: '%s'", command.c_str());
- DoCommand(command, user, original_line);
+ DoCommand(scommand, user, safe);
}
return 1;
}
return 0;
}
- void DoCommand(std::string newline, userrec* user, const std::string &original_line)
+ void DoCommand(std::string newline, User* user, const std::string &original_line)
{
for (int v = 1; v < 10; v++)
{
SearchAndReplace(newline, "$host", user->host);
SearchAndReplace(newline, "$vhost", user->dhost);
- irc::tokenstream ss(newline);
- const char* parv[127];
- int x = 0;
-
- while ((pars[x] = ss.GetToken()) != "")
- {
- parv[x] = pars[x].c_str();
- ServerInstance->Log(DEBUG,"Parameter %d: %s", x, parv[x]);
- x++;
- }
+ /* Unescape any variable names in the user text before sending */
+ SearchAndReplace(newline, "\r", "$");
- ServerInstance->Log(DEBUG,"Call command handler on %s", parv[0]);
+ irc::tokenstream ss(newline);
+ pars.clear();
+ std::string command, token;
- if (ServerInstance->Parser->CallHandler(parv[0], &parv[1], x-1, user) == CMD_INVALID)
- {
- ServerInstance->Log(DEBUG,"Unknown command or not enough parameters");
- }
- else
+ ss.GetToken(command);
+ while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
{
- ServerInstance->Log(DEBUG,"Command handler called successfully.");
+ pars.push_back(token);
}
+ ServerInstance->Parser->CallHandler(command, pars, user);
}
-
- virtual void OnRehash(const std::string ¶meter)
+
+ virtual void OnRehash(User* user, const std::string ¶meter)
{
ReadAliases();
}
};
-
-class ModuleAliasFactory : public ModuleFactory
-{
- public:
- ModuleAliasFactory()
- {
- }
-
- ~ModuleAliasFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleAlias(Me);
- }
-};
-
-
-extern "C" void * init_module( void )
-{
- return new ModuleAliasFactory;
-}
-
+MODULE_INIT(ModuleAlias)
projects / user / henk / code / inspircd.git / blobdiff