X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_conn_waitpong.cpp;h=df04405d8d27c42ceacf93330311ae09179454f4;hb=HEAD;hp=8d631b4f08b8400794fbc49ff47f6ce4ee857c21;hpb=a914ae91957f617af0a21bcdb024a16361ae3398;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_conn_waitpong.cpp b/src/modules/m_conn_waitpong.cpp index 8d631b4f0..df04405d8 100644 --- a/src/modules/m_conn_waitpong.cpp +++ b/src/modules/m_conn_waitpong.cpp @@ -1,143 +1,98 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013, 2018-2019 Sadie Powell + * Copyright (C) 2012-2013, 2015, 2018 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ -#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 { bool sendsnotice; bool killonbadreply; - const char* extenstr; + LocalStringExt ext; public: - ModuleWaitPong(InspIRCd* Me) - : Module(Me), extenstr("waitpong_pingstr") + ModuleWaitPong() + : ext("waitpong_pingstr", ExtensionItem::EXT_USER, this) { - OnRehash(NULL,""); - Implementation eventlist[] = { I_OnUserRegister, I_OnCheckReady, I_OnPreCommand, I_OnRehash, I_OnUserDisconnect, I_OnCleanup }; - ServerInstance->Modules->Attach(eventlist, this, 6); } - - virtual void OnRehash(User* user, const std::string ¶m) - { - ConfigReader Conf(ServerInstance); - - 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; - } - - char* RandString(unsigned int length) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - 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; + ConfigTag* tag = ServerInstance->Config->ConfValue("waitpong"); + sendsnotice = tag->getBool("sendsnotice", false); + killonbadreply = tag->getBool("killonbadreply", true); } - - virtual int OnUserRegister(User* 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.c_str(), 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(std::string &command, std::vector ¶meters, User* 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") { - char* pingrpl; - user->GetExt(extenstr, pingrpl); - + std::string* pingrpl = ext.get(user); + if (pingrpl) { - if (strcmp(pingrpl, parameters[0].c_str()) == 0) + if (!parameters.empty() && *pingrpl == parameters[0]) { - delete[] pingrpl; - user->Shrink(extenstr); - return 1; + ext.unset(user); + return MOD_RES_DENY; } else { if(killonbadreply) ServerInstance->Users->QuitUser(user, "Incorrect ping reply for registration"); - return 1; + return MOD_RES_DENY; } } } - return 0; + return MOD_RES_PASSTHRU; } - virtual bool OnCheckReady(User* 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(User* 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) - { - User* user = (User*)item; - char* pingrpl; - user->GetExt(extenstr, pingrpl); - - if (pingrpl) - { - delete[] pingrpl; - user->Shrink(extenstr); - } - } - } - - virtual ~ModuleWaitPong() - { - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1, 2, 0, 1, VF_VENDOR, API_VERSION); + return Version("Requires all clients to respond to a PING request before they can fully connect.", VF_VENDOR); } - }; MODULE_INIT(ModuleWaitPong)