X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=b1aeeb9d44678905a9d961ba592302adf238497c;hb=384ef31bc01e4a1a2e59d082c9066002410ba54a;hp=b9d7363a5f4dbe561765774e85130485e7890f4e;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index b9d7363a5..b1aeeb9d4 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -1,107 +1,90 @@
-/*       +------------------------------------+
- *       | 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 "users.h"
-#include "channels.h"
-#include "modules.h"
 
-#include <vector>
-#include "inspircd.h"
 
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+#include "inspircd.h"
+#include "modules/account.h"
 
 class ModuleSecureList : public Module
 {
- private:
-	 
+	std::vector<std::string> allowlist;
+	bool exemptregistered;
+	unsigned int WaitTime;
+
  public:
-	ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
-	{
-		
-	}
- 
-	virtual ~ModuleSecureList()
-	{
-	}
- 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		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 Implements(char* List)
+
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+		allowlist.clear();
+
+		ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+		for (ConfigIter i = tags.first; i != tags.second; ++i)
+			allowlist.push_back(i->second->getString("exception"));
+
+		ConfigTag* tag = ServerInstance->Config->ConfValue("securelist");
+		exemptregistered = tag->getBool("exemptregistered");
+		WaitTime = tag->getDuration("waittime", 60, 1);
 	}
 
+
 	/*
 	 * 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)
+	 */
+	ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE
 	{
 		/* If the command doesnt appear to be valid, we dont want to mess with it. */
 		if (!validated)
-			return 0;
- 
-		if ((command == "LIST") && (ServerInstance->Time() < (user->signon+60)) && (!*user->oper))
+			return MOD_RES_PASSTHRU;
+
+		if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!user->IsOper()))
 		{
-			user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
-			/* Some crap clients (read: mIRC, various java chat applets) muck up if they don't
+			/* 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->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->WriteServ("321 %s Channel :Users Name",user->nick);
-			user->WriteServ("323 %s :End of channel list.",user->nick);
-			return 1;
+			user->WriteNumeric(RPL_LISTSTART, "Channel", "Users Name");
+			user->WriteNumeric(RPL_LISTEND, "End of channel list.");
+			return MOD_RES_DENY;
 		}
-		return 0;
+		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"];
 	}
-
-	virtual Priority Prioritize()
-	{
-		return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
-	}
-
 };
- 
- 
- 
-/******************************************************************************************************/
- 
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
-	ModuleSecureListFactory()
-	{
-	}
- 
-	~ModuleSecureListFactory()
-	{
-	}
- 
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleSecureList(Me);
-	}
- 
-};
- 
-extern "C" void * init_module( void )
-{
-	return new ModuleSecureListFactory;
-}
+
+MODULE_INIT(ModuleSecureList)