-/* +------------------------------------+
- * | 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) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2005-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
*
- * 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/>.
*/
-/* $ModDesc: Adds timed bans */
#include "inspircd.h"
+#include "listmode.h"
/** Holds a timed ban
*/
-class TimedBan : public classbase
+class TimedBan
{
public:
std::string channel;
std::string mask;
time_t expire;
+ Channel* chan;
};
typedef std::vector<TimedBan> timedbans;
*/
class CommandTban : public Command
{
+ ChanModeReference banmode;
+
+ bool IsBanSet(Channel* chan, const std::string& mask)
+ {
+ ListModeBase* banlm = static_cast<ListModeBase*>(*banmode);
+ const ListModeBase::ModeList* bans = banlm->GetList(chan);
+ if (bans)
+ {
+ for (ListModeBase::ModeList::const_iterator i = bans->begin(); i != bans->end(); ++i)
+ {
+ const ListModeBase::ListItem& ban = *i;
+ if (!strcasecmp(ban.mask.c_str(), mask.c_str()))
+ return true;
+ }
+ }
+
+ return false;
+ }
+
public:
- CommandTban (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3)
+ CommandTban(Module* Creator) : Command(Creator,"TBAN", 3)
+ , banmode(Creator, "ban")
{
- this->source = "m_timedbans.so";
syntax = "<channel> <duration> <banmask>";
- TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END);
}
CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
{
Channel* channel = ServerInstance->FindChan(parameters[0]);
- if (channel)
+ if (!channel)
{
- int cm = channel->GetStatus(user);
- if ((cm == STATUS_HOP) || (cm == STATUS_OP))
- {
- if (!ServerInstance->IsValidMask(parameters[2]))
- {
- user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban mask");
- return CMD_FAILURE;
- }
- for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
- {
- if (!strcasecmp(i->data.c_str(), parameters[2].c_str()))
- {
- user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+parameters[2]+" is already on the banlist of "+parameters[0]);
- return CMD_FAILURE;
- }
- }
- TimedBan T;
- std::string channelname = parameters[0];
- long duration = ServerInstance->Duration(parameters[1]);
- unsigned long expire = duration + ServerInstance->Time();
- if (duration < 1)
- {
- user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time");
- return CMD_FAILURE;
- }
- std::string mask = parameters[2];
- std::vector<std::string> setban;
- setban.push_back(parameters[0]);
- setban.push_back("+b");
- setban.push_back(parameters[2]);
- // use CallCommandHandler to make it so that the user sets the mode
- // themselves
- ServerInstance->CallCommandHandler("MODE",setban,user);
- /* Check if the ban was actually added (e.g. banlist was NOT full) */
- bool was_added = false;
- for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++)
- if (!strcasecmp(i->data.c_str(), mask.c_str()))
- was_added = true;
- if (was_added)
- {
- CUList tmp;
- T.channel = channelname;
- T.mask = mask;
- T.expire = expire;
- TimedBanList.push_back(T);
- channel->WriteAllExcept(user, true, '@', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration);
- if (ServerInstance->Config->AllowHalfop)
- channel->WriteAllExcept(user, true, '%', tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration);
- return CMD_SUCCESS;
- }
- return CMD_FAILURE;
- }
- else user->WriteNumeric(482, "%s %s :You must be at least a%soperator to change modes on this channel",user->nick.c_str(), channel->name.c_str(),
- ServerInstance->Config->AllowHalfop ? " half-" : " channel ");
+ user->WriteNumeric(Numerics::NoSuchNick(parameters[0]));
+ return CMD_FAILURE;
+ }
+ int cm = channel->GetPrefixValue(user);
+ if (cm < HALFOP_VALUE)
+ {
+ user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channel->name, "You do not have permission to set bans on this channel");
+ return CMD_FAILURE;
+ }
+
+ TimedBan T;
+ std::string channelname = parameters[0];
+ unsigned long duration = InspIRCd::Duration(parameters[1]);
+ unsigned long expire = duration + ServerInstance->Time();
+ if (duration < 1)
+ {
+ user->WriteNotice("Invalid ban time");
+ return CMD_FAILURE;
+ }
+ std::string mask = parameters[2];
+ bool isextban = ((mask.size() > 2) && (mask[1] == ':'));
+ if (!isextban && !InspIRCd::IsValidMask(mask))
+ mask.append("!*@*");
+
+ if (IsBanSet(channel, mask))
+ {
+ user->WriteNotice("Ban already set");
+ return CMD_FAILURE;
+ }
+
+ Modes::ChangeList setban;
+ setban.push_add(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);
+ // Pass the user (instead of ServerInstance->FakeClient) to ModeHandler::Process() to
+ // make it so that the user sets the mode themselves
+ ServerInstance->Modes->Process(user, channel, NULL, setban);
+ if (ServerInstance->Modes->GetLastParse().empty())
+ {
+ user->WriteNotice("Invalid ban mask");
return CMD_FAILURE;
}
- user->WriteNumeric(401, "%s %s :No such channel",user->nick.c_str(), parameters[0].c_str());
- return CMD_FAILURE;
+
+ CUList tmp;
+ T.channel = channelname;
+ T.mask = mask;
+ T.expire = expire + (IS_REMOTE(user) ? 5 : 0);
+ T.chan = channel;
+ TimedBanList.push_back(T);
+
+ // If halfop is loaded, send notice to halfops and above, otherwise send to ops and above
+ ModeHandler* mh = ServerInstance->Modes->FindMode('h', MODETYPE_CHANNEL);
+ char pfxchar = (mh && mh->name == "halfop") ? '%' : '@';
+
+ channel->WriteAllExcept(ServerInstance->FakeClient, true, pfxchar, tmp, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name.c_str(), user->nick.c_str(), mask.c_str(), duration);
+ return CMD_SUCCESS;
+ }
+
+ RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+ {
+ return ROUTE_BROADCAST;
}
};
-class ModuleTimedBans : public Module
+class BanWatcher : public ModeWatcher
{
- CommandTban* mycommand;
public:
- ModuleTimedBans(InspIRCd* Me)
- : Module(Me)
+ BanWatcher(Module* parent)
+ : ModeWatcher(parent, "ban", MODETYPE_CHANNEL)
{
-
- mycommand = new CommandTban(ServerInstance);
- ServerInstance->AddCommand(mycommand);
- TimedBanList.clear();
- Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer };
- ServerInstance->Modules->Attach(eventlist, this, 2);
}
- virtual ~ModuleTimedBans()
+ void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding)
{
- TimedBanList.clear();
- }
+ if (adding)
+ return;
- virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask)
- {
irc::string listitem = banmask.c_str();
irc::string thischan = chan->name.c_str();
- for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++)
+ for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); ++i)
{
irc::string target = i->mask.c_str();
irc::string tchan = i->channel.c_str();
break;
}
}
- return 0;
+ }
+};
+
+class ChannelMatcher
+{
+ Channel* const chan;
+
+ public:
+ ChannelMatcher(Channel* ch)
+ : chan(ch)
+ {
}
- virtual void OnBackgroundTimer(time_t curtime)
+ bool operator()(const TimedBan& tb) const
{
- timedbans::iterator safei;
- for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end();)
+ return (tb.chan == chan);
+ }
+};
+
+class ModuleTimedBans : public Module
+{
+ CommandTban cmd;
+ BanWatcher banwatcher;
+
+ public:
+ ModuleTimedBans()
+ : cmd(this)
+ , banwatcher(this)
+ {
+ }
+
+ void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
+ {
+ timedbans expired;
+ for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();)
{
- /* Safe copy of iterator, so we can erase as we iterate */
- safei = i;
- ++i;
+ if (curtime > i->expire)
+ {
+ expired.push_back(*i);
+ i = TimedBanList.erase(i);
+ }
+ else
+ ++i;
+ }
- if (curtime > safei->expire)
+ for (timedbans::iterator i = expired.begin(); i != expired.end(); i++)
+ {
+ std::string chan = i->channel;
+ std::string mask = i->mask;
+ Channel* cr = ServerInstance->FindChan(chan);
+ if (cr)
{
- Channel* cr = ServerInstance->FindChan(safei->channel);
- if (cr)
- {
- std::string mask = safei->mask;
- std::vector<std::string> setban;
- setban.push_back(safei->channel);
- setban.push_back("-b");
- setban.push_back(mask);
-
- CUList empty;
- cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name.c_str(), safei->mask.c_str());
- if (ServerInstance->Config->AllowHalfop)
- cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name.c_str(), safei->mask.c_str());
-
- /* Removes the ban item for us, no ::erase() needed */
- ServerInstance->PI->SendModeStr(safei->channel, std::string("-b ") + setban[2]);
- ServerInstance->SendMode(setban, ServerInstance->FakeClient);
-
- if (ServerInstance->Modes->GetLastParse().empty())
- TimedBanList.erase(safei);
- }
- else
- {
- /* Where the hell did our channel go?! */
- TimedBanList.erase(safei);
- }
+ CUList empty;
+ std::string expiry = "*** Timed ban on " + chan + " expired.";
+ cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :%s", cr->name.c_str(), expiry.c_str());
+ ServerInstance->PI->SendChannelNotice(cr, '@', expiry);
+
+ Modes::ChangeList setban;
+ setban.push_remove(ServerInstance->Modes->FindMode('b', MODETYPE_CHANNEL), mask);
+ ServerInstance->Modes->Process(ServerInstance->FakeClient, cr, NULL, setban);
}
}
}
- virtual Version GetVersion()
+ void OnChannelDelete(Channel* chan)
{
- return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
+ // Remove all timed bans affecting the channel from internal bookkeeping
+ TimedBanList.erase(std::remove_if(TimedBanList.begin(), TimedBanList.end(), ChannelMatcher(chan)), TimedBanList.end());
+ }
+
+ Version GetVersion() CXX11_OVERRIDE
+ {
+ return Version("Adds timed bans", VF_COMMON | VF_VENDOR);
}
};
MODULE_INIT(ModuleTimedBans)
-
projects / user / henk / code / inspircd.git / blobdiff