X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=e74134a3a764213c6f74abf1fd506acae9828441;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=9e1aeea1a8c4454b407463f1ee06ebb35b1202d5;hpb=c202dea024542b9c6c6b771bb9a3a081d9eacdc5;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 9e1aeea1a..e74134a3a 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -20,27 +20,40 @@
 
 
 #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);
 	}
 
 
@@ -48,7 +61,7 @@ class ModuleSecureList : public Module
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
 	 */
-	ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, 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)
@@ -61,13 +74,17 @@ 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->WriteNotice("*** You cannot list within the first " + ConvToStr(WaitTime) + " seconds of connecting. Please try again later.");
-			/* Some crap clients (read: mIRC, various java chat applets) muck up if they don't
+			/* 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;