X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=6013d1fd7543400bfcadf0a4f55f1269f8b058ad;hb=d3b6538f955e824d46141f64fc081ce19fc081ef;hp=8761716c02dafd2bfd88727a1c7bce8882a22b1c;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 8761716c0..6013d1fd7 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -1,22 +1,27 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h" 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+#include "inspircd.h"
+
+/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */
 
 class ModuleSecureList : public Module
 {
@@ -24,74 +29,67 @@ class ModuleSecureList : public Module
 	std::vector<std::string> allowlist;
 	time_t WaitTime;
  public:
-	ModuleSecureList(InspIRCd* Me) : Module(Me)
+	void init()
 	{
-		OnRehash(NULL,"");
+		OnRehash(NULL);
+		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
- 
+
 	virtual ~ModuleSecureList()
 	{
 	}
- 
+
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+		return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
 	}
 
-	void OnRehash(userrec* user, const std::string &parameter)
+	void OnRehash(User* user)
 	{
-		ConfigReader* MyConf = new ConfigReader(ServerInstance);
 		allowlist.clear();
-		for (int i = 0; i < MyConf->Enumerate("securehost"); i++)
-			allowlist.push_back(MyConf->ReadValue("securehost", "exception", i));
-		WaitTime = MyConf->ReadInteger("securelist", "waittime", "60", 0, true);
-		DELETE(MyConf);
-	}
- 
-	void Implements(char* List)
-	{
-		List[I_OnRehash] = List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+
+		ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
+			allowlist.push_back(i->second->getString("exception"));
+
+		WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60);
 	}
 
+
 	/*
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
-	 */ 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line)
+	 */
+	virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
-			return 0;
- 
+			return MOD_RES_PASSTHRU;
+
 		if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
 		{
 			/* Normally wouldnt be allowed here, are they exempt? */
 			for (std::vector<std::string>::iterator x = allowlist.begin(); x != allowlist.end(); x++)
-				if (ServerInstance->MatchText(user->MakeHost(), *x))
-					return 0;
+				if (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
+					return MOD_RES_PASSTHRU;
 
 			/* Not exempt, BOOK EM DANNO! */
-			user->WriteServ("NOTICE %s :*** You cannot list within the first %d seconds of connecting. Please try again later.",user->nick, WaitTime);
+			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
 			 * receive these numerics whenever they send LIST, so give them an empty LIST to mull over.
 			 */
-			user->WriteServ("321 %s Channel :Users Name",user->nick);
-			user->WriteServ("323 %s :End of channel list.",user->nick);
-			return 1;
+			user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
+			user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
+			return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
 	virtual void On005Numeric(std::string &output)
 	{
 		output.append(" SECURELIST");
 	}
-
-	virtual Priority Prioritize()
-	{
-		return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
-	}
-
 };
- 
+
 MODULE_INIT(ModuleSecureList)