X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=0e40dc0ea1a9f99edf77451badb8c7a46c7265ce;hb=da29af8cba49d51e53d6e68237ccbf6370b6dd1f;hp=e7655778d76e3a779883321872b72c5ecc886454;hpb=31e2d052252c4113ae9ea63844f60df7759a03be;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index e7655778d..8a627b9a6 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -1,33 +1,37 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Robin Burchell * - * 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 . */ -/* $ModDesc: Adds timed bans */ #include "inspircd.h" -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" -#include "configreader.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 timedbans; @@ -35,105 +39,117 @@ timedbans TimedBanList; /** Handle /TBAN */ -class cmd_tban : public command_t +class CommandTban : public Command { + ChanModeReference banmode; + + bool IsBanSet(Channel* chan, const std::string& mask) + { + ListModeBase* banlm = static_cast(*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: - cmd_tban (InspIRCd* Instance) : command_t(Instance,"TBAN", 0, 3) + CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) + , banmode(Creator, "ban") { - this->source = "m_timedbans.so"; syntax = " "; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { - chanrec* channel = ServerInstance->FindChan(parameters[0]); - if (channel) + Channel* channel = ServerInstance->FindChan(parameters[0]); + 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,parameters[2])) - { - user->WriteServ("NOTICE "+std::string(user->nick)+" :The ban "+std::string(parameters[2])+" is already on the banlist of "+std::string(parameters[0])); - return CMD_FAILURE; - } - } - TimedBan T; - std::string channelname = parameters[0]; - long duration = ServerInstance->Duration(parameters[1]); - unsigned long expire = duration + time(NULL); - if (duration < 1) - { - user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); - return CMD_FAILURE; - } - std::string mask = parameters[2]; - const char *setban[32]; - setban[0] = parameters[0]; - setban[1] = "+b"; - setban[2] = parameters[2]; - // use CallCommandHandler to make it so that the user sets the mode - // themselves - ServerInstance->CallCommandHandler("MODE",setban,3,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,mask.c_str())) - was_added = true; - if (was_added) - { - T.channel = channelname; - T.mask = mask; - T.expire = expire; - TimedBanList.push_back(T); - channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s added a timed ban on %s lasting for %ld seconds.", channel->name, user->nick, mask.c_str(), duration); - return CMD_SUCCESS; - } - return CMD_FAILURE; - } - else user->WriteServ("482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, channel->name); + 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; } - user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); - 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; + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; } }; -class ModuleTimedBans : public Module +class BanWatcher : public ModeWatcher { - cmd_tban* mycommand; public: - ModuleTimedBans(InspIRCd* Me) - : Module(Me) + BanWatcher(Module* parent) + : ModeWatcher(parent, "ban", MODETYPE_CHANNEL) { - - mycommand = new cmd_tban(ServerInstance); - ServerInstance->AddCommand(mycommand); - TimedBanList.clear(); - } - - virtual ~ModuleTimedBans() - { - TimedBanList.clear(); } - void Implements(char* List) + void AfterMode(User* source, User* dest, Channel* chan, const std::string& banmask, bool adding) { - List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1; - } + if (adding) + return; - virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask) - { irc::string listitem = banmask.c_str(); - irc::string thischan = chan->name; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + irc::string thischan = chan->name.c_str(); + for (timedbans::iterator i = TimedBanList.begin(); i != TimedBanList.end(); ++i) { irc::string target = i->mask.c_str(); irc::string tchan = i->channel.c_str(); @@ -143,62 +159,80 @@ class ModuleTimedBans : public Module break; } } - return 0; } +}; - virtual void OnBackgroundTimer(time_t curtime) +class ChannelMatcher +{ + Channel* const chan; + + public: + ChannelMatcher(Channel* ch) + : chan(ch) { - bool again = true; - while (again) + } + + bool operator()(const TimedBan& tb) const + { + 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();) + { + if (curtime > i->expire) + { + expired.push_back(*i); + i = TimedBanList.erase(i); + } + else + ++i; + } + + for (timedbans::iterator i = expired.begin(); i != expired.end(); i++) { - again = false; - for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) + std::string chan = i->channel; + std::string mask = i->mask; + Channel* cr = ServerInstance->FindChan(chan); + if (cr) { - if (curtime > i->expire) - { - chanrec* cr = ServerInstance->FindChan(i->channel); - again = true; - if (cr) - { - cr->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :Timed ban on %s expired.", cr->name, i->mask.c_str()); - const char *setban[3]; - setban[0] = i->channel.c_str(); - setban[1] = "-b"; - setban[2] = 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(ServerInstance); - temp->SetFd(FD_MAGIC_NUMBER); - /* FIX: Send mode remotely*/ - std::deque n; - n.push_back(setban[0]); - n.push_back("-b"); - n.push_back(setban[2]); - ServerInstance->SendMode(setban,3,temp); - Event rmode((char *)&n, NULL, "send_mode"); - rmode.Send(ServerInstance); - DELETE(temp); - } - else - { - /* Where the hell did our channel go?! */ - TimedBanList.erase(i); - } - // we used to delete the item here, but we dont need to as the servermode above does it for us, - break; - } + 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) + { + // 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(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Adds timed bans", VF_COMMON | VF_VENDOR); } }; MODULE_INIT(ModuleTimedBans) -