Update copyright headers.

[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 b1aeeb9d44678905a9d961ba592302adf238497c..29ab393c4886698119eeffa87af6a44e780587b8 100644 (file)
--- a/src/modules/m_securelist.cpp
+++ b/src/modules/m_securelist.cpp
@@ -1,9 +1,14 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2013, 2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2013, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
  *   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 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
@@ -22,29 +27,38 @@
 #include "inspircd.h"
 #include "modules/account.h"
 
+typedef std::vector<std::string> AllowList;
+
 class ModuleSecureList : public Module
 {
-       std::vector<std::string> allowlist;
+       AllowList allowlist;
        bool exemptregistered;
        unsigned int WaitTime;
 
  public:
        Version GetVersion() CXX11_OVERRIDE
        {
-               return Version("Disallows /LIST for recently connected clients to hinder spam bots", VF_VENDOR);
+               return Version("Disallows the LIST command for recently connected clients to hinder spam bots", VF_VENDOR);
        }
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               allowlist.clear();
+               AllowList newallows;
 
                ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
                for (ConfigIter i = tags.first; i != tags.second; ++i)
-                       allowlist.push_back(i->second->getString("exception"));
+               {
+                       std::string host = i->second->getString("exception");
+                       if (host.empty())
+                               throw ModuleException("<securehost:exception> is a required field at " + i->second->getTagLocation());
+                       newallows.push_back(host);
+               }
 
                ConfigTag* tag = ServerInstance->Config->ConfValue("securelist");
+
                exemptregistered = tag->getBool("exemptregistered");
                WaitTime = tag->getDuration("waittime", 60, 1);
+               allowlist.swap(newallows);
        }
 
 
@@ -52,7 +66,7 @@ class ModuleSecureList : public Module
         * OnPreCommand()
         *   Intercept the LIST command.
         */
-       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated, const std::string& original_line) CXX11_OVERRIDE
+       ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE
        {
                /* If the command doesnt appear to be valid, we dont want to mess with it. */
                if (!validated)