X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=1f9ac15e9a2f91ed4e896dc6b8bd0399d41b10bb;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=1e65fcce00c67ac550ace437304eed3ee3d6b272;hpb=76ebc88ccd6fef0bf2d97b607829fb3466e273af;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 1e65fcce0..1f9ac15e9 100644
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -2,25 +2,15 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
- 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include <vector>
 #include "inspircd.h"
 
 /* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
@@ -28,11 +18,14 @@ using namespace std;
 class ModuleSecureList : public Module
 {
  private:
-	 
+	std::vector<std::string> allowlist;
+	time_t WaitTime;
  public:
-	ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
+	ModuleSecureList(InspIRCd* Me) : Module(Me)
 	{
-		
+		OnRehash(NULL,"");
+		Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 	}
  
 	virtual ~ModuleSecureList()
@@ -41,32 +34,46 @@ class ModuleSecureList : public Module
  
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_VENDOR);
+		return Version(1,2,0,0,VF_VENDOR,API_VERSION);
 	}
- 
-	void Implements(char* List)
+
+	void OnRehash(User* user, const std::string &parameter)
 	{
-		List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+		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;
 	}
+ 
 
 	/*
 	 * OnPreCommand()
 	 *   Intercept the LIST command.
 	 */ 
-	virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+	virtual int OnPreCommand(const std::string &command, const std::vector<std::string> &parameters, User *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;
  
-		if ((command == "LIST") && (TIME < (user->signon+60)) && (!*user->oper))
+		if ((command == "LIST") && (ServerInstance->Time() < (user->signon+WaitTime)) && (!IS_OPER(user)))
 		{
-			user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
+			/* 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;
+
+			/* 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, (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);
+			user->WriteNumeric(321, "%s Channel :Users Name",user->nick);
+			user->WriteNumeric(323, "%s :End of channel list.",user->nick);
 			return 1;
 		}
 		return 0;
@@ -77,36 +84,12 @@ class ModuleSecureList : public Module
 		output.append(" SECURELIST");
 	}
 
-	virtual Priority Prioritize()
+	void Prioritize()
 	{
-		return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
+		Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
+		ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIO_BEFORE, &safelist);
 	}
 
 };
  
- 
- 
-/******************************************************************************************************/
- 
-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)