X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcommand_parse.cpp;h=514394a572e2ec3a0f2cd5ad37b53ef4ab03d659;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=ed996e83ce3af2f73790daa6c22ae42536fb819d;hpb=f62654a6859998f9d63eb22702c572d5ebcff15c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index ed996e83c..514394a57 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -60,7 +60,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const std::vector<std
 	 *
 	 * Only check for duplicates if there is one list (allow them in JOIN).
 	 */
-	std::set<irc::string> dupes;
+	insp::flat_set<irc::string> dupes;
 	bool check_dupes = (extra < 0);
 
 	/* Create two sepstreams, if we have only one list, then initialize the second sepstream with
@@ -182,11 +182,21 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 	/* find the command, check it exists */
 	Command* handler = GetHandler(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 */
 	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;
+		unsigned int penalty = (handler ? handler->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 (!handler)
@@ -207,7 +217,7 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 		if (!handler)
 		{
 			if (user->registered == REG_ALL)
-				user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :Unknown command",command.c_str());
+				user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command");
 			ServerInstance->stats.Unknown++;
 			return;
 		}
@@ -257,14 +267,16 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 	{
 		if (!user->IsModeSet(handler->flags_needed))
 		{
-			user->WriteNumeric(ERR_NOPRIVILEGES, ":Permission Denied - You do not have the required operator privileges");
+			user->CommandFloodPenalty += failpenalty;
+			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());
+			user->CommandFloodPenalty += failpenalty;
+			user->WriteNumeric(ERR_NOPRIVILEGES, InspIRCd::Format("Permission Denied - Oper type %s does not have access to command %s",
+				user->oper->name.c_str(), command.c_str()));
 			return;
 		}
 	}
@@ -272,13 +284,14 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 	if ((user->registered == REG_ALL) && (!user->IsOper()) && (handler->IsDisabled()))
 	{
 		/* command is disabled! */
+		user->CommandFloodPenalty += failpenalty;
 		if (ServerInstance->Config->DisabledDontExist)
 		{
-			user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :Unknown command", command.c_str());
+			user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "Unknown command");
 		}
 		else
 		{
-			user->WriteNumeric(ERR_UNKNOWNCOMMAND, "%s :This command has been disabled.", command.c_str());
+			user->WriteNumeric(ERR_UNKNOWNCOMMAND, command, "This command has been disabled.");
 		}
 
 		ServerInstance->SNO->WriteToSnoMask('a', "%s denied for %s (%s@%s)",
@@ -291,15 +304,17 @@ void CommandParser::ProcessCommand(LocalUser *user, std::string &cmd)
 
 	if (command_p.size() < handler->min_params)
 	{
-		user->WriteNumeric(ERR_NEEDMOREPARAMS, "%s :Not enough parameters.", command.c_str());
+		user->CommandFloodPenalty += failpenalty;
+		user->WriteNumeric(ERR_NEEDMOREPARAMS, command, "Not enough parameters.");
 		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());
+			user->WriteNumeric(RPL_SYNTAX, InspIRCd::Format("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());
+		user->CommandFloodPenalty += failpenalty;
+		user->WriteNumeric(ERR_NOTREGISTERED, command, "You have not registered");
 	}
 	else
 	{
@@ -327,15 +342,49 @@ void CommandParser::RemoveCommand(Command* x)
 		cmdlist.erase(n);
 }
 
+CommandBase::CommandBase(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara)
+	: ServiceProvider(mod, cmd, SERVICE_COMMAND)
+	, flags_needed(0)
+	, min_params(minpara)
+	, max_params(maxpara)
+	, use_count(0)
+	, disabled(false)
+	, works_before_reg(false)
+	, allow_empty_last_param(true)
+	, Penalty(1)
+{
+}
+
 CommandBase::~CommandBase()
 {
 }
 
+void CommandBase::EncodeParameter(std::string& parameter, int index)
+{
+}
+
+RouteDescriptor CommandBase::GetRouting(User* user, const std::vector<std::string>& parameters)
+{
+	return ROUTE_LOCALONLY;
+}
+
+Command::Command(Module* mod, const std::string& cmd, unsigned int minpara, unsigned int maxpara)
+	: CommandBase(mod, cmd, minpara, maxpara)
+	, force_manual_route(false)
+{
+}
+
 Command::~Command()
 {
 	ServerInstance->Parser.RemoveCommand(this);
 }
 
+void Command::RegisterService()
+{
+	if (!ServerInstance->Parser.AddCommand(this))
+		throw ModuleException("Command already exists: " + name);
+}
+
 void CommandParser::ProcessBuffer(std::string &buffer,LocalUser *user)
 {
 	if (buffer.empty())