* | 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
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
+/* $Core: libIRCDcommand_parse */
+
#include "inspircd.h"
#include "wildcard.h"
#include "xline.h"
#include <dlfcn.h>
#endif
-bool InspIRCd::ULine(const char* server)
-{
- if (!server)
- return false;
- if (!*server)
- return true;
-
- return (Config->ulines.find(server) != Config->ulines.end());
-}
-
-bool InspIRCd::SilentULine(const char* server)
-{
- std::map<irc::string,bool>::iterator n = Config->ulines.find(server);
- if (n != Config->ulines.end())
- return n->second;
- else return false;
-}
-
-int InspIRCd::OperPassCompare(const char* data,const char* input, int tagnumber)
+int InspIRCd::PassCompare(Extensible* ex, const char* data,const char* input, const char* hashtype)
{
int MOD_RESULT = 0;
- FOREACH_RESULT_I(this,I_OnOperCompare,OnOperCompare(data, input, tagnumber))
+ FOREACH_RESULT_I(this,I_OnPassCompare,OnPassCompare(ex, data, input, hashtype))
if (MOD_RESULT == 1)
return 0;
if (MOD_RESULT == -1)
return strcmp(data,input);
}
-std::string InspIRCd::TimeString(time_t curtime)
-{
- return std::string(ctime(&curtime),24);
-}
-
/* 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 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 char** parameters, int pcnt, unsigned int splithere, unsigned int extra)
+int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector<std::string>& parameters, unsigned int splithere, unsigned int extra)
{
+ 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 (!strchr(parameters[splithere],','))
+ if (parameters[splithere].find(',') == std::string::npos)
return 0;
/** Some lame ircds will weed out dupes using some shitty O(n^2) algorithm.
{
if (dupes.find(item.c_str()) == dupes.end())
{
- const char* new_parameters[MAXPARAMETERS];
+ std::vector<std::string> new_parameters;
- for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++)
- new_parameters[t] = parameters[t];
+ for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++)
+ new_parameters.push_back(parameters[t]);
if (!items2.GetToken(extrastuff))
extrastuff = "";
new_parameters[splithere] = item.c_str();
new_parameters[extra] = extrastuff.c_str();
- CommandObj->Handle(new_parameters,pcnt,user);
+ CommandObj->Handle(new_parameters, user);
dupes[item.c_str()] = true;
}
return 1;
}
-int CommandParser::LoopCall(User* user, Command* CommandObj, const char** parameters, int pcnt, unsigned int splithere)
+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 (!strchr(parameters[splithere],','))
+ if (parameters[splithere].find(',') == std::string::npos)
return 0;
std::map<irc::string, bool> dupes;
{
if (dupes.find(item.c_str()) == dupes.end())
{
- const char* new_parameters[MAXPARAMETERS];
+ std::vector<std::string> new_parameters;
- for (int t = 0; (t < pcnt) && (t < MAXPARAMETERS); t++)
- new_parameters[t] = parameters[t];
+ for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++)
+ new_parameters.push_back(parameters[t]);
new_parameters[splithere] = item.c_str();
- parameters[splithere] = item.c_str();
-
/* Execute the command handler over and over. If someone pulls our user
* record out from under us (e.g. if we /kill a comma sep list, and we're
* in that list ourselves) abort if we're gone.
*/
- CommandObj->Handle(new_parameters,pcnt,user);
+ CommandObj->Handle(new_parameters, user);
dupes[item.c_str()] = true;
}
return 1;
}
-bool CommandParser::IsValidCommand(const std::string &commandname, int pcnt, User * user)
+bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user)
{
Commandable::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
- if ((pcnt>=n->second->min_params) && (n->second->source != "<core>"))
+ if ((pcnt >= n->second->min_params) && (n->second->source != "<core>"))
{
if (IS_LOCAL(user) && n->second->flags_needed)
{
// calls a handler function for a command
-CmdResult CommandParser::CallHandler(const std::string &commandname,const char** parameters, int pcnt, User *user)
+CmdResult CommandParser::CallHandler(const std::string &commandname, const std::vector<std::string>& parameters, User *user)
{
Commandable::iterator n = cmdlist.find(commandname);
if (n != cmdlist.end())
{
- if (pcnt >= n->second->min_params)
+ if (parameters.size() >= n->second->min_params)
{
bool bOkay = false;
if (bOkay)
{
- return n->second->Handle(parameters,pcnt,user);
+ return n->second->Handle(parameters,user);
}
}
}
return CMD_INVALID;
}
-void CommandParser::ProcessCommand(User *user, std::string &cmd)
+void CommandParser::DoLines(User* current, bool one_only)
+{
+ // while there are complete lines to process...
+ unsigned int floodlines = 0;
+
+ while (current->BufferIsReady())
+ {
+ if (current->MyClass)
+ {
+ if (ServerInstance->Time() > current->reset_due)
+ {
+ current->reset_due = ServerInstance->Time() + current->MyClass->GetThreshold();
+ current->lines_in = 0;
+ }
+
+ if (++current->lines_in > current->MyClass->GetFlood() && current->MyClass->GetFlood())
+ {
+ ServerInstance->FloodQuitUser(current);
+ return;
+ }
+
+ if ((++floodlines > current->MyClass->GetFlood()) && (current->MyClass->GetFlood() != 0))
+ {
+ ServerInstance->FloodQuitUser(current);
+ return;
+ }
+ }
+
+ // 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)
{
- const char *command_p[MAXPARAMETERS];
- int items = 0;
+ std::vector<std::string> command_p;
irc::tokenstream tokens(cmd);
- std::string command;
+ std::string command, token;
tokens.GetToken(command);
/* A client sent a nick prefix on their command (ick)
* the rfc says they shouldnt but also says the ircd should
* discard it if they do.
*/
- if (*command.c_str() == ':')
+ if (command[0] == ':')
tokens.GetToken(command);
- while (tokens.GetToken(para[items]) && (items < MAXPARAMETERS))
- {
- command_p[items] = para[items].c_str();
- items++;
- }
+ while (tokens.GetToken(token) && (command_p.size() <= MAXPARAMETERS))
+ 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));
+ FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command, command_p, user, false, cmd));
if (MOD_RESULT == 1) {
- return;
+ return true;
}
+ /* find the command, check it exists */
Commandable::iterator cm = cmdlist.find(command);
- if (cm != cmdlist.end())
+ if (cm == cmdlist.end())
{
- if (user)
+ if (user->registered == REG_ALL)
{
- /* 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 privileges",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) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
- {
- /* command is disabled! */
- user->WriteServ("421 %s %s :This command has been disabled.",user->nick,command.c_str());
- ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
- command.c_str(), user->nick, user->ident, user->host);
- return;
- }
- if (items < cm->second->min_params)
- {
- user->WriteServ("461 %s %s :Not enough parameters.", user->nick, command.c_str());
- if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (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();
+ user->WriteNumeric(421, "%s %s :Unknown command",user->nick,command.c_str());
+ }
+ ServerInstance->stats->statsUnknown++;
+ return true;
+ }
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
- if (MOD_RESULT == 1)
- return;
+ /* Modify the user's penalty */
+ bool do_more = true;
+ if (!user->ExemptFromPenalty)
+ {
+ user->IncreasePenalty(cm->second->Penalty);
+ do_more = (user->Penalty < 10);
+ if (!do_more)
+ user->OverPenalty = true;
+ }
- /*
- * WARNING: be careful, the user may be deleted soon
- */
- CmdResult result = cm->second->Handle(command_p,items,user);
+ /* activity resets the ping pending timer */
+ if (user->MyClass)
+ user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
- 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 (cm->second->flags_needed)
+ {
+ if (!user->IsModeSet(cm->second->flags_needed))
+ {
+ user->WriteNumeric(481, "%s :Permission Denied - You do not have the required operator privileges",user->nick);
+ return do_more;
+ }
+ if (!user->HasPermission(command))
+ {
+ user->WriteNumeric(481, "%s :Permission Denied - Oper type %s does not have access to command %s",user->nick,user->oper,command.c_str());
+ return do_more;
}
}
- else if (user)
+ if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled()))
{
- ServerInstance->stats->statsUnknown++;
- user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+ /* command is disabled! */
+ user->WriteNumeric(421, "%s %s :This command has been disabled.",user->nick,command.c_str());
+ ServerInstance->SNO->WriteToSnoMask('d', "%s denied for %s (%s@%s)",
+ command.c_str(), user->nick, user->ident, user->host);
+ return do_more;
+ }
+ if (command_p.size() < cm->second->min_params)
+ {
+ user->WriteNumeric(461, "%s %s :Not enough parameters.", user->nick, command.c_str());
+ if ((ServerInstance->Config->SyntaxHints) && (user->registered == REG_ALL) && (cm->second->syntax.length()))
+ user->WriteNumeric(304, "%s :SYNTAX %s %s", user->nick, cm->second->command.c_str(), cm->second->syntax.c_str());
+ return do_more;
+ }
+ if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
+ {
+ user->WriteNumeric(451, "%s :You have not registered",command.c_str());
+ return do_more;
+ }
+ else
+ {
+ /* passed all checks.. first, do the (ugly) stats counters. */
+ cm->second->use_count++;
+ 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)
+ return do_more;
+
+ /*
+ * WARNING: be careful, the user may be deleted soon
+ */
+ CmdResult result = cm->second->Handle(command_p, user);
+
+ FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, user, result,cmd));
+ return do_more;
}
}
-bool CommandParser::RemoveCommands(const char* source)
+void CommandParser::RemoveCommands(const char* source)
{
Commandable::iterator i,safei;
- for (i = cmdlist.begin(); i != cmdlist.end(); i++)
+ for (i = cmdlist.begin(); i != cmdlist.end();)
{
safei = i;
- safei++;
- if (safei != cmdlist.end())
- {
- RemoveCommand(safei, source);
- }
- }
- safei = cmdlist.begin();
- if (safei != cmdlist.end())
- {
+ i++;
RemoveCommand(safei, source);
}
- return true;
}
void CommandParser::RemoveCommand(Commandable::iterator safei, const char* source)
}
}
-void CommandParser::ProcessBuffer(std::string &buffer,User *user)
+bool CommandParser::ProcessBuffer(std::string &buffer,User *user)
{
std::string::size_type a;
if (!user)
- return;
+ return true;
while ((a = buffer.rfind("\n")) != std::string::npos)
buffer.erase(a);
if (buffer.length())
{
- if (!user->muted)
- {
- ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
- this->ProcessCommand(user,buffer);
- }
+ ServerInstance->Logs->Log("USERINPUT", DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
+ return this->ProcessCommand(user,buffer);
}
+
+ return true;
}
bool CommandParser::CreateCommand(Command *f, void* so_handle)
RFCCommands[f->command] = so_handle;
else
{
- ServerInstance->Log(DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
+ ServerInstance->Logs->Log("COMMAND",DEFAULT,"ERK! Somehow, we loaded a cmd_*.so file twice! Only the first instance is being recorded.");
return false;
}
}
const char* err = dlerror();
if (err && !(*v))
{
- ServerInstance->Log(SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
+ ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s\n", name.c_str(), err);
return false;
}
return true;
}
-bool CommandParser::ReloadCommand(const char* cmd, User* user)
+bool CommandParser::ReloadCommand(std::string cmd, User* user)
{
char filename[MAXBUF];
- char commandname[MAXBUF];
- int y = 0;
+ std::transform(cmd.begin(), cmd.end(), cmd.begin(), ::toupper);
- for (const char* x = cmd; *x; x++, y++)
- commandname[y] = toupper(*x);
-
- commandname[y] = 0;
-
- SharedObjectList::iterator command = RFCCommands.find(commandname);
+ SharedObjectList::iterator command = RFCCommands.find(cmd);
if (command != RFCCommands.end())
{
- Command* cmdptr = cmdlist.find(commandname)->second;
- cmdlist.erase(cmdlist.find(commandname));
-
- for (char* x = commandname; *x; x++)
- *x = tolower(*x);
-
+ 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);
- RFCCommands.erase(command);
- snprintf(filename, MAXBUF, "cmd_%s.so", commandname);
+ 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 'cmd_%s.so': %s", user->nick, cmd, err);
+ user->WriteServ("NOTICE %s :*** Error loading 'cmd_%s.so': %s", user->nick, cmd.c_str(), err);
return false;
}
return false;
}
-CmdResult cmd_reload::Handle(const char** parameters, int pcnt, User *user)
+CmdResult cmd_reload::Handle(const std::vector<std::string>& parameters, User *user)
{
- user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0]);
+ if (parameters.size() < 1)
+ return CMD_FAILURE;
+
+ user->WriteServ("NOTICE %s :*** Reloading command '%s'",user->nick, parameters[0].c_str());
if (ServerInstance->Parser->ReloadCommand(parameters[0], user))
{
- user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0]);
- ServerInstance->WriteOpers("*** RELOAD: %s reloaded the '%s' command.", user->nick, parameters[0]);
+ user->WriteServ("NOTICE %s :*** Successfully reloaded command '%s'", user->nick, parameters[0].c_str());
+ ServerInstance->SNO->WriteToSnoMask('A', "RELOAD: %s reloaded the '%s' command.", user->nick, 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, parameters[0]);
+ user->WriteServ("NOTICE %s :*** Could not reload command '%s' -- fix this problem, then /REHASH as soon as possible!", user->nick, parameters[0].c_str());
return CMD_FAILURE;
}
}
/* Command already exists? Succeed silently - this is needed for REHASH */
if (RFCCommands.find(name) != RFCCommands.end())
{
- ServerInstance->Log(DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
+ ServerInstance->Logs->Log("COMMAND",DEBUG,"Not reloading command %s/%s, it already exists", LIBRARYDIR, name);
return NULL;
}
if (!h)
{
const char* n = dlerror();
- ServerInstance->Log(SPARSE, "Error loading core command %s: %s", name, n);
+ ServerInstance->Logs->Log("COMMAND",SPARSE, "Error loading core command %s: %s", name, n);
return n;
}
if (library)
{
dirent* entry = NULL;
- while ((entry = readdir(library)))
+ while (0 != (entry = readdir(library)))
{
if (match(entry->d_name, "cmd_*.so"))
{
User* user = NULL;
std::string item;
int translations = 0;
+ dest.clear();
switch (to)
{
case TR_NICK:
/* Translate single nickname */
- ServerInstance->Log(DEBUG,"TR_NICK");
user = ServerInstance->FindNick(source);
if (user)
{
- ServerInstance->Log(DEBUG,"Managed UUID");
dest = user->uuid;
translations++;
}
else
- {
- ServerInstance->Log(DEBUG,"Had to use source.. (%s)", source.c_str());
dest = source;
- }
break;
case TR_NICKLIST:
{
translations++;
}
else
- dest.append(source);
+ dest.append(item);
dest.append(",");
}
if (!dest.empty())
translations++;
}
else
- dest.append(source);
+ dest.append(item);
dest.append(" ");
}
if (!dest.empty())
return translations;
}
+
projects / user / henk / code / inspircd.git / blobdiff