X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=29ab393c4886698119eeffa87af6a44e780587b8;hb=aa692dc1039b63deef7886e914ec499abe7facaf;hp=c553aa7423f2c30fa7f1ec4f0945b24a79059970;hpb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp index c553aa742..29ab393c4 100644 --- a/src/modules/m_securelist.cpp +++ b/src/modules/m_securelist.cpp @@ -1,50 +1,64 @@ -/* +------------------------------------+ - * | 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) 2018 linuxdaemon + * Copyright (C) 2013, 2018 Sadie Powell + * Copyright (C) 2012-2013, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008, 2010 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 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" +#include "modules/account.h" -/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */ +typedef std::vector AllowList; class ModuleSecureList : public Module { - private: - std::vector allowlist; - time_t WaitTime; - public: - ModuleSecureList() { - OnRehash(NULL); - Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 3); - } + AllowList allowlist; + bool exemptregistered; + unsigned int WaitTime; - virtual ~ModuleSecureList() + public: + Version GetVersion() CXX11_OVERRIDE { + return Version("Disallows the LIST command for recently connected clients to hinder spam bots", VF_VENDOR); } - virtual Version GetVersion() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR); - } + AllowList newallows; - void OnRehash(User* user) - { - ConfigReader MyConf; - allowlist.clear(); + ConfigTagList tags = ServerInstance->Config->ConfTags("securehost"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + std::string host = i->second->getString("exception"); + if (host.empty()) + throw ModuleException(" is a required field at " + i->second->getTagLocation()); + newallows.push_back(host); + } - for (int i = 0; i < MyConf.Enumerate("securehost"); i++) - allowlist.push_back(MyConf.ReadValue("securehost", "exception", i)); + ConfigTag* tag = ServerInstance->Config->ConfValue("securelist"); - WaitTime = MyConf.ReadInteger("securelist", "waittime", "60", 0, true); + exemptregistered = tag->getBool("exemptregistered"); + WaitTime = tag->getDuration("waittime", 60, 1); + allowlist.swap(newallows); } @@ -52,34 +66,38 @@ class ModuleSecureList : public Module * OnPreCommand() * Intercept the LIST command. */ - virtual ModResult 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 the command doesnt appear to be valid, we dont want to mess with it. */ if (!validated) return MOD_RES_PASSTHRU; - if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user))) + if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!user->IsOper())) { /* Normally wouldnt be allowed here, are they exempt? */ for (std::vector::iterator x = allowlist.begin(); x != allowlist.end(); x++) if (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map)) return MOD_RES_PASSTHRU; + const AccountExtItem* ext = GetAccountExtItem(); + if (exemptregistered && ext && ext->get(user)) + return MOD_RES_PASSTHRU; + /* Not exempt, BOOK EM DANNO! */ - user->WriteServ("NOTICE %s :*** You cannot list within the first %lu seconds of connecting. Please try again later.",user->nick.c_str(), (unsigned long) WaitTime); - /* Some crap clients (read: mIRC, various java chat applets) muck up if they don't + user->WriteNotice("*** You cannot list within the first " + ConvToStr(WaitTime) + " seconds of connecting. Please try again later."); + /* Some clients (e.g. mIRC, various java chat applets) muck up if they don't * receive these numerics whenever they send LIST, so give them an empty LIST to mull over. */ - user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str()); - user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str()); + user->WriteNumeric(RPL_LISTSTART, "Channel", "Users Name"); + user->WriteNumeric(RPL_LISTEND, "End of channel list."); return MOD_RES_DENY; } return MOD_RES_PASSTHRU; } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" SECURELIST"); + tokens["SECURELIST"]; } };