-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2013, 2015, 2018 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
*
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * 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 <stdlib.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "inspircd.h"
-/* $ModDesc: Forces connecting clients to send a PONG message back to the server before they can complete their connection */
+#include "inspircd.h"
class ModuleWaitPong : public Module
{
- InspIRCd* Instance;
bool sendsnotice;
bool killonbadreply;
- const char* extenstr;
+ LocalStringExt ext;
public:
- ModuleWaitPong(InspIRCd* Me)
- : Module::Module(Me), Instance(Me), extenstr("waitpong_pingstr")
- {
- OnRehash(NULL,"");
- }
-
- virtual void OnRehash(userrec* user, const std::string ¶m)
+ ModuleWaitPong()
+ : ext("waitpong_pingstr", ExtensionItem::EXT_USER, this)
{
- ConfigReader Conf(Instance);
-
- sendsnotice = Conf.ReadFlag("waitpong", "sendsnotice", 0);
-
- if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
- sendsnotice = true;
-
- killonbadreply = Conf.ReadFlag("waitpong", "killonbadreply", 0);
-
- if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
- killonbadreply = true;
}
- void Implements(char* List)
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnPreCommand] = List[I_OnRehash] = List[I_OnUserDisconnect] = List[I_OnCleanup] = 1;
+ ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong");
+ sendsnotice = tag->getBool("sendsnotice", false);
+ killonbadreply = tag->getBool("killonbadreply", true);
}
- char* RandString(unsigned int length)
- {
- unsigned char* out = new unsigned char[length+1];
- for(unsigned int i = 0; i < length; i++)
- out[i] = ((rand() % 26) + 65);
- out[length] = '\0';
-
- return (char*)out;
- }
-
- virtual int OnUserRegister(userrec* user)
+ ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
{
- char* pingrpl = RandString(10);
-
- user->Write("PING :%s", pingrpl);
-
+ std::string pingrpl = ServerInstance->GenRandomStr(10);
+ {
+ ClientProtocol::Messages::Ping pingmsg(pingrpl);
+ user->Send(ServerInstance->GetRFCEvents().ping, pingmsg);
+ }
+
if(sendsnotice)
- 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);
-
- user->Extend(extenstr, pingrpl);
- return 0;
+ 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;
}
-
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec* user, bool validated, const std::string &original_line)
+
+ ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
{
- if(command == "PONG")
+ if (command == "PONG")
{
- char* pingrpl;
- user->GetExt(extenstr, pingrpl);
-
- if(pingrpl)
+ std::string* pingrpl = ext.get(user);
+
+ if (pingrpl)
{
- if(strcmp(pingrpl, parameters[0]) == 0)
+ if (!parameters.empty() && *pingrpl == parameters[0])
{
- DELETE(pingrpl);
- user->Shrink(extenstr);
- return 1;
+ ext.unset(user);
+ return MOD_RES_DENY;
}
else
{
if(killonbadreply)
- userrec::QuitUser(ServerInstance, user, "Incorrect ping reply for registration");
- return 1;
+ ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration");
+ return MOD_RES_DENY;
}
}
}
-
- return 0;
+ return MOD_RES_PASSTHRU;
}
- virtual bool OnCheckReady(userrec* user)
+ ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE
{
- char* pingrpl;
- return (!user->GetExt(extenstr, pingrpl));
+ return ext.get(user) ? MOD_RES_DENY : MOD_RES_PASSTHRU;
}
-
- virtual void OnUserDisconnect(userrec* user)
- {
- char* pingrpl;
- user->GetExt(extenstr, pingrpl);
- if(pingrpl)
- {
- DELETE(pingrpl);
- user->Shrink(extenstr);
- }
- }
-
- virtual void OnCleanup(int target_type, void* item)
- {
- if(target_type == TYPE_USER)
- {
- userrec* user = (userrec*)item;
- char* pingrpl;
- user->GetExt(extenstr, pingrpl);
-
- if(pingrpl)
- {
- DELETE(pingrpl);
- user->Shrink(extenstr);
- }
- }
- }
-
- virtual ~ModuleWaitPong()
- {
- }
-
- virtual Version GetVersion()
- {
- return Version(1, 1, 0, 1, VF_VENDOR, API_VERSION);
- }
-
-};
-
-class ModuleWaitPongFactory : public ModuleFactory
-{
- public:
- ModuleWaitPongFactory()
- {
- }
-
- ~ModuleWaitPongFactory()
+ Version GetVersion() CXX11_OVERRIDE
{
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleWaitPong(Me);
+ return Version("Requires all clients to respond to a PING request before they can fully connect.", VF_VENDOR);
}
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleWaitPongFactory;
-}
+MODULE_INIT(ModuleWaitPong)
projects / user / henk / code / inspircd.git / blobdiff