X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=382968355f1a88979d233a8a91462f72a6f14725;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;hp=c13e1a8928fa3bf6a878c90ce50d8b0968299f5e;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index c13e1a892..382968355 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -21,38 +21,35 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
 
 class ModuleSecureList : public Module
 {
- private:
 	std::vector<std::string> allowlist;
 	time_t WaitTime;
+
  public:
-	ModuleSecureList() 	{
+	void init()
+	{
 		OnRehash(NULL);
 		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
-	}
-
-	virtual ~ModuleSecureList()
-	{
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR);
+		return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
 	}
 
 	void OnRehash(User* user)
 	{
-		ConfigReader MyConf;
 		allowlist.clear();
 
-		for (int i = 0; i < MyConf.Enumerate("securehost"); i++)
-			allowlist.push_back(MyConf.ReadValue("securehost", "exception", i));
+		ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
+			allowlist.push_back(i->second->getString("exception"));
 
-		WaitTime = MyConf.ReadInteger("securelist", "waittime", "60", 0, true);
+		WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
 	}
 
 
@@ -66,7 +63,7 @@ class ModuleSecureList : public Module
 		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++)
@@ -85,9 +82,9 @@ class ModuleSecureList : public Module
 		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void On005Numeric(std::string &output)
+	virtual void On005Numeric(std::map<std::string, std::string>& tokens)
 	{
-		output.append(" SECURELIST");
+		tokens["SECURELIST"];
 	}
 };