X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommand_parse.cpp;h=f3ff69c9601e1c035f8272f4eebfd71f1149ac96;hb=6856c87ae51d655870607c6e74e0eed6d338283a;hp=3b87112a9342c2db8fb9ef1bb9d5a972047d4ecb;hpb=0fb5041fc842ef0e65dc14c6ab6415e018b129b5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index 3b87112a9..f3ff69c96 100644
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -6,7 +6,7 @@
  * 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.
  *
  * ---------------------------------------------------
  */
@@ -214,7 +214,45 @@ CmdResult CommandParser::CallHandler(const std::string &commandname,const char**
 	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...
+	int floodlines = 0;
+
+	while (current->BufferIsReady())
+	{
+		if (ServerInstance->Time() > current->reset_due)
+		{
+			current->reset_due = ServerInstance->Time() + current->threshold;
+			current->lines_in = 0;
+		}
+
+		if (++current->lines_in > current->flood && current->flood)
+		{
+			ServerInstance->FloodQuitUser(current);
+			return;
+		}
+
+		if ((++floodlines > current->flood) && (current->flood != 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;
@@ -241,75 +279,89 @@ void CommandParser::ProcessCommand(User *user, std::string &cmd)
 	int MOD_RESULT = 0;
 	FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,false,cmd));
 	if (MOD_RESULT == 1) {
-		return;
+		return true;
+	}
+
+	if (!user)
+	{
+		/*
+		 * before, we went and found the command even with no user.. seems nonsensical.
+		 * I'm not entirely sure when we would be passed NULL, but let's handle it
+		 * anyway, by dropping it like a hot potato. -- w00t
+		 */
+		return true;
 	}
 
+	/* find the command, check it exists */
 	Commandable::iterator cm = cmdlist.find(command);
 	
-	if (cm != cmdlist.end())
+	if (cm == cmdlist.end())
 	{
-		if (user)
+		ServerInstance->stats->statsUnknown++;
+		user->WriteServ("421 %s %s :Unknown command",user->nick,command.c_str());
+		return true;
+	}
+
+	/* Modify the user's penalty */
+	user->Penalty += cm->second->Penalty;
+	bool do_more = (user->Penalty < 10);
+	if (do_more)
+		user->OverPenalty = true;
+
+	/* activity resets the ping pending timer */
+	user->nping = ServerInstance->Time() + user->pingmax;
+	if (cm->second->flags_needed)
+	{
+		if (!user->IsModeSet(cm->second->flags_needed))
 		{
-			/* 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();
-
-				int MOD_RESULT = 0;
-				FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,user,true,cmd));
-				if (MOD_RESULT == 1)
-					return;
-
-				/*
-				 * WARNING: be careful, the user may be deleted soon
-				 */
-				CmdResult result = cm->second->Handle(command_p,items,user);
-
-				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;
-			}
+			user->WriteServ("481 %s :Permission Denied - You do not have the required operator privileges",user->nick);
+			return do_more;
+		}
+		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 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->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 do_more;
+	}
+	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 do_more;
+	}
+	if ((user->registered != REG_ALL) && (!cm->second->WorksBeforeReg()))
+	{
+		user->WriteServ("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 */
+		int MOD_RESULT = 0;
+		FOREACH_RESULT(I_OnPreCommand,OnPreCommand(command,command_p,items,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,items,user);
+
+		FOREACH_MOD(I_OnPostCommand,OnPostCommand(command, command_p, items, user, result,cmd));
+		return do_more;
 	}
 }
 
@@ -343,12 +395,12 @@ void CommandParser::RemoveCommand(Commandable::iterator safei, const char* sourc
 	}
 }
 
-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);
@@ -360,9 +412,10 @@ void CommandParser::ProcessBuffer(std::string &buffer,User *user)
 		if (!user->muted)
 		{
 			ServerInstance->Log(DEBUG,"C[%d] I :%s %s",user->GetFd(), user->nick, buffer.c_str());
-			this->ProcessCommand(user,buffer);
+			return this->ProcessCommand(user,buffer);
 		}
 	}
+	return true;
 }
 
 bool CommandParser::CreateCommand(Command *f, void* so_handle)
@@ -544,24 +597,20 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 	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:
 		{
@@ -576,7 +625,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 					translations++;
 				}
 				else
-					dest.append(source);
+					dest.append(item);
 				dest.append(",");
 			}
 			if (!dest.empty())
@@ -596,7 +645,7 @@ int CommandParser::TranslateUIDs(TranslateType to, const std::string &source, st
 					translations++;
 				}
 				else
-					dest.append(source);
+					dest.append(item);
 				dest.append(" ");
 			}
 			if (!dest.empty())