Merge pull request #1084 from SaberUK/insp20+fix-parallel-debug-install

[user/henk/code/inspircd.git] / src / modules / m_securelist.cpp

diff --git a/src/modules/m_securelist.cpp b/src/modules/m_securelist.cpp
index 6da7ab7aa801fc1b544a79fafcfd2f6f54fd1c8c..6013d1fd7543400bfcadf0a4f55f1269f8b058ad 100644 (file)
--- 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-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 "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<std::string> allowlist;
        time_t WaitTime;
  public:
-       ModuleSecureList(InspIRCd* Me) : Module(Me)
+       void init()
        {
                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("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
        }
 
        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,7 +61,7 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */
-       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, User *user, bool validated, const std::string &original_line)
+       virtual ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, 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)
@@ -83,13 +90,6 @@ class ModuleSecureList : public Module
        {
                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)