#include "inspircd.h"
+#include "modules/account.h"
+
+typedef std::vector<std::string> AllowList;
class ModuleSecureList : public Module
{
- std::vector<std::string> allowlist;
- time_t WaitTime;
+ AllowList allowlist;
+ bool exemptregistered;
+ unsigned int WaitTime;
public:
Version GetVersion() CXX11_OVERRIDE
{
- return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
+ return Version("Disallows the LIST command for recently connected clients to hinder spam bots", VF_VENDOR);
}
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("<securehost:exception> is a required field at " + i->second->getTagLocation());
+ newallows.push_back(host);
+ }
- WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
+ ConfigTag* tag = ServerInstance->Config->ConfValue("securelist");
+
+ exemptregistered = tag->getBool("exemptregistered");
+ WaitTime = tag->getDuration("waittime", 60, 1);
+ allowlist.swap(newallows);
}
* OnPreCommand()
* Intercept the LIST command.
*/
- ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, LocalUser *user, bool validated, const std::string &original_line) CXX11_OVERRIDE
+ 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)
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->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