Fix sending malformed pong messages in some cases.

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

diff --git a/src/coremods/core_user/core_user.cpp b/src/coremods/core_user/core_user.cpp
index 103880a6ecb3a5422070862abbb8535d1fdab5f0..622e82c75813f927f717445463a5478b8fefec58 100644 (file)
--- a/src/coremods/core_user/core_user.cpp
+++ b/src/coremods/core_user/core_user.cpp
@@ -1,7 +1,8 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014-2016, 2018 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -20,34 +21,6 @@
 #include "inspircd.h"
 #include "core_user.h"
 
-class CommandMode : public Command
-{
- public:
-       /** Constructor for mode.
-        */
-       CommandMode(Module* parent)
-               : Command(parent, "MODE", 1)
-       {
-               syntax = "<target> <modes> {<mode-parameters>}";
-       }
-
-       /** Handle command.
-        * @param parameters The parameters to the command
-        * @param user The user issuing the command
-        * @return A value from CmdResult to indicate command success or failure.
-        */
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user)
-       {
-               ServerInstance->Modes->Process(parameters, user, (IS_LOCAL(user) ? ModeParser::MODE_NONE : ModeParser::MODE_LOCALONLY));
-               return CMD_SUCCESS;
-       }
-
-       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
-       {
-               return (IS_LOCAL(user) ? ROUTE_LOCALONLY : ROUTE_BROADCAST);
-       }
-};
-
 /** Handle /PASS.
  */
 class CommandPass : public SplitCommand
@@ -68,12 +41,13 @@ class CommandPass : public SplitCommand
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser *user)
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
                // Check to make sure they haven't registered -- Fix by FCS
                if (user->registered == REG_ALL)
                {
-                       user->WriteNumeric(ERR_ALREADYREGISTERED, ":You may not reregister");
+                       user->CommandFloodPenalty += 1000;
+                       user->WriteNumeric(ERR_ALREADYREGISTERED, "You may not reregister");
                        return CMD_FAILURE;
                }
                user->password = parameters[0];
@@ -84,16 +58,15 @@ class CommandPass : public SplitCommand
 
 /** Handle /PING.
  */
-class CommandPing : public Command
+class CommandPing : public SplitCommand
 {
  public:
        /** Constructor for ping.
         */
        CommandPing(Module* parent)
-               : Command(parent, "PING", 1, 2)
+               : SplitCommand(parent, "PING", 1)
        {
-               Penalty = 0;
-               syntax = "<servername> [:<servername>]";
+               syntax = "<cookie> [<servername>]";
        }
 
        /** Handle command.
@@ -101,9 +74,17 @@ class CommandPing : public Command
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user)
+       CmdResult HandleLocal(LocalUser* user, const Params& parameters) CXX11_OVERRIDE
        {
-               user->WriteServ("PONG %s :%s", ServerInstance->Config->ServerName.c_str(), parameters[0].c_str());
+               size_t origin = parameters.size() > 1 ? 1 : 0;
+               if (parameters[origin].empty())
+               {
+                       user->WriteNumeric(ERR_NOORIGIN, "No origin specified");
+                       return CMD_FAILURE;
+               }
+
+               ClientProtocol::Messages::Pong pong(parameters[0], origin ? parameters[1] : ServerInstance->Config->GetServerName());
+               user->Send(ServerInstance->GetRFCEvents().pong, pong);
                return CMD_SUCCESS;
        }
 };
@@ -116,10 +97,10 @@ class CommandPong : public Command
        /** Constructor for pong.
         */
        CommandPong(Module* parent)
-               : Command(parent, "PONG", 0, 1)
+               : Command(parent, "PONG", 1)
        {
                Penalty = 0;
-               syntax = "<ping-text>";
+               syntax = "<cookie> [<servername>]";
        }
 
        /** Handle command.
@@ -127,11 +108,25 @@ class CommandPong : public Command
         * @param user The user issuing the command
         * @return A value from CmdResult to indicate command success or failure.
         */
-       CmdResult Handle(const std::vector<std::string>& parameters, User* user)
+       CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
        {
+               size_t origin = parameters.size() > 1 ? 1 : 0;
+               if (parameters[origin].empty())
+               {
+                       user->WriteNumeric(ERR_NOORIGIN, "No origin specified");
+                       return CMD_FAILURE;
+               }
+
                // set the user as alive so they survive to next ping
-               if (IS_LOCAL(user))
-                       IS_LOCAL(user)->lastping = 1;
+               LocalUser* localuser = IS_LOCAL(user);
+               if (localuser)
+               {
+                       // Increase penalty unless we've sent a PING and this is the reply
+                       if (localuser->lastping)
+                               localuser->CommandFloodPenalty += 1000;
+                       else
+                               localuser->lastping = 1;
+               }
                return CMD_SUCCESS;
        }
 };
@@ -160,7 +155,6 @@ void MessageWrapper::ReadConfig(const char* prefixname, const char* suffixname,
 class CoreModUser : public Module
 {
        CommandAway cmdaway;
-       CommandMode cmdmode;
        CommandNick cmdnick;
        CommandPart cmdpart;
        CommandPass cmdpass;
@@ -168,11 +162,27 @@ class CoreModUser : public Module
        CommandPong cmdpong;
        CommandQuit cmdquit;
        CommandUser cmduser;
+       CommandIson cmdison;
+       CommandUserhost cmduserhost;
+       SimpleUserModeHandler invisiblemode;
+       ModeUserOperator operatormode;
+       ModeUserServerNoticeMask snomaskmode;
 
  public:
        CoreModUser()
-               : cmdaway(this), cmdmode(this), cmdnick(this), cmdpart(this), cmdpass(this), cmdping(this)
-               , cmdpong(this), cmdquit(this), cmduser(this)
+               : cmdaway(this)
+               , cmdnick(this)
+               , cmdpart(this)
+               , cmdpass(this)
+               , cmdping(this)
+               , cmdpong(this)
+               , cmdquit(this)
+               , cmduser(this)
+               , cmdison(this)
+               , cmduserhost(this)
+               , invisiblemode(this, "invisible", 'i')
+               , operatormode(this)
+               , snomaskmode(this)
        {
        }
 
@@ -184,7 +194,7 @@ class CoreModUser : public Module
 
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Provides the AWAY, MODE, NICK, PART, PASS, PING, PONG, QUIT and USER commands", VF_VENDOR|VF_CORE);
+               return Version("Provides the AWAY, ISON, NICK, PART, PASS, PING, PONG, QUIT, USERHOST, and USER commands", VF_VENDOR|VF_CORE);
        }
 };