* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
*
* ---------------------------------------------------
*/
-
-#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. */
std::vector<std::string> allowlist;
time_t WaitTime;
public:
- ModuleSecureList(InspIRCd* Me) : Module(Me)
- {
- OnRehash(NULL,"");
+ ModuleSecureList() {
+ OnRehash(NULL);
+ Implementation eventlist[] = { I_OnRehash, I_OnPreCommand, I_On005Numeric };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
}
-
+
virtual ~ModuleSecureList()
{
}
-
+
virtual Version GetVersion()
{
- return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+ return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR,API_VERSION);
}
- void OnRehash(userrec* user, const std::string ¶meter)
+ void OnRehash(User* user)
{
- ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ ConfigReader* MyConf = new ConfigReader;
allowlist.clear();
- for (int i = 0; i < MyConf->Enumerate("securelist"); i++)
- allowlist.push_back(MyConf->ReadValue("securelist", "exception", i));
+
+ 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;
+ delete MyConf;
}
+
/*
* 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> ¶meters, 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;
-
+ 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");
- }
-
-};
-
-
-
-/******************************************************************************************************/
-
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
- ModuleSecureListFactory()
- {
- }
-
- ~ModuleSecureListFactory()
- {
- }
-
- virtual Module * CreateModule(InspIRCd* Me)
- {
- return new ModuleSecureList(Me);
- }
-
};
-
-extern "C" DllExport void * init_module( void )
-{
- return new ModuleSecureListFactory;
-}
+
+MODULE_INIT(ModuleSecureList)