X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=d386337f2e9567b7ea235f868821db42eaf53ef1;hb=4e40ee49bba3f7bab05a58516e2039351fb33069;hp=8835070580feb05c6bc21f8959cbd3a425b01193;hpb=a30abe26fc803900eaf5dc4c08a31aa1d3c9c89f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/command_parse.cpp b/src/command_parse.cpp index 883507058..d386337f2 100644 --- a/src/command_parse.cpp +++ b/src/command_parse.cpp @@ -1,28 +1,27 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2006-2007 Dennis Friis * - * 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 . */ + #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 -#include -#endif int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::string &input, const std::string &hashtype) { @@ -38,7 +37,7 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::st 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; @@ -55,11 +54,14 @@ int InspIRCd::PassCompare(Extensible* ex, const std::string &data, const std::st * 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& parameters, unsigned int splithere, unsigned int extra) +int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& 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. */ @@ -75,7 +77,7 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector= 0 ? parameters[extra] : ""); std::string extrastuff; std::string item; unsigned int max = 0; @@ -84,20 +86,18 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vectorConfig->MaxTargets)) + while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets)) { if (dupes.find(item.c_str()) == dupes.end()) { - std::vector new_parameters; - - for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) - new_parameters.push_back(parameters[t]); + std::vector new_parameters(parameters); if (!items2.GetToken(extrastuff)) - extrastuff = ""; + extrastuff.clear(); - new_parameters[splithere] = item.c_str(); - new_parameters[extra] = extrastuff.c_str(); + new_parameters[splithere] = item; + if (extra >= 0) + new_parameters[extra] = extrastuff; CommandObj->Handle(new_parameters, user); @@ -107,52 +107,6 @@ int CommandParser::LoopCall(User* user, Command* CommandObj, const std::vector& 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 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 new_parameters; - - for (unsigned int t = 0; (t < parameters.size()) && (t < MAXPARAMETERS); t++) - new_parameters.push_back(parameters[t]); - - 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; -} - bool CommandParser::IsValidCommand(const std::string &commandname, unsigned int pcnt, User * user) { Commandtable::iterator n = cmdlist.find(commandname); @@ -194,6 +148,9 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std:: 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; @@ -224,7 +181,7 @@ CmdResult CommandParser::CallHandler(const std::string &commandname, const std:: return CMD_INVALID; } -bool CommandParser::ProcessCommand(User *user, std::string &cmd) +bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd) { std::vector command_p; irc::tokenstream tokens(cmd); @@ -249,10 +206,10 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) /* Modify the user's penalty regardless of whether or not the command exists */ bool do_more = true; - if (IS_LOCAL(user) && !user->HasPrivPermission("users/flood/no-throttle")) + 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 - IS_LOCAL(user)->Penalty += cm != cmdlist.end() ? cm->second->Penalty : 2; + user->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000; } @@ -289,7 +246,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) * 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 @@ -327,9 +284,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) return true; /* activity resets the ping pending timer */ - LocalUser* luser = IS_LOCAL(user); - if (luser) - luser->nping = ServerInstance->Time() + luser->MyClass->GetPingTime(); + user->nping = ServerInstance->Time() + user->MyClass->GetPingTime(); if (cm->second->flags_needed) { @@ -341,11 +296,11 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) 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->NameStr(), command.c_str()); + user->nick.c_str(), user->oper->name.c_str(), command.c_str()); return do_more; } } - if ((user->registered == REG_ALL) && (!IS_OPER(user)) && (cm->second->IsDisabled())) + if ((user->registered == REG_ALL) && (!user->IsOper()) && (cm->second->IsDisabled())) { /* command is disabled! */ if (ServerInstance->Config->DisabledDontExist) @@ -362,11 +317,15 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) 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->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())) @@ -397,7 +356,7 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd) void CommandParser::RemoveCommand(Command* x) { - Commandtable::iterator n = cmdlist.find(x->command); + Commandtable::iterator n = cmdlist.find(x->name); if (n != cmdlist.end() && n->second == x) cmdlist.erase(n); } @@ -407,28 +366,28 @@ Command::~Command() ServerInstance->Parser->RemoveCommand(this); } -bool CommandParser::ProcessBuffer(std::string &buffer,User *user) +bool CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user) { if (!user || buffer.empty()) return true; - ServerInstance->Logs->Log("USERINPUT", DEBUG, "C[%d] I :%s %s", - user->GetFd(), user->nick.c_str(), buffer.c_str()); + ServerInstance->Logs->Log("USERINPUT", LOG_RAWIO, "C[%s] I :%s %s", + user->uuid.c_str(), user->nick.c_str(), buffer.c_str()); return ProcessCommand(user,buffer); } bool CommandParser::AddCommand(Command *f) { /* 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; } return false; } -CommandParser::CommandParser() +CommandParser::CommandParser() { para.resize(128); }