X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=6d9b64df25f2184705b5733d9517e08d82ae8d68;hb=0527f858cecb05a79b6405b6d353a460a4946f7f;hp=382968355f1a88979d233a8a91462f72a6f14725;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp index 382968355..6d9b64df2 100644 --- a/src/modules/m_securelist.cpp +++ b/src/modules/m_securelist.cpp @@ -20,36 +20,40 @@ #include "inspircd.h" +#include "modules/account.h" -/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */ +typedef std::vector AllowList; class ModuleSecureList : public Module { - std::vector allowlist; - time_t WaitTime; + AllowList allowlist; + bool exemptregistered; + unsigned int WaitTime; public: - void init() - { - OnRehash(NULL); - Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - } - - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR); } - void OnRehash(User* user) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - allowlist.clear(); + AllowList newallows; ConfigTagList tags = ServerInstance->Config->ConfTags("securehost"); for (ConfigIter i = tags.first; i != tags.second; ++i) - allowlist.push_back(i->second->getString("exception")); + { + std::string host = i->second->getString("exception"); + if (host.empty()) + throw ModuleException(" is a required field at " + i->second->getTagLocation()); + newallows.push_back(host); + } + + ConfigTag* tag = ServerInstance->Config->ConfValue("securelist"); - WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60); + exemptregistered = tag->getBool("exemptregistered"); + WaitTime = tag->getDuration("waittime", 60, 1); + allowlist.swap(newallows); } @@ -57,7 +61,7 @@ class ModuleSecureList : public Module * OnPreCommand() * Intercept the LIST command. */ - virtual ModResult OnPreCommand(std::string &command, std::vector ¶meters, LocalUser *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) @@ -70,19 +74,23 @@ class ModuleSecureList : public Module 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::map& tokens) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { tokens["SECURELIST"]; }