Add sanity checks to the ssl modules so that theres no possibility of an out of range...

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

diff --git a/src/cmd_kill.cpp b/src/cmd_kill.cpp
index ae327166d73416da6579f73aa26540308fad2807..43cf1d5ab2d393d621c5cef7176a8d05d79759cc 100644 (file)
--- a/src/cmd_kill.cpp
+++ b/src/cmd_kill.cpp
@@ -12,13 +12,9 @@
  */
 
 #include "inspircd.h"
-#include "configreader.h"
-#include "users.h"
-#include "modules.h"
-#include "wildcard.h"
 #include "commands/cmd_kill.h"
 
-extern "C" command_t* init_command(InspIRCd* Instance)
+extern "C" DllExport command_t* init_command(InspIRCd* Instance)
 {
        return new cmd_kill(Instance);
 }
@@ -37,31 +33,77 @@ CmdResult cmd_kill::Handle (const char** parameters, int pcnt, userrec *user)
 
        if (u)
        {
-               FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
+               /*
+                * Here, we need to decide how to munge kill messages. Whether to hide killer, what to show opers, etc.
+                * We only do this when the command is being issued LOCALLY, for remote KILL, we just copy the message we got.
+                *
+                * This conditional is so that we only append the "Killed (" prefix ONCE. If killer is remote, then the kill
+                * just gets processed and passed on, otherwise, if they are local, it gets prefixed. Makes sense :-) -- w00t
+                */
+               if (IS_LOCAL(user))
+               {
+                       /*
+                        * Moved this event inside the IS_LOCAL check also, we don't want half the network killing a user
+                        * and the other half not. This would be a bad thing. ;p -- w00t
+                        */
+                       FOREACH_RESULT(I_OnKill, OnKill(user, u, parameters[1]));
+
+                       if (MOD_RESULT)
+                               return CMD_FAILURE;
 
-               if (MOD_RESULT)
-                       return CMD_FAILURE;
+                       if (*ServerInstance->Config->HideKillsServer)
+                       {
+                               // hidekills is on, use it
+                               snprintf(killreason, MAXQUIT, "Killed (%s (%s))", ServerInstance->Config->HideKillsServer, parameters[1]);
+                       }
+                       else
+                       {
+                               // hidekills is off, do nothing
+                               snprintf(killreason, MAXQUIT, "Killed (%s (%s))", user->nick, parameters[1]);
+                       }
+               }
+               else
+               {
+                       /* Leave it alone, remote server has already formatted it */
+                       snprintf(killreason, MAXQUIT, "%s", parameters[1]);
+               }
 
+               /*
+                * Now we need to decide whether or not to send a local or remote snotice. Currently this checking is a little flawed.
+                * No time to fix it right now, so left a note. -- w00t
+                */
                if (!IS_LOCAL(u))
                {
                        // remote kill
-                       ServerInstance->SNO->WriteToSnoMask('k',"Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
-                       snprintf(killreason, MAXQUIT,"[%s] Killed (%s (%s))", ServerInstance->Config->ServerName, user->nick, parameters[1]);
-                       u->WriteCommonExcept("QUIT :%s", killreason);
-                       FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason));
-                       
-                       userrec::QuitUser(ServerInstance, u, parameters[1]);
+                       ServerInstance->SNO->WriteToSnoMask('K', "Remote kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
+                       FOREACH_MOD(I_OnRemoteKill, OnRemoteKill(user, u, killreason, killreason));
                }
                else
                {
                        // local kill
-                       ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
-                       user->WriteTo(u, "KILL %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+                       /*
+                        * XXX - this isn't entirely correct, servers A - B - C, oper on A, client on C. Oper kills client, A and B will get remote kill
+                        * snotices, C will get a local kill snotice. this isn't accurate, and needs fixing at some stage. -- w00t
+                        */
                        ServerInstance->SNO->WriteToSnoMask('k',"Local Kill by %s: %s!%s@%s (%s)", user->nick, u->nick, u->ident, u->host, parameters[1]);
-                       snprintf(killreason,MAXQUIT,"Killed (%s (%s))", user->nick, parameters[1]);
-
-                       userrec::QuitUser(ServerInstance, u, killreason);
+                       ServerInstance->Log(DEFAULT,"LOCAL KILL: %s :%s!%s!%s (%s)", u->nick, ServerInstance->Config->ServerName, user->dhost, user->nick, parameters[1]);
+                       /* Bug #419, make sure this message can only occur once even in the case of multiple KILL messages crossing the network, and change to show
+                        * hidekillsserver as source if possible
+                        */
+                       if (!u->muted)
+                       {
+                               u->Write(":%s KILL %s :%s!%s!%s (%s)", *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->GetFullHost(),
+                                               u->nick,
+                                               ServerInstance->Config->ServerName,
+                                               user->dhost,
+                                               *ServerInstance->Config->HideKillsServer ? ServerInstance->Config->HideKillsServer : user->nick,
+                                               parameters[1]);
+                               u->muted = true;
+                       }
                }
+
+               // send the quit out
+               userrec::QuitUser(ServerInstance, u, killreason);
        }
        else
        {