Add channel TS to server-to-server INVITE to detect and drop unauthorized invites

[user/henk/code/inspircd.git] / src / coremods / core_channel / cmd_kick.cpp

diff --git a/src/coremods/core_channel/cmd_kick.cpp b/src/coremods/core_channel/cmd_kick.cpp
index 9039d8551a737ca62f36fa83a951f1ed66a336f2..dfa9bf21740042d172a4ff31afe8bd58ed45d646 100644 (file)
--- a/src/coremods/core_channel/cmd_kick.cpp
+++ b/src/coremods/core_channel/cmd_kick.cpp
@@ -31,7 +31,6 @@ CommandKick::CommandKick(Module* parent)
  */
 CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User *user)
 {
-       std::string reason;
        Channel* c = ServerInstance->FindChan(parameters[0]);
        User* u;
 
@@ -66,21 +65,16 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
                }
        }
 
-       Membership* const memb = c->GetUser(u);
-       if (!memb)
+       const UserMembIter victimiter = c->userlist.find(u);
+       if (victimiter == c->userlist.end())
        {
                user->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s :They are not on that channel", u->nick.c_str(), c->name.c_str());
                return CMD_FAILURE;
        }
+       Membership* const memb = victimiter->second;
 
-       if (parameters.size() > 2)
-       {
-               reason.assign(parameters[2], 0, ServerInstance->Config->Limits.MaxKick);
-       }
-       else
-       {
-               reason.assign(user->nick, 0, ServerInstance->Config->Limits.MaxKick);
-       }
+       const bool has_reason = (parameters.size() > 2);
+       const std::string reason((has_reason ? parameters.back() : user->nick), 0, ServerInstance->Config->Limits.MaxKick);
 
        // Do the following checks only if the KICK is done by a local user;
        // each server enforces its own rules.
@@ -112,7 +106,7 @@ CmdResult CommandKick::Handle (const std::vector<std::string>& parameters, User
                }
        }
 
-       c->KickUser(user, u, reason);
+       c->KickUser(user, victimiter, reason);
 
        return CMD_SUCCESS;
 }