X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_lockserv.cpp;h=b50ca24c0030455ba1c8256e39ebd14429c5d138;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=7fa9d4c10f4b3154dab0fcb61a39b373ddabdf54;hpb=069a2ef21425007d092342c8c11ec28da2f410d7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_lockserv.cpp b/src/modules/m_lockserv.cpp index 7fa9d4c10..b50ca24c0 100644 --- a/src/modules/m_lockserv.cpp +++ b/src/modules/m_lockserv.cpp @@ -1,116 +1,134 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2013, 2016-2018 Sadie Powell + * Copyright (C) 2012-2013 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2006-2007 Dennis Friis * - * 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: Allows locking of the server to stop all incoming connections till unlocked again */ +#include "inspircd.h" /** Adds numerics * 988 :Closed for new connections * 989 :Open for new connections -*/ - + */ +enum +{ + // InspIRCd-specific. + RPL_SERVLOCKON = 988, + RPL_SERVLOCKOFF = 989 +}; class CommandLockserv : public Command { - bool& locked; -public: - CommandLockserv(Module* Creator, bool& lock) : Command(Creator, "LOCKSERV", 0), locked(lock) + std::string& locked; + + public: + CommandLockserv(Module* Creator, std::string& lock) : Command(Creator, "LOCKSERV", 0, 1), locked(lock) { - flags_needed = 'o'; syntax.clear(); + allow_empty_last_param = false; + flags_needed = 'o'; } - CmdResult Handle (const std::vector ¶meters, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - locked = true; - user->WriteNumeric(988, "%s %s :Closed for new connections", user->nick.c_str(), user->server); - ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily close for new connections", user->nick.c_str()); - /* Dont send to the network */ + if (!locked.empty()) + { + user->WriteNotice("The server is already locked."); + return CMD_FAILURE; + } + + locked = parameters.empty() ? "Server is temporarily closed. Please try again later." : parameters[0]; + user->WriteNumeric(RPL_SERVLOCKON, user->server->GetName(), "Closed for new connections"); + ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used LOCKSERV to temporarily disallow new connections", user->nick.c_str()); return CMD_SUCCESS; } }; class CommandUnlockserv : public Command { -private: - bool& locked; + std::string& locked; -public: - CommandUnlockserv(Module* Creator, bool &lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock) + public: + CommandUnlockserv(Module* Creator, std::string& lock) : Command(Creator, "UNLOCKSERV", 0), locked(lock) { - flags_needed = 'o'; syntax.clear(); + flags_needed = 'o'; } - CmdResult Handle (const std::vector ¶meters, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - locked = false; - user->WriteNumeric(989, "%s %s :Open for new connections", user->nick.c_str(), user->server); - ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow for new connections", user->nick.c_str()); - /* Dont send to the network */ + if (locked.empty()) + { + user->WriteNotice("The server isn't locked."); + return CMD_FAILURE; + } + + locked.clear(); + user->WriteNumeric(RPL_SERVLOCKOFF, user->server->GetName(), "Open for new connections"); + ServerInstance->SNO->WriteGlobalSno('a', "Oper %s used UNLOCKSERV to allow new connections", user->nick.c_str()); return CMD_SUCCESS; } }; class ModuleLockserv : public Module { -private: - bool locked; + std::string locked; CommandLockserv lockcommand; CommandUnlockserv unlockcommand; - virtual void ResetLocked() + public: + ModuleLockserv() : lockcommand(this, locked), unlockcommand(this, locked) { - locked = false; } -public: - ModuleLockserv(InspIRCd* Me) : lockcommand(this, locked), unlockcommand(this, locked) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ResetLocked(); - ServerInstance->AddCommand(&lockcommand); - ServerInstance->AddCommand(&unlockcommand); - Implementation eventlist[] = { I_OnUserRegister, I_OnRehash, I_OnCheckReady }; - ServerInstance->Modules->Attach(eventlist, this, 3); + // Emergency way to unlock + if (!status.srcuser) + locked.clear(); } - virtual ~ModuleLockserv() - { - } - - - virtual void OnRehash(User* user) + void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE { - ResetLocked(); + if (irc::equals(param, "lockserv") && !locked.empty()) + locked.clear(); } - virtual ModResult OnUserRegister(User* user) + ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { - if (locked) + if (!locked.empty()) { - ServerInstance->Users->QuitUser(user, "Server is temporarily closed. Please try again later."); + ServerInstance->Users->QuitUser(user, locked); return MOD_RES_DENY; } return MOD_RES_PASSTHRU; } - virtual ModResult OnCheckReady(User* user) + ModResult OnCheckReady(LocalUser* user) CXX11_OVERRIDE { - return locked ? MOD_RES_DENY : MOD_RES_PASSTHRU; + return !locked.empty() ? MOD_RES_DENY : MOD_RES_PASSTHRU; } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Adds the /LOCKSERV and /UNLOCKSERV commands which allows server operators to control whether users can connect to the local server.", VF_VENDOR); } };