]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_conn_waitpong.cpp
Fix waitpong referring to registration timeouts as ping timeouts.
[user/henk/code/inspircd.git] / src / modules / m_conn_waitpong.cpp
index b84533f88cd57ed8fa3437e57bfc44b8d8647117..d2de63b3f353d076bdad008b4279182d451ad2f2 100644 (file)
@@ -1 +1,96 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "users.h"\r#include "channels.h"\r#include "modules.h"\r\r/* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */\r\rclass ModuleWaitPong : public Module\r{\r        bool sendsnotice;\r      bool killonbadreply;\r   const char* extenstr;\r\r public:\r        ModuleWaitPong(InspIRCd* Me)\r    : Module(Me), extenstr("waitpong_pingstr")\r    {\r              OnRehash(NULL,"");\r     }\r      \r       virtual void OnRehash(userrec* user, const std::string &param)\r {\r              ConfigReader Conf(ServerInstance);\r             \r               sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);\r             \r               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)\r                    sendsnotice = true;\r            \r               killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);\r\r              if(Conf.GetError() == CONF_VALUE_NOT_FOUND)\r                    killonbadreply = true;\r }\r\r     void Implements(char* List)\r    {\r              List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;\r    }\r\r     char* RandString(unsigned int length)\r  {\r              unsigned char* out = new unsigned char[length+1];\r              for(unsigned int i = 0; i < length; i++)\r                       out[i] = ((rand() % 26) + 65);\r         out[length] = '\0';\r    \r               return (char*)out;\r     }\r      \r       virtual int OnUserRegister(userrec* user)\r      {\r              char* pingrpl = RandString(10);\r                \r               user->Write("PING :%s", pingrpl);\r              \r               if(sendsnotice)\r                        user->WriteServ("NOTICE %s :*** If you are having problems connecting due to ping timeouts, please type /quote PONG %s or /raw PONG %s now.", user->nick, pingrpl, pingrpl);\r                   \r               user->Extend(extenstr, pingrpl);\r               return 0;\r      }\r      \r       virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)\r       {\r              if(command == "PONG")\r          {\r                      char* pingrpl;\r                 user->GetExt(extenstr, pingrpl);\r                       \r                       if(pingrpl)\r                    {\r                              if(strcmp(pingrpl, parameters[0]) == 0)\r                                {\r                                      DELETE(pingrpl);\r                                       user->Shrink(extenstr);\r                                        return 1;\r                              }\r                              else\r                           {\r                                      if(killonbadreply)\r                                             userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");\r                                      return 1;\r                              }\r                      }\r              }\r              return 0;\r      }\r\r     virtual bool OnCheckReady(userrec* user)\r       {\r              char* pingrpl;\r         return (!user->GetExt(extenstr, pingrpl));\r     }\r      \r       virtual void OnUserDisconnect(userrec* user)\r   {\r              char* pingrpl;\r         user->GetExt(extenstr, pingrpl);\r\r              if(pingrpl)\r            {\r                      DELETE(pingrpl);\r                       user->Shrink(extenstr);\r                }\r      }\r      \r       virtual void OnCleanup(int target_type, void* item)\r    {\r              if(target_type == TYPE_USER)\r           {\r                      userrec* user = (userrec*)item;\r                        char* pingrpl;\r                 user->GetExt(extenstr, pingrpl);\r                       \r                       if(pingrpl)\r                    {\r                              DELETE(pingrpl);\r                               user->Shrink(extenstr);\r                        } \r             }\r      }\r      \r       virtual ~ModuleWaitPong()\r      {\r      }\r      \r       virtual Version GetVersion()\r   {\r              return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);\r    }\r      \r};\r\rMODULE_INIT(ModuleWaitPong)\r
\ No newline at end of file
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Oliver Lupton <oliverlupton@gmail.com>
+ *   Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ *
+ * 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
+ * License as published by the Free Software Foundation, version 2.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "inspircd.h"
+
+class ModuleWaitPong : public Module
+{
+       bool sendsnotice;
+       bool killonbadreply;
+       LocalStringExt ext;
+
+ public:
+       ModuleWaitPong()
+               : ext("waitpong_pingstr", ExtensionItem::EXT_USER, this)
+       {
+       }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong");
+               sendsnotice = tag->getBool("sendsnotice", true);
+               killonbadreply = tag->getBool("killonbadreply", true);
+       }
+
+       ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
+       {
+               std::string pingrpl = ServerInstance->GenRandomStr(10);
+               {
+                       ClientProtocol::Messages::Ping pingmsg(pingrpl);
+                       user->Send(ServerInstance->GetRFCEvents().ping, pingmsg);
+               }
+
+               if(sendsnotice)
+                       user->WriteNotice("*** If you are having problems connecting due to registration timeouts type /quote PONG " + pingrpl + " or /raw PONG " + pingrpl + " now.");
+
+               ext.set(user, pingrpl);
+               return MOD_RES_PASSTHRU;
+       }
+
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
+       {
+               if (command == "PONG")
+               {
+                       std::string* pingrpl = ext.get(user);
+
+                       if (pingrpl)
+                       {
+                               if (!parameters.empty() && *pingrpl == parameters[0])
+                               {
+                                       ext.unset(user);
+                                       return MOD_RES_DENY;
+                               }
+                               else
+                               {
+                                       if(killonbadreply)
+                                               ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
+                                       return MOD_RES_DENY;
+                               }
+                       }
+               }
+               return MOD_RES_PASSTHRU;
+       }
+
+       ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
+       {
+               return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
+       }
+
+       Version GetVersion() CXX11_OVERRIDE
+       {
+               return Version("Require pong prior to registration", VF_VENDOR);
+       }
+};
+
+MODULE_INIT(ModuleWaitPong)