X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=0e40dc0ea1a9f99edf77451badb8c7a46c7265ce;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=80430423670dfb7edad5b45d2c7b5d321b099168;hpb=53e521785f75f9a3f8be7f8110a8af65fcaff410;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 804304236..8a627b9a6 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -1,211 +1,238 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Robin Burchell * - * --------------------------------------------------- + * 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 . */ -using namespace std; -/* $ModDesc: Adds timed bans */ +#include "inspircd.h" +#include "listmode.h" -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "hashcomp.h" - -Server *Srv; - +/** Holds a timed ban + */ class TimedBan { public: std::string channel; std::string mask; time_t expire; + Channel* chan; }; typedef std::vector timedbans; timedbans TimedBanList; -class cmd_tban : public command_t +/** Handle /TBAN + */ +class CommandTban : public Command { - public: - cmd_tban () : command_t("TBAN", 0, 3) - { - this->source = "m_timedbans.cpp"; - } + ChanModeReference banmode; - void Handle (char **parameters, int pcnt, userrec *user) + bool IsBanSet(Channel* chan, const std::string& mask) { - chanrec* channel = Srv->FindChannel(parameters[0]); - if (channel) + ListModeBase* banlm = static_cast(*banmode); + const ListModeBase::ModeList* bans = banlm->GetList(chan); + if (bans) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) + for (ListModeBase::ModeList::const_iterator i = bans->begin(); i != bans->end(); ++i) { - if (!Srv->IsValidMask(parameters[2])) - { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban mask"); - return; - } - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) - { - irc::string listitem = i->mask.c_str(); - irc::string target = parameters[2]; - irc::string listchan = i->channel.c_str(); - irc::string targetchan = parameters[0]; - if ((listitem == target) && (listchan == targetchan)) - { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); - return; - } - } - TimedBan T; - std::string channelname = parameters[0]; - unsigned long expire = Srv->CalcDuration(parameters[1]) + time(NULL); - if (Srv->CalcDuration(parameters[1]) < 1) - { - Srv->SendServ(user->fd,"NOTICE "+std::string(user->nick)+" :Invalid ban time"); - return; - } - char duration[MAXBUF]; - snprintf(duration,MAXBUF,"%lu",Srv->CalcDuration(parameters[1])); - std::string mask = parameters[2]; - char *setban[3]; - setban[0] = parameters[0]; - setban[1] = "+b"; - setban[2] = parameters[2]; - // use CallCommandHandler to make it so that the user sets the mode - // themselves - Srv->CallCommandHandler("MODE",setban,3,user); - T.channel = channelname; - T.mask = mask; - T.expire = expire; - TimedBanList.push_back(T); - Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"NOTICE "+std::string(channel->name)+" :"+std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds."); - return; + const ListModeBase::ListItem& ban = *i; + if (!strcasecmp(ban.mask.c_str(), mask.c_str())) + return true; } - else WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); - return; } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); + + return false; } -}; -class ModuleTimedBans : public Module -{ - cmd_tban* mycommand; public: - ModuleTimedBans(Server* Me) - : Module::Module(Me) + CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) + , banmode(Creator, "ban") { - Srv = Me; - mycommand = new cmd_tban(); - Srv->AddCommand(mycommand); - TimedBanList.clear(); + syntax = " "; } - - virtual ~ModuleTimedBans() + + CmdResult Handle (const std::vector ¶meters, User *user) { - TimedBanList.clear(); + Channel* channel = ServerInstance->FindChan(parameters[0]); + if (!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; + } + + 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; } - void Implements(char* List) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1; + return ROUTE_BROADCAST; } +}; - virtual int OnDelBan(userrec* source, chanrec* chan, std::string banmask) +class BanWatcher : public ModeWatcher +{ + public: + BanWatcher(Module* parent) + : ModeWatcher(parent, "ban", MODETYPE_CHANNEL) { - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) - { - irc::string listitem = banmask.c_str(); - irc::string target = i->mask.c_str(); - if (listitem == target) - { - TimedBanList.erase(i); - break; - } - } - return 0; } - virtual void OnBackgroundTimer(time_t curtime) + void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding) { - bool again = true; - while (again) + if (adding) + return; + + irc::string listitem = banmask.c_str(); + irc::string thischan = chan->name.c_str(); + for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); ++i) { - again = false; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + irc::string target = i->mask.c_str(); + irc::string tchan = i->channel.c_str(); + if ((listitem == target) && (tchan == thischan)) { - if (curtime > i->expire) - { - chanrec* cr = Srv->FindChannel(i->channel); - again = true; - if (cr) - { - Srv->SendChannelServerNotice(Srv->GetServerName(),cr,"NOTICE "+std::string(cr->name)+" :Timed ban on "+i->mask+" expired."); - char *setban[3]; - setban[0] = (char*)i->channel.c_str(); - setban[1] = "-b"; - setban[2] = (char*)i->mask.c_str(); - // kludge alert! - // ::SendMode expects a userrec* to send the numeric replies - // back to, so we create it a fake user that isnt in the user - // hash and set its descriptor to FD_MAGIC_NUMBER so the data - // falls into the abyss :p - userrec* temp = new userrec; - temp->fd = FD_MAGIC_NUMBER; - temp->server = ""; - Srv->SendMode(setban,3,temp); - delete temp; - } - // we used to delete the item here, but we dont need to as the servermode above does it for us, - break; - } + TimedBanList.erase(i); + break; } } } - - virtual Version GetVersion() +}; + +class ChannelMatcher +{ + Channel* const chan; + + public: + ChannelMatcher(Channel* ch) + : chan(ch) + { + } + + bool operator()(const TimedBan& tb) const { - return Version(1,0,0,0,VF_VENDOR); + return (tb.chan == chan); } }; - -class ModuleTimedBansFactory : public ModuleFactory +class ModuleTimedBans : public Module { + CommandTban cmd; + BanWatcher banwatcher; + public: - ModuleTimedBansFactory() + ModuleTimedBans() + : cmd(this) + , banwatcher(this) { } - - ~ModuleTimedBansFactory() + + void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE { + timedbans expired; + for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end();) + { + if (curtime > i->expire) + { + expired.push_back(*i); + i = TimedBanList.erase(i); + } + else + ++i; + } + + 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) + { + 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 Module * CreateModule(Server* Me) + + void OnChannelDelete(Channel* chan) { - return new ModuleTimedBans(Me); + // 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); + } +}; -extern "C" void * init_module( void ) -{ - return new ModuleTimedBansFactory; -} +MODULE_INIT(ModuleTimedBans)