-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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>
*
- * 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/>.
*/
-/* $Core */
#include "inspircd.h"
-#include "xline.h"
-#include "socketengine.h"
-#include "socket.h"
-#include "command_parse.h"
-#include "exitcodes.h"
-
-/* Directory Searching for Unix-Only */
-#ifndef WIN32
-#include <dirent.h>
-#include <dlfcn.h>
-#endif
int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype)
{
- int MOD_RESULT = 0;
- FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
+ ModResult res;
+ FIRST_MOD_RESULT(OnPassCompare, res, (ex, data, input, hashtype));
/* Module matched */
- if (MOD_RESULT == 1)
+ if (res == MOD_RES_ALLOW)
return 0;
/* Module explicitly didnt match */
- if (MOD_RESULT == -1)
+ if (res == MOD_RES_DENY)
return 1;
/* We dont handle any hash types except for plaintext - Thanks tra26 */
- if (hashtype != "" && hashtype != "plaintext")
+ if (!hashtype.empty() && hashtype != "plaintext")
/* See below. 1 because they dont match */
return 1;
* 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(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, unsigned int extra)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, int extra, bool usemax)
{
if (splithere >= parameters.size())
return 0;
+ if (extra >= (signed)parameters.size())
+ extra = -1;
+
/* 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.
*/
/* Create two lists, one for channel names, one for keys
*/
irc::commasepstream items1(parameters[splithere]);
- irc::commasepstream items2(parameters[extra]);
+ irc::commasepstream items2(extra >= 0 ? parameters[extra] : "");
std::string extrastuff;
std::string item;
unsigned int max = 0;
* which called us, for every parameter pair until there are
* no more left to parse.
*/
- while (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets))
+ while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets))
{
if (dupes.find(item.c_str()) == dupes.end())
{
- std::vector<std::string> new_parameters;
-
- for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++)
- new_parameters.push_back(parameters[t]);
+ std::vector<std::string> new_parameters(parameters);
if (!items2.GetToken(extrastuff))
- extrastuff = "";
-
- new_parameters[splithere] = item.c_str();
- new_parameters[extra] = extrastuff.c_str();
-
- CommandObj->Handle(new_parameters, user);
-
- dupes.insert(item.c_str());
- }
- }
- return 1;
-}
-
-int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere)
-{
- if (splithere >= parameters.size())
- return 0;
-
- /* 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 (parameters[splithere].find(',') == std::string::npos)
- return 0;
-
- std::set<irc::string> dupes;
-
- /* Only one commasepstream here */
- 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 (items1.GetToken(item) && (max++ < ServerInstance->Config->MaxTargets))
- {
- if (dupes.find(item.c_str()) == dupes.end())
- {
- std::vector<std::string> new_parameters;
+ extrastuff.clear();
- for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++)
- new_parameters.push_back(parameters[t]);
+ new_parameters[splithere] = item;
+ if (extra >= 0)
+ new_parameters[extra] = extrastuff;
- new_parameters[splithere] = item.c_str();
-
- /* Execute the command handler. */
CommandObj->Handle(new_parameters, user);
dupes.insert(item.c_str());
}
}
- /* 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;
}
if (n != cmdlist.end())
{
- if ((pcnt >= n->second->min_params) && (n->second->source != "<core>"))
+ if ((pcnt >= n->second->min_params))
{
if (IS_LOCAL(user) && n->second->flags_needed)
{
if (n != cmdlist.end())
{
+ if ((!parameters.empty()) && (parameters.back().empty()) && (!n->second->allow_empty_last_param))
+ return CMD_INVALID;
+
if (parameters.size() >= n->second->min_params)
{
bool bOkay = false;
return CMD_INVALID;
}
-void CommandParser::DoLines(User* current, bool one_only)
-{
- while (current->BufferIsReady())
- {
- // use GetBuffer to copy single lines into the sanitized string
- std::string single_line = current->GetBuffer();
- current->bytes_in += single_line.length();
- current->cmds_in++;
- if (single_line.length() > MAXBUF - 2) // MAXBUF is 514 to allow for neccessary line terminators
- single_line.resize(MAXBUF - 2); // So to trim to 512 here, we use MAXBUF - 2
-
- // ProcessBuffer returns false if the user has gone over penalty
- if (!ServerInstance->Parser->ProcessBuffer(single_line, current) || one_only)
- break;
- }
-}
-
-bool CommandParser::ProcessCommand(User *user, std::string &cmd)
+bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
{
std::vector<std::string> command_p;
irc::tokenstream tokens(cmd);
/* find the command, check it exists */
Commandtable::iterator cm = cmdlist.find(command);
+ // Penalty to give if the command fails before the handler is executed
+ unsigned int failpenalty = 0;
+
+ /* Modify the user's penalty regardless of whether or not the command exists */
+ bool do_more = true;
+ 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
+ unsigned int penalty = (cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000);
+ user->CommandFloodPenalty += penalty;
+
+ // Increase their penalty later if we fail and the command has 0 penalty by default (i.e. in Command::Penalty) to
+ // throttle sending ERR_* from the command parser. If the command does have a non-zero penalty then this is not
+ // needed because we've increased their penalty above.
+ if (penalty == 0)
+ failpenalty = 1000;
+ }
+
+
if (cm == cmdlist.end())
{
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd));
- if (MOD_RESULT == 1)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd));
+ if (MOD_RESULT == MOD_RES_DENY)
return true;
/*
* a
* test
*/
- std::string lparam = "";
+ std::string lparam;
/*
* The '-1' here is a clever trick, we'll go backwards throwing everything into a temporary param
while (command_p.size() > (cm->second->max_params - 1))
{
// BE CAREFUL: .end() returns past the end of the vector, hence decrement.
- std::vector<std::string>::iterator it = --command_p.end();
+ std::vector<std::string>::iterator it = command_p.end() - 1;
lparam.insert(0, " " + *(it));
command_p.erase(it); // remove last element
* We call OnPreCommand here seperately if the command exists, so the magic above can
* truncate to max_params if necessary. -- w00t
*/
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd));
- if (MOD_RESULT == 1)
+ ModResult MOD_RESULT;
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, false, cmd));
+ if (MOD_RESULT == MOD_RES_DENY)
return true;
- /* Modify the user's penalty */
- bool do_more = true;
- if (!user->HasPrivPermission("users/flood/no-throttle"))
- {
- user->IncreasePenalty(cm->second->Penalty);
- do_more = (user->Penalty < 10);
- }
-
/* activity resets the ping pending timer */
- if (user->MyClass)
- user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+ user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
if (cm->second->flags_needed)
{
if (!user->IsModeSet(cm->second->flags_needed))
{
+ user->CommandFloodPenalty += failpenalty;
user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
return do_more;
}
if (!user->HasPermission(command))
{
- user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick.c_str(),user->oper.c_str(),command.c_str());
+ user->CommandFloodPenalty += failpenalty;
+ user->WriteNumeric(ERR_NOPRIVILEGES, "%s :Permission Denied - Oper type %s does not have access to command %s",
+ user->nick.c_str(), user->oper->NameStr(), command.c_str());
return do_more;
}
}
if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
{
/* command is disabled! */
+ user->CommandFloodPenalty += failpenalty;
if (ServerInstance->Config->DisabledDontExist)
{
user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s %s :Unknown command",user->nick.c_str(),command.c_str());
user->nick.c_str(), command.c_str());
}
- ServerInstance->SNO->WriteToSnoMask('t', "%s denied for %s (%s@%s)",
+ 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 do_more;
}
+
+ if ((!command_p.empty()) && (command_p.back().empty()) && (!cm->second->allow_empty_last_param))
+ command_p.pop_back();
+
if (command_p.size() < cm->second->min_params)
{
+ user->CommandFloodPenalty += failpenalty;
user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s %s :Not enough parameters.", user->nick.c_str(), command.c_str());
if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
- user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->command.c_str(), cm->second->syntax.c_str());
+ user->WriteNumeric(RPL_SYNTAX, "%s :SYNTAX %s %s", user->nick.c_str(), cm->second->name.c_str(), cm->second->syntax.c_str());
return do_more;
}
if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
{
- user->WriteNumeric(ERR_NOTREGISTERED, "%s :You have not registered",command.c_str());
+ user->CommandFloodPenalty += failpenalty;
+ user->WriteNumeric(ERR_NOTREGISTERED, "%s %s :You have not registered", user->nick.c_str(), command.c_str());
return do_more;
}
else
cm->second->total_bytes += cmd.length();
/* module calls too */
- MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, true, cmd));
- if (MOD_RESULT == 1)
+ FIRST_MOD_RESULT(OnPreCommand, MOD_RESULT, (command, command_p, user, true, cmd));
+ if (MOD_RESULT == MOD_RES_DENY)
return do_more;
/*
}
}
-void CommandParser::RemoveCommands(const char* source)
+void CommandParser::RemoveCommand(Command* x)
{
- Commandtable::iterator i,safei;
- for (i = cmdlist.begin(); i != cmdlist.end();)
- {
- safei = i;
- i++;
- RemoveCommand(safei, source);
- }
+ Commandtable::iterator n = cmdlist.find(x->name);
+ if (n != cmdlist.end() && n->second == x)
+ cmdlist.erase(n);
}
-void CommandParser::RemoveCommand(Commandtable::iterator safei, const char* source)
+Command::~Command()
{
- Command* x = safei->second;
- if (x->source == std::string(source))
- {
- cmdlist.erase(safei);
- delete x;
- }
+ ServerInstance->Parser->RemoveCommand(this);
}
-bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
+bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
{
- std::string::size_type a;
-
- if (!user)
+ if (!user || buffer.empty())
return true;
- while ((a = buffer.rfind("\n")) != std::string::npos)
- buffer.erase(a);
- while ((a = buffer.rfind("\r")) != std::string::npos)
- buffer.erase(a);
-
- if (buffer.length())
- {
- ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick.c_str(), buffer.c_str());
- return this->ProcessCommand(user,buffer);
- }
-
- return true;
+ ServerInstance->Logs->Log("USERINPUT", RAWIO, "C[%s] I :%s %s",
+ user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
+ return ProcessCommand(user,buffer);
}
-bool CommandParser::CreateCommand(Command *f, void* so_handle)
+bool CommandParser::AddCommand(Command *f)
{
- if (so_handle)
- {
- if (RFCCommands.find(f->command) == RFCCommands.end())
- RFCCommands[f->command] = so_handle;
- else
- {
- ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
- return false;
- }
- }
-
/* create the command and push it onto the table */
- if (cmdlist.find(f->command) == cmdlist.end())
+ if (cmdlist.find(f->name) == cmdlist.end())
{
- cmdlist[f->command] = f;
+ cmdlist[f->name] = f;
return true;
}
- else return false;
-}
-
-CommandParser::CommandParser(InspIRCd* Instance) : ServerInstance(Instance)
-{
- para.resize(128);
-}
-
-bool CommandParser::FindSym(void** v, void* h, const std::string &name)
-{
- *v = dlsym(h, "init_command");
- const char* err = dlerror();
- if (err && !(*v))
- {
- ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
- return false;
- }
- return true;
-}
-
-bool CommandParser::ReloadCommand(std::string cmd, User* user)
-{
- char filename[MAXBUF];
- std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper);
-
- SharedObjectList::iterator command = RFCCommands.find(cmd);
-
- if (command != RFCCommands.end())
- {
- Command* cmdptr = cmdlist.find(cmd)->second;
- cmdlist.erase(cmdlist.find(cmd));
-
- RFCCommands.erase(cmd);
- std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::tolower);
- delete cmdptr;
- dlclose(command->second);
- }
-
- snprintf(filename, MAXBUF, "cmd_%s.so", cmd.c_str());
- const char* err = this->LoadCommand(filename);
- if (err)
- {
- if (user)
- user->WriteServ("NOTICE %s :*** Error loading '%s': %s", user->nick.c_str(), filename, err);
- return false;
- }
- return true;
+ return false;
}
-CmdResult CommandReload::Handle(const std::vector<std::string>& parameters, User *user)
+CommandParser::CommandParser()
{
- if (parameters.size() < 1)
- return CMD_FAILURE;
-
- user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick.c_str(), parameters[0].c_str());
- if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
- {
- user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick.c_str(), parameters[0].c_str());
- ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick.c_str(), parameters[0].c_str());
- return CMD_SUCCESS;
- }
- else
- {
- user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick.c_str(), parameters[0].c_str());
- return CMD_FAILURE;
- }
}
-const char* CommandParser::LoadCommand(const char* name)
+int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest, bool prefix_final, Command* custom_translator)
{
- char filename[MAXBUF];
- void* h;
- Command* (*cmd_factory_func)(InspIRCd*);
-
- /* Command already exists? Succeed silently - this is needed for REHASH */
- if (RFCCommands.find(name) != RFCCommands.end())
- {
- ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
- return NULL;
- }
-
- snprintf(filename, MAXBUF, "%s/%s", LIBRARYDIR, name);
- h = dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
-
- if (!h)
- {
- const char* n = dlerror();
- ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n);
- return n;
- }
+ std::vector<TranslateType>::const_iterator types = to.begin();
+ User* user = NULL;
+ unsigned int i;
+ int translations = 0;
+ dest.clear();
- if (this->FindSym((void **)&cmd_factory_func, h, name))
+ for(i=0; i < source.size(); i++)
{
- Command* newcommand = cmd_factory_func(ServerInstance);
- this->CreateCommand(newcommand, h);
- }
- return NULL;
-}
-
-/** This is only invoked on startup
- */
-void CommandParser::SetupCommandTable()
-{
- printf("\nLoading core commands");
- fflush(stdout);
+ TranslateType t;
+ std::string item = source[i];
- DIR* library = opendir(LIBRARYDIR);
- if (library)
- {
- dirent* entry = NULL;
- while (0 != (entry = readdir(library)))
+ if (types == to.end())
+ t = TR_TEXT;
+ else
{
- if (InspIRCd::Match(entry->d_name, "cmd_*.so", ascii_case_insensitive_map))
- {
- printf(".");
- fflush(stdout);
-
- const char* err = this->LoadCommand(entry->d_name);
- if (err)
- {
- printf("Error loading %s: %s", entry->d_name, err);
- exit(EXIT_STATUS_BADHANDLER);
- }
- }
+ t = *types;
+ types++;
}
- closedir(library);
- printf("\n");
- }
-
- if (cmdlist.find("RELOAD") == cmdlist.end())
- this->CreateCommand(new CommandReload(ServerInstance));
-}
-int CommandParser::TranslateUIDs(const std::deque<TranslateType> to, const std::deque<std::string> &source, std::string &dest)
-{
- std::deque<std::string>::const_iterator items = source.begin();
- std::deque<TranslateType>::const_iterator types = to.begin();
- User* user = NULL;
- int translations = 0;
- dest.clear();
-
- while (items != source.end() && types != to.end())
- {
- TranslateType t = *types;
- std::string item = *items;
- types++;
- items++;
+ if (prefix_final && i == source.size() - 1)
+ dest.append(":");
switch (t)
{
else
dest.append(item);
break;
+ case TR_CUSTOM:
+ if (custom_translator)
+ custom_translator->EncodeParameter(item, i);
+ dest.append(item);
break;
case TR_END:
case TR_TEXT:
dest.append(item);
break;
}
- dest.append(" ");
+ if (i != source.size() - 1)
+ dest.append(" ");
}
- if (!dest.empty())
- dest.erase(dest.end() - 1);
return translations;
}
int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
{
User* user = NULL;
- std::string item;
int translations = 0;
dest.clear();
projects / user / henk / code / inspircd.git / blobdiff