Add fine-grained command flood controls

[user/henk/code/inspircd.git] / src / command_parse.cpp

diff --git a/src/command_parse.cpp b/src/command_parse.cpp
index fe0aab3b98247d45a96333a7c1688b981087303f..86f801d3e3c3e4023d7f25d2f66235679ede9069 100644 (file)
--- a/src/command_parse.cpp
+++ b/src/command_parse.cpp
@@ -249,11 +249,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 (!user->HasPrivPermission("users/flood/no-throttle"))
+       if (IS_LOCAL(user) && !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->IncreasePenalty(cm != cmdlist.end() ? cm->second->Penalty : 2);
-               do_more = (user->Penalty < 10);
+               IS_LOCAL(user)->CommandFloodPenalty += cm != cmdlist.end() ? cm->second->Penalty * 1000 : 2000;
        }
 
 
@@ -328,8 +327,9 @@ bool CommandParser::ProcessCommand(User *user, std::string &cmd)
                return true;
 
        /* activity resets the ping pending timer */
-       if (user->MyClass)
-               user->nping = ServerInstance->Time() + user->MyClass->GetPingTime();
+       LocalUser* luser = IS_LOCAL(user);
+       if (luser)
+               luser->nping = ServerInstance->Time() + luser->MyClass->GetPingTime();
 
        if (cm->second->flags_needed)
        {
@@ -340,7 +340,8 @@ 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(),irc::Spacify(user->oper.c_str()),command.c_str());
+                       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;
                }
        }
@@ -411,8 +412,8 @@ bool CommandParser::ProcessBuffer(std::string &buffer,User *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", DEBUG, "C[%s] I :%s %s",
+               user->uuid.c_str(), user->nick.c_str(), buffer.c_str());
        return ProcessCommand(user,buffer);
 }
 
@@ -427,7 +428,7 @@ bool CommandParser::AddCommand(Command *f)
        return false;
 }
 
-CommandParser::CommandParser() 
+CommandParser::CommandParser()
 {
        para.resize(128);
 }