-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006-2007 Dennis Friis <peavey@inspircd.org>
*
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * This file is part of InspIRCd. InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
*
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include "configreader.h"
-#include <algorithm>
-#include <dirent.h>
-#include <dlfcn.h>
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
-#include "xline.h"
-#include "socketengine.h"
-#include "socket.h"
-#include "command_parse.h"
-
-bool InspIRCd::ULine(const char* server)
-{
- if (!server)
- return false;
- if (!*server)
- return true;
-
- return (find(Config->ulines.begin(),Config->ulines.end(),server) != Config->ulines.end());
-}
-int InspIRCd::OperPassCompare(const char* data,const char* input)
-{
- int MOD_RESULT = 0;
- FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data,input))
- Log(DEBUG,"OperPassCompare: %d",MOD_RESULT);
- if (MOD_RESULT == 1)
- return 0;
- if (MOD_RESULT == -1)
- return 1;
- Log(DEBUG,"strcmp fallback: '%s' '%s' %d",data,input,strcmp(data,input));
- return strcmp(data,input);
-}
+#include "inspircd.h"
-long InspIRCd::Duration(const char* str)
+bool InspIRCd::PassCompare(Extensible* ex, const std::string& data, const std::string& input, const std::string& hashtype)
{
- char n_field[MAXBUF];
- long total = 0;
- n_field[0] = 0;
+ ModResult res;
+ FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
- if ((!strchr(str,'s')) && (!strchr(str,'m')) && (!strchr(str,'h')) && (!strchr(str,'d')) && (!strchr(str,'w')) && (!strchr(str,'y')))
- {
- std::string n = str;
- n += 's';
- return Duration(n.c_str());
- }
-
- for (char* i = (char*)str; *i; i++)
- {
- // if we have digits, build up a string for the value in n_field,
- // up to 10 digits in size.
- if ((*i >= '0') && (*i <= '9'))
- {
- strlcat(n_field,i,10);
- }
- else
- {
- // we dont have a digit, check for numeric tokens
- switch (tolower(*i))
- {
- case 's':
- total += atoi(n_field);
- break;
-
- case 'm':
- total += (atoi(n_field)*duration_m);
- break;
-
- case 'h':
- total += (atoi(n_field)*duration_h);
- break;
-
- case 'd':
- total += (atoi(n_field)*duration_d);
- break;
-
- case 'w':
- total += (atoi(n_field)*duration_w);
- break;
-
- case 'y':
- total += (atoi(n_field)*duration_y);
- break;
- }
- n_field[0] = 0;
- }
- }
- // add trailing seconds
- total += atoi(n_field);
-
- return total;
-}
-
-/* All other ircds when doing this check usually just look for a string of *@* or *. We're smarter than that, though. */
-
-bool InspIRCd::HostMatchesEveryone(const std::string &mask, userrec* user)
-{
- char buffer[MAXBUF];
- char itrigger[MAXBUF];
- long matches = 0;
-
- if (!Config->ConfValue(Config->config_data, "insane","trigger", 0, itrigger, MAXBUF))
- strlcpy(itrigger,"95.5",MAXBUF);
-
- if (Config->ConfValueBool(Config->config_data, "insane","hostmasks", 0))
- return false;
-
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- strlcpy(buffer,u->second->ident,MAXBUF);
- charlcat(buffer,'@',MAXBUF);
- strlcat(buffer,u->second->host,MAXBUF);
- if (match(buffer,mask.c_str()))
- matches++;
- }
- float percent = ((float)matches / (float)clientlist.size()) * 100;
- if (percent > (float)atof(itrigger))
- {
- WriteOpers("*** \2WARNING\2: %s tried to set a G/K/E line mask of %s, which covers %.2f%% of the network!",user->nick,mask.c_str(),percent);
+ /* Module matched */
+ if (res == MOD_RES_ALLOW)
return true;
- }
- return false;
-}
-bool InspIRCd::IPMatchesEveryone(const std::string &ip, userrec* user)
-{
- char itrigger[MAXBUF];
- long matches = 0;
-
- if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
- strlcpy(itrigger,"95.5",MAXBUF);
-
- if (Config->ConfValueBool(Config->config_data, "insane","ipmasks",0))
+ /* Module explicitly didnt match */
+ if (res == MOD_RES_DENY)
return false;
-
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (match(u->second->GetIPString(),ip.c_str(),true))
- matches++;
- }
-
- float percent = ((float)matches / (float)clientlist.size()) * 100;
- if (percent > (float)atof(itrigger))
- {
- WriteOpers("*** \2WARNING\2: %s tried to set a Z line mask of %s, which covers %.2f%% of the network!",user->nick,ip.c_str(),percent);
- return true;
- }
- return false;
-}
-bool InspIRCd::NickMatchesEveryone(const std::string &nick, userrec* user)
-{
- char itrigger[MAXBUF];
- long matches = 0;
-
- if (!Config->ConfValue(Config->config_data, "insane","trigger",0,itrigger,MAXBUF))
- strlcpy(itrigger,"95.5",MAXBUF);
-
- if (Config->ConfValueBool(Config->config_data, "insane","nickmasks",0))
+ /* We dont handle any hash types except for plaintext - Thanks tra26 */
+ if (!hashtype.empty() && hashtype != "plaintext")
return false;
- for (user_hash::iterator u = clientlist.begin(); u != clientlist.end(); u++)
- {
- if (match(u->second->nick,nick.c_str()))
- matches++;
- }
-
- float percent = ((float)matches / (float)clientlist.size()) * 100;
- if (percent > (float)atof(itrigger))
- {
- WriteOpers("*** \2WARNING\2: %s tried to set a Q line mask of %s, which covers %.2f%% of the network!",user->nick,nick.c_str(),percent);
- return true;
- }
- return false;
+ return (data == input);
}
-/* LoopCall is used to call a command classes handler repeatedly based on the contents of a comma seperated list.
- * There are two overriden versions of this method, one of which takes two potential lists and the other takes one.
- * We need a version which takes two potential lists for JOIN, because a JOIN may contain two lists of items at once,
- * the channel names and their keys as follows:
- * JOIN #chan1,#chan2,#chan3 key1,,key3
- * Therefore, we need to deal with both lists concurrently. The first instance of this method does that by creating
- * two instances of irc::commasepstream and reading them both together until the first runs out of tokens.
- * The second version is much simpler and just has the one stream to read, and is used in NAMES, WHOIS, PRIVMSG etc.
- * Both will only parse until they reach ServerInstance->Config->MaxTargets number of targets, to stop abuse via spam.
- */
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std::string>& parameters, unsigned int splithere, int extra, bool usemax)
{
- /* First check if we have more than one item in the list, if we don't we return zero here and the handler
+ if (splithere >= parameters.size())
+ return false;
+
+ /* First check if we have more than one item in the list, if we don't we return false here and the handler
* which called us just carries on as it was.
*/
- if (!strchr(parameters[splithere],','))
- return 0;
+ if (parameters[splithere].find(',') == std::string::npos)
+ return false;
/** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
- * By using std::map (thanks for the idea w00t) we can cut this down a ton.
+ * By using std::set (thanks for the idea w00t) we can cut this down a ton.
* ...VOOODOOOO!
+ *
+ * Only check for duplicates if there is one list (allow them in JOIN).
*/
- std::map<std::string, bool> dupes;
+ std::set<irc::string> dupes;
+ bool check_dupes = (extra < 0);
- /* Create two lists, one for channel names, one for keys
+ /* Create two sepstreams, if we have only one list, then initialize the second sepstream with
+ * an empty string. The second parameter of the constructor of the sepstream tells whether
+ * or not to allow empty tokens.
+ * We allow empty keys, so "JOIN #a,#b ,bkey" will be interpreted as "JOIN #a", "JOIN #b bkey"
*/
irc::commasepstream items1(parameters[splithere]);
- irc::commasepstream items2(parameters[extra]);
- std::string item = "*";
+ irc::commasepstream items2(extra >= 0 ? parameters[extra] : "", true);
+ std::string item;
unsigned int max = 0;
+ LocalUser* localuser = IS_LOCAL(user);
- /* Attempt to iterate these lists and call the command objech
- * which called us, for every parameter pair until there are
- * no more left to parse.
+ /* Attempt to iterate these lists and call the command handler
+ * for every parameter or parameter pair until there are no more
+ * left to parse.
*/
- while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
+ while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets))
{
- if (dupes.find(item) == dupes.end())
+ if ((!check_dupes) || (dupes.insert(item.c_str()).second))
{
- const char* new_parameters[127];
-
- for (int t = 0; (t < pcnt) && (t < 127); t++)
- new_parameters[t] = parameters[t];
-
- std::string extrastuff = items2.GetToken();
+ std::vector<std::string> new_parameters(parameters);
+ new_parameters[splithere] = item;
- new_parameters[splithere] = item.c_str();
- new_parameters[extra] = extrastuff.c_str();
-
- CommandObj->Handle(new_parameters,pcnt,user);
-
- dupes[item] = true;
- }
- }
- return 1;
-}
-
-int CommandParser::LoopCall(userrec* user, command_t* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
-{
- /* First check if we have more than one item in the list, if we don't we return zero here and the handler
- * which called us just carries on as it was.
- */
- if (!strchr(parameters[splithere],','))
- return 0;
-
- std::map<std::string, bool> dupes;
-
- /* Only one commasepstream here */
- ServerInstance->Log(DEBUG,"Splitting '%s'",parameters[splithere]);
- irc::commasepstream items1(parameters[splithere]);
- std::string item = "*";
- unsigned int max = 0;
-
- /* Parse the commasepstream until there are no tokens remaining.
- * Each token we parse out, call the command handler that called us
- * with it
- */
- while (((item = items1.GetToken()) != "") && (max++ < ServerInstance->Config->MaxTargets))
- {
- if (dupes.find(item) == dupes.end())
- {
- const char* new_parameters[127];
-
- for (int t = 0; (t < pcnt) && (t < 127); t++)
- new_parameters[t] = parameters[t];
-
- new_parameters[splithere] = item.c_str();
-
- parameters[splithere] = item.c_str();
- CommandObj->Handle(new_parameters,pcnt,user);
-
- dupes[item] = true;
- }
- }
- /* By returning 1 we tell our caller that nothing is to be done,
- * as all the previous calls handled the data. This makes the parent
- * return without doing any processing.
- */
- return 1;
-}
-
-bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, userrec * user)
-{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ if (extra >= 0)
+ {
+ // If we have two lists then get the next item from the second list.
+ // In case it runs out of elements then 'item' will be an empty string.
+ items2.GetToken(item);
+ new_parameters[extra] = item;
+ }
- if (n != cmdlist.end())
- {
- if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
- {
- if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
+ CmdResult result = handler->Handle(new_parameters, user);
+ if (localuser)
{
- if (n->second->flags_needed)
- {
- return ((user->HasPermission(commandname)) || (ServerInstance->ULine(user->server)));
- }
- return true;
+ // Run the OnPostCommand hook with the last parameter (original line) being empty
+ // to indicate that the command had more targets in its original form.
+ item.clear();
+ FOREACH_MOD(OnPostCommand, (handler, new_parameters, localuser, result, item));
}
}
}
- return false;
+
+ return true;
}
-command_t* CommandParser::GetHandler(const std::string &commandname)
+Command* CommandParser::GetHandler(const std::string &commandname)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ CommandMap::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
return n->second;
// calls a handler function for a command
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, userrec *user)
+CmdResult CommandParser::CallHandler(const std::string& commandname, const std::vector<std::string>& parameters, User* user, Command** cmd)
{
- nspace::hash_map<std::string,command_t*>::iterator n = cmdlist.find(commandname);
+ CommandMap::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
- if (pcnt >= n->second->min_params)
+ if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+ return CMD_INVALID;
+
+ if (parameters.size() >= n->second->min_params)
{
- if ((!n->second->flags_needed) || (user->modes[n->second->flags_needed-65]))
+ bool bOkay = false;
+
+ if (IS_LOCAL(user) && n->second->flags_needed)
{
- if (n->second->flags_needed)
- {
- if ((user->HasPermission(commandname)) || (!IS_LOCAL(user)))
- {
- return n->second->Handle(parameters,pcnt,user);
- }
- }
- else
+ /* if user is local, and flags are needed .. */
+
+ if (user->IsModeSet(n->second->flags_needed))
{
- return n->second->Handle(parameters,pcnt,user);
+ /* if user has the flags, and now has the permissions, go ahead */
+ if (user->HasPermission(commandname))
+ bOkay = true;
}
}
+ else
+ {
+ /* remote or no flags required anyway */
+ bOkay = true;
+ }
+
+ if (bOkay)
+ {
+ if (cmd)
+ *cmd = n->second;
+ return n->second->Handle(parameters,user);
+ }
}
}
return CMD_INVALID;
}
-void CommandParser::ProcessCommand(userrec *user, std::string &cmd)
+void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
{
- const char *command_p[127];
- int items = 0;
+ std::vector<std::string> command_p;
irc::tokenstream tokens(cmd);
- std::string command = tokens.GetToken();
+ std::string command, token;
+ tokens.GetToken(command);
- while (((para[items] = tokens.GetToken()) != "") && (items < 127))
- {
- command_p[items] = para[items].c_str();
- items++;
- }
+ /* A client sent a nick prefix on their command (ick)
+ * rhapsody and some braindead bouncers do this --
+ * the rfc says they shouldnt but also says the ircd should
+ * discard it if they do.
+ */
+ if (command[0] == ':')
+ tokens.GetToken(command);
+
+ while (tokens.GetToken(token))
+ command_p.push_back(token);
std::transform(command.begin(), command.end(), command.begin(), ::toupper);
-
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd));
- if (MOD_RESULT == 1) {
- return;
+
+ /* find the command, check it exists */
+ Command* handler = GetHandler(command);
+
+ /* Modify the user's penalty regardless of whether or not the command exists */
+ if (!user->HasPrivPermission("users/flood/no-throttle"))
+ {
+ // If it *doesn't* exist, give it a slightly heftier penalty than normal to deter flooding us crap
+ user->CommandFloodPenalty += handler ? handler->Penalty * 1000 : 2000;
}
- nspace::hash_map<std::string,command_t*>::iterator cm = cmdlist.find(command);
-
- if (cm != cmdlist.end())
+ if (!handler)
{
- if (user)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd));
+ if (MOD_RESULT == MOD_RES_DENY)
+ return;
+
+ /*
+ * This double lookup is in case a module (abbreviation) wishes to change a command.
+ * Sure, the double lookup is a bit painful, but bear in mind this only happens for unknowns anyway.
+ *
+ * Thanks dz for making me actually understand why this is necessary!
+ * -- w00t
+ */
+ handler = GetHandler(command);
+ if (!handler)
{
- /* activity resets the ping pending timer */
- user->nping = ServerInstance->Time() + user->pingmax;
- if (cm->second->flags_needed)
- {
- if (!user->IsModeSet(cm->second->flags_needed))
- {
- user->WriteServ("481 %s :Permission Denied- You do not have the required operator privilages",user->nick);
- return;
- }
- if (!user->HasPermission(command))
- {
- user->WriteServ("481 %s :Permission Denied- Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
- return;
- }
- }
- if ((user->registered == REG_ALL) && (!*user->oper) && (cm->second->IsDisabled()))
- {
- /* command is disabled! */
- user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
- return;
- }
- if (items < cm->second->min_params)
- {
- user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
- /* If syntax is given, display this as the 461 reply */
- if ((ServerInstance->Config->SyntaxHints) && (cm->second->syntax.length()))
- user->WriteServ("304 %s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
- return;
- }
- if ((user->registered == REG_ALL) || (cm->second->WorksBeforeReg()))
- {
- /* ikky /stats counters */
- cm->second->use_count++;
- cm->second->total_bytes += cmd.length();
-
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
- if (MOD_RESULT == 1)
- return;
-
- /*
- * WARNING: nothing may come after the
- * command handler call, as the handler
- * may free the user structure!
- */
- CmdResult result = cm->second->Handle(command_p,items,user);
-
- if (result != CMD_USER_DELETED)
- {
- FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
- }
- return;
- }
- else
- {
- user->WriteServ("451 %s :You have not registered",command.c_str());
- return;
- }
+ if (user->registered == REG_ALL)
+ user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :Unknown command",command.c_str());
+ ServerInstance->stats.Unknown++;
+ return;
}
}
- else if (user)
- {
- ServerInstance->stats->statsUnknown++;
- user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
- }
-}
-bool CommandParser::RemoveCommands(const char* source)
-{
- bool go_again = true;
-
- while (go_again)
+ // If we were given more parameters than max_params then append the excess parameter(s)
+ // to command_p[maxparams-1], i.e. to the last param that is still allowed
+ if (handler->max_params && command_p.size() > handler->max_params)
{
- go_again = false;
-
- for (nspace::hash_map<std::string,command_t*>::iterator i = cmdlist.begin(); i != cmdlist.end(); i++)
+ /*
+ * command_p input (assuming max_params 1):
+ * this
+ * is
+ * a
+ * test
+ */
+
+ // Iterator to the last parameter that will be kept
+ const std::vector<std::string>::iterator lastkeep = command_p.begin() + (handler->max_params - 1);
+ // Iterator to the first excess parameter
+ const std::vector<std::string>::iterator firstexcess = lastkeep + 1;
+
+ // Append all excess parameter(s) to the last parameter, seperated by spaces
+ for (std::vector<std::string>::const_iterator i = firstexcess; i != command_p.end(); ++i)
{
- command_t* x = i->second;
- if (x->source == std::string(source))
- {
- ServerInstance->Log(DEBUG,"removecommands(%s) Removing dependent command: %s",x->source.c_str(),x->command.c_str());
- cmdlist.erase(i);
- go_again = true;
- break;
- }
+ lastkeep->push_back(' ');
+ lastkeep->append(*i);
}
- }
-
- return true;
-}
-void CommandParser::ProcessBuffer(std::string &buffer,userrec *user)
-{
- std::string::size_type a;
+ // Erase the excess parameter(s)
+ command_p.erase(firstexcess, command_p.end());
+ }
- if (!user)
+ /*
+ * We call OnPreCommand here seperately if the command exists, so the magic above can
+ * truncate to max_params if necessary. -- w00t
+ */
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd));
+ if (MOD_RESULT == MOD_RES_DENY)
return;
- while ((a = buffer.rfind("\n")) != std::string::npos)
- buffer.erase(a);
- while ((a = buffer.rfind("\r")) != std::string::npos)
- buffer.erase(a);
+ /* activity resets the ping pending timer */
+ user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
- if (buffer.length())
+ if (handler->flags_needed)
{
- ServerInstance->Log(DEBUG,"CMDIN: %s %s",user->nick,buffer.c_str());
- this->ProcessCommand(user,buffer);
+ if (!user->IsModeSet(handler->flags_needed))
+ {
+ user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - You do not have the required operator privileges");
+ return;
+ }
+
+ if (!user->HasPermission(command))
+ {
+ user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - Oper type %s does not have access to command %s",
+ user->oper->name.c_str(), command.c_str());
+ return;
+ }
}
-}
-bool CommandParser::CreateCommand(command_t *f, void* so_handle)
-{
- if (so_handle)
+ if ((user->registered == REG_ALL) && (!user->IsOper()) && (handler->IsDisabled()))
{
- if (RFCCommands.find(f->command) == RFCCommands.end())
+ /* command is disabled! */
+ if (ServerInstance->Config->DisabledDontExist)
{
- RFCCommands[f->command] = so_handle;
- ServerInstance->Log(DEFAULT,"Monitoring RFC-specified reloadable command at %8x",so_handle);
+ user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :Unknown command", command.c_str());
}
else
{
- ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
- return false;
+ user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", command.c_str());
}
+
+ ServerInstance->SNO->WriteToSnoMask('a', "%s denied for %s (%s@%s)",
+ command.c_str(), user->nick.c_str(), user->ident.c_str(), user->host.c_str());
+ return;
}
- /* create the command and push it onto the table */
- if (cmdlist.find(f->command) == cmdlist.end())
+ if ((!command_p.empty()) && (command_p.back().empty()) && (!handler->allow_empty_last_param))
+ command_p.pop_back();
+
+ if (command_p.size() < handler->min_params)
{
- cmdlist[f->command] = f;
- ServerInstance->Log(DEBUG,"Added command %s (%lu parameters)",f->command.c_str(),(unsigned long)f->min_params);
- return true;
+ user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s :Not enough parameters.", command.c_str());
+ if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (handler->syntax.length()))
+ user->WriteNumeric(RPL_SYNTAX, ":SYNTAX %s %s", handler->name.c_str(), handler->syntax.c_str());
+ return;
+ }
+
+ if ((user->registered != REG_ALL) && (!handler->WorksBeforeReg()))
+ {
+ user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str());
+ }
+ else
+ {
+ /* passed all checks.. first, do the (ugly) stats counters. */
+ handler->use_count++;
+
+ /* module calls too */
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd));
+ if (MOD_RESULT == MOD_RES_DENY)
+ return;
+
+ /*
+ * WARNING: be careful, the user may be deleted soon
+ */
+ CmdResult result = handler->Handle(command_p, user);
+
+ FOREACH_MOD(OnPostCommand, (handler, command_p, user, result, cmd));
}
- else return false;
}
-CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
+void CommandParser::RemoveCommand(Command* x)
{
- para.resize(128);
- this->SetupCommandTable();
+ CommandMap::iterator n = cmdlist.find(x->name);
+ if (n != cmdlist.end() && n->second == x)
+ cmdlist.erase(n);
}
-bool CommandParser::FindSym(void** v, void* h)
+CommandBase::~CommandBase()
{
- *v = dlsym(h, "init_command");
- const char* err = dlerror();
- if (err)
- {
- ServerInstance->Log(SPARSE, "Error loading core command: %s\n", err);
- return false;
- }
- return true;
}
-bool CommandParser::ReloadCommand(const char* cmd)
+Command::~Command()
{
- char filename[MAXBUF];
- char commandname[MAXBUF];
- int y = 0;
-
- for (const char* x = cmd; *x; x++, y++)
- commandname[y] = toupper(*x);
+ ServerInstance->Parser.RemoveCommand(this);
+}
- commandname[y] = 0;
+void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
+{
+ if (buffer.empty())
+ return;
- SharedObjectList::iterator command = RFCCommands.find(commandname);
+ ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s",
+ user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
+ ProcessCommand(user,buffer);
+}
- if (command != RFCCommands.end())
+bool CommandParser::AddCommand(Command *f)
+{
+ /* create the command and push it onto the table */
+ if (cmdlist.find(f->name) == cmdlist.end())
{
- command_t* cmdptr = cmdlist.find(commandname)->second;
- cmdlist.erase(cmdlist.find(commandname));
-
- for (char* x = commandname; *x; x++)
- *x = tolower(*x);
-
-
- delete cmdptr;
- dlclose(command->second);
- RFCCommands.erase(command);
-
- snprintf(filename, MAXBUF, "cmd_%s.so", commandname);
- this->LoadCommand(filename);
-
+ cmdlist[f->name] = f;
return true;
}
-
return false;
}
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, userrec *user)
+CommandParser::CommandParser()
{
- user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
- if (ServerInstance->Parser->ReloadCommand(parameters[0]))
- {
- user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]);
- return CMD_SUCCESS;
- }
- else
- {
- user->WriteServ("NOTICE %s :*** Could not reload command '%s'", user->nick, parameters[0]);
- return CMD_FAILURE;
- }
}
-void CommandParser::LoadCommand(const char* name)
+std::string CommandParser::TranslateUIDs(const std::vector<TranslateType>& to, const std::vector<std::string>& source, bool prefix_final, CommandBase* custom_translator)
{
- char filename[MAXBUF];
- void* h;
- command_t* (*cmd_factory_func)(InspIRCd*);
+ std::vector<TranslateType>::const_iterator types = to.begin();
+ std::string dest;
+
+ for (unsigned int i = 0; i < source.size(); i++)
+ {
+ TranslateType t = TR_TEXT;
+ // They might supply less translation types than parameters,
+ // in that case pretend that all remaining types are TR_TEXT
+ if (types != to.end())
+ {
+ t = *types;
+ types++;
+ }
- snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
- ServerInstance->Log(DEBUG,"Load command: %s", filename);
+ bool last = (i == (source.size() - 1));
+ if (prefix_final && last)
+ dest.push_back(':');
- h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
+ TranslateSingleParam(t, source[i], dest, custom_translator, i);
- if (!h)
- {
- ServerInstance->Log(SPARSE, "Error loading core command: %s", dlerror());
- return;
+ if (!last)
+ dest.push_back(' ');
}
- if (this->FindSym((void **)&cmd_factory_func, h))
- {
- command_t* newcommand = cmd_factory_func(ServerInstance);
- this->CreateCommand(newcommand, h);
- }
+ return dest;
}
-void CommandParser::SetupCommandTable()
+void CommandParser::TranslateSingleParam(TranslateType to, const std::string& item, std::string& dest, CommandBase* custom_translator, unsigned int paramnumber)
{
- RFCCommands.clear();
-
- DIR* library = opendir(LIBRARYDIR);
- if (library)
+ switch (to)
{
- dirent* entry = NULL;
- while ((entry = readdir(library)))
+ case TR_NICK:
{
- if (match(entry->d_name, "cmd_*.so"))
+ /* Translate single nickname */
+ User* user = ServerInstance->FindNick(item);
+ if (user)
+ dest.append(user->uuid);
+ else
+ dest.append(item);
+ break;
+ }
+ case TR_CUSTOM:
+ {
+ if (custom_translator)
{
- this->LoadCommand(entry->d_name);
+ std::string translated = item;
+ custom_translator->EncodeParameter(translated, paramnumber);
+ dest.append(translated);
+ break;
}
+ // If no custom translator was given, fall through
}
- closedir(library);
+ case TR_TEXT:
+ default:
+ /* Do nothing */
+ dest.append(item);
+ break;
}
-
- this->CreateCommand(new cmd_reload(ServerInstance));
}
-