-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- * the file COPYING for details.
+ * Copyright (C) 2018 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2018, 2020 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>
*
- * ---------------------------------------------------
+ * 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/>.
*/
-using namespace std;
-
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "helperfuncs.h"
-#include <vector>
-#include "inspircd.h"
-
-extern time_t TIME;
-/* $ModDesc: A module overriding /list, and making it safe - stop those sendq problems. */
+#include "inspircd.h"
+#include "modules/account.h"
+typedef std::vector<std::string> AllowList;
-
class ModuleSecureList : public Module
{
private:
-
+ AllowList allowlist;
+ bool exemptregistered;
+ bool showmsg;
+ unsigned int WaitTime;
+
public:
- ModuleSecureList(InspIRCd* Me) : Module::Module(Me)
- {
-
- }
-
- virtual ~ModuleSecureList()
+ Version GetVersion() CXX11_OVERRIDE
{
+ return Version("Prevents users from using the /LIST command until a predefined period has passed.", VF_VENDOR);
}
-
- virtual Version GetVersion()
- {
- return Version(1,0,0,0,VF_VENDOR);
- }
-
- void Implements(char* List)
+
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
- List[I_OnPreCommand] = List[I_On005Numeric] = 1;
+ AllowList newallows;
+
+ ConfigTagList tags = ServerInstance->Config->ConfTags("securehost");
+ for (ConfigIter i = tags.first; i != tags.second; ++i)
+ {
+ 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");
+ showmsg = tag->getBool("showmsg", true);
+ WaitTime = tag->getDuration("waittime", 60, 1);
+ allowlist.swap(newallows);
}
- /*
- * OnPreCommand()
- * Intercept the LIST command.
- */
- virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated)
+ 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)
- return 0;
-
- if ((command == "LIST") && (TIME < (user->signon+60)) && (!*user->oper))
+ return MOD_RES_PASSTHRU;
+
+ time_t waitallowed = user->signon + WaitTime;
+ if ((command == "LIST") && (ServerInstance->Time() < waitallowed) && (!user->IsOper()))
{
- user->WriteServ("NOTICE %s :*** You cannot list within the first minute of connecting. Please try again later.",user->nick);
- /* 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;
- }
- return 0;
- }
+ /* 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 MOD_RES_PASSTHRU;
- virtual void On005Numeric(std::string &output)
- {
- output.append(" SECURELIST");
- }
+ const AccountExtItem* ext = GetAccountExtItem();
+ if (exemptregistered && ext && ext->get(user))
+ return MOD_RES_PASSTHRU;
- virtual Priority Prioritize()
- {
- return (Priority)ServerInstance->PriorityBefore("m_safelist.so");
- }
+ if (showmsg)
+ {
+ user->WriteNotice(InspIRCd::Format("*** You cannot view the channel list right now. Please %stry again in %s.",
+ (exemptregistered ? "login to an account or " : ""),
+ InspIRCd::DurationString(waitallowed - ServerInstance->Time()).c_str()));
+ }
-};
-
-
-
-/******************************************************************************************************/
-
-class ModuleSecureListFactory : public ModuleFactory
-{
- public:
- ModuleSecureListFactory()
- {
- }
-
- ~ModuleSecureListFactory()
- {
+ // The client might be waiting on a response to do something so send them an
+ // empty list response to satisfy that.
+ user->WriteNumeric(RPL_LISTSTART, "Channel", "Users Name");
+ user->WriteNumeric(RPL_LISTEND, "End of channel list.");
+ return MOD_RES_DENY;
+ }
+ return MOD_RES_PASSTHRU;
}
-
- virtual Module * CreateModule(InspIRCd* Me)
+
+ void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
{
- return new ModuleSecureList(Me);
+ if (showmsg)
+ tokens["SECURELIST"] = ConvToStr(WaitTime);
}
-
};
-
-extern "C" void * init_module( void )
-{
- return new ModuleSecureListFactory;
-}
+
+MODULE_INIT(ModuleSecureList)
projects / user / henk / code / inspircd.git / blobdiff