X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=76dfc06ce05eabf887794b76981ef8410c36f992;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=0bf8e0e0a9f1a0b56ef7e489811aeb515f614e30;hpb=d00914ed6f5de67ab69c69e1cd1efa0797b5f62d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 0bf8e0e0a..76dfc06ce 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -204,12 +204,22 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &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
-		user->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000;
+		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;
 	}
 
 
@@ -256,7 +266,7 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 		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
@@ -290,11 +300,13 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 	{
 		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->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;
@@ -303,6 +315,7 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 	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());
@@ -313,7 +326,7 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 										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;
 	}
@@ -323,6 +336,7 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 
 	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->name.c_str(), cm->second->syntax.c_str());
@@ -330,7 +344,8 @@ bool CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 	}
 	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
@@ -389,7 +404,6 @@ bool CommandParser::AddCommand(Command *f)
 
 CommandParser::CommandParser()
 {
-	para.resize(128);
 }
 
 int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std::vector<std::string> &source, std::string &dest, bool prefix_final, Command* custom_translator)
@@ -451,7 +465,6 @@ int CommandParser::TranslateUIDs(const std::vector<TranslateType> to, const std:
 int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, std::string &dest)
 {
 	User* user = NULL;
-	std::string item;
 	int translations = 0;
 	dest.clear();