* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
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 Version GetVersion()
{
- return Version("$Id$",VF_VENDOR,API_VERSION);
+ return Version("A module overriding /list, and making it safe - stop those sendq problems.",VF_VENDOR);
}
- void OnRehash(User* user, const std::string ¶meter)
+ void OnRehash(User* user)
{
- ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ ConfigReader MyConf;
allowlist.clear();
- for (int i = 0; i < MyConf->Enumerate("securehost"); i++)
- allowlist.push_back(MyConf->ReadValue("securehost", "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;
+ WaitTime = MyConf.ReadInteger("securelist", "waittime", "60", 0, true);
}
* OnPreCommand()
* Intercept the LIST command.
*/
- virtual int OnPreCommand(std::string &command, std::vector<std::string> ¶meters, User *user, bool validated, const std::string &original_line)
+ virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> ¶meters, 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 (InspIRCd::Match(user->MakeHost(), *x, ascii_case_insensitive_map))
- return 0;
+ return MOD_RES_PASSTHRU;
/* 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.c_str(), (unsigned long) WaitTime);
*/
user->WriteNumeric(321, "%s Channel :Users Name",user->nick.c_str());
user->WriteNumeric(323, "%s :End of channel list.",user->nick.c_str());
- return 1;
+ return MOD_RES_DENY;
}
- return 0;
+ return MOD_RES_PASSTHRU;
}
virtual void On005Numeric(std::string &output)
{
output.append(" SECURELIST");
}
-
- void Prioritize()
- {
- Module* safelist = ServerInstance->Modules->Find("m_safelist.so");
- ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &safelist);
- }
-
};
MODULE_INIT(ModuleSecureList)