X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=6d9b64df25f2184705b5733d9517e08d82ae8d68;hb=625e5435f51650f547f4411441c0b7b958c53d30;hp=6501893f3a0a93e34b218e1dc3772f43002bc474;hpb=7900ad9222aa4dbb5c6e3a7f0316f380da8f894e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 6501893f3..6d9b64df2 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -20,39 +20,40 @@
 
 
 #include "inspircd.h"
+#include "modules/account.h"
 
-/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
+typedef std::vector<std::string> AllowList;
 
 class ModuleSecureList : public Module
 {
- private:
-	std::vector<std::string> allowlist;
-	time_t WaitTime;
- public:
-	ModuleSecureList() 	{
-		OnRehash(NULL);
-		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
-	}
-
-	virtual ~ModuleSecureList()
-	{
-	}
+	AllowList allowlist;
+	bool exemptregistered;
+	unsigned int WaitTime;
 
-	virtual Version GetVersion()
+ public:
+	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("<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);
 	}
 
 
@@ -60,34 +61,38 @@ class ModuleSecureList : public Module
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
 	 */
-	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, 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)
 			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<std::string>::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<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" SECURELIST");
+		tokens["SECURELIST"];
 	}
 };