X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_securelist.cpp;h=6013d1fd7543400bfcadf0a4f55f1269f8b058ad;hb=9c6a2d1b5ba5a2aeb91d00e1115534fbde670841;hp=0d04a13ae17b3c136667621a9f801263deabb91c;hpb=d185decae97752368d5cf62311cbc0d1a52aa22c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp index 0d04a13ae..6013d1fd7 100644 --- a/src/modules/m_securelist.cpp +++ b/src/modules/m_securelist.cpp @@ -1,19 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006-2007 Craig Edwards * - * 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 . */ + #include "inspircd.h" -/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */ +/* $ModDesc: Disallows /LIST for recently connected clients to hinder spam bots */ class ModuleSecureList : public Module { @@ -21,11 +29,11 @@ class ModuleSecureList : public Module std::vector 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, 3); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } virtual ~ModuleSecureList() @@ -34,19 +42,18 @@ class ModuleSecureList : public Module virtual Version GetVersion() { - return Version(1,2,0,0,VF_VENDOR,API_VERSION); + return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR); } - void OnRehash(User* user, const std::string ¶meter) + 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)); + ConfigTagList tags = ServerInstance->Config->ConfTags("securehost"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + allowlist.push_back(i->second->getString("exception")); - WaitTime = MyConf->ReadInteger("securelist", "waittime", "60", 0, true); - delete MyConf; + WaitTime = ServerInstance->Config->ConfValue("securelist")->getInt("waittime", 60); } @@ -54,18 +61,18 @@ class ModuleSecureList : public Module * OnPreCommand() * Intercept the LIST command. */ - virtual int OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) + virtual ModResult OnPreCommand(std::string &command, std::vector ¶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::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 %lu seconds of connecting. Please try again later.",user->nick.c_str(), (unsigned long) WaitTime); @@ -74,22 +81,15 @@ class ModuleSecureList : public Module */ 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, PRIO_BEFORE, &safelist); - } - }; MODULE_INIT(ModuleSecureList)