X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=e3a93833686355ad265ea950049e964d6e50b0f4;hb=f62654a6859998f9d63eb22702c572d5ebcff15c;hp=8082831f090a0a9b568e2166c509432973c0034f;hpb=c12ec889bb600626ecbd0cb903564f639ee55700;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 8082831f0..e3a938336 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -1,34 +1,29 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2005-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Robin Burchell * - * 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. + * 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 */ -/* - * ToDo: - * Err... not a lot really. - */ - -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" - -Server *Srv; - +#include "inspircd.h" + +/** Holds a timed ban + */ class TimedBan { public: @@ -40,150 +35,159 @@ class TimedBan typedef std::vector timedbans; timedbans TimedBanList; -void handle_tban(char **parameters, int pcnt, userrec *user) +/** Handle /TBAN + */ +class CommandTban : public Command { - chanrec* channel = Srv->FindChannel(parameters[0]); - if (channel) + public: + CommandTban(Module* Creator) : Command(Creator,"TBAN", 3) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) - { - 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++) - { - if ((!strcasecmp(i->mask.c_str(),parameters[2])) && (!strcasecmp(i->channel.c_str(),parameters[0]))) - { - 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; - } - 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; + syntax = " "; } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); -} -class ModuleTimedBans : public Module -{ - public: - ModuleTimedBans() + CmdResult Handle (const std::vector ¶meters, User *user) { - Srv = new Server; - Srv->AddCommand("TBAN",handle_tban,0,3,"m_timedbans.so"); - TimedBanList.clear(); + Channel* channel = ServerInstance->FindChan(parameters[0]); + if (!channel) + { + user->WriteNumeric(ERR_NOSUCHNICK, "%s :No such channel", parameters[0].c_str()); + return CMD_FAILURE; + } + int cm = channel->GetPrefixValue(user); + if (cm < HALFOP_VALUE) + { + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s :You do not have permission to set bans on this channel", + channel->name.c_str()); + 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]; + std::vector setban; + setban.push_back(parameters[0]); + setban.push_back("+b"); + bool isextban = ((mask.size() > 2) && (mask[1] == ':')); + if (!isextban && !InspIRCd::IsValidMask(mask)) + mask.append("!*@*"); + + setban.push_back(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(setban, user); + 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); + 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; } - - virtual ~ModuleTimedBans() + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - delete Srv; - TimedBanList.clear(); + 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++) - { - if (!strcasecmp(banmask.c_str(),i->mask.c_str())) - { - 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; - 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() - { - return Version(1,0,0,0,VF_VENDOR); - } }; - -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) + { + std::vector setban; + setban.push_back(chan); + setban.push_back("-b"); + setban.push_back(mask); + + 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); + + ServerInstance->Modes->Process(setban, ServerInstance->FakeClient); + } + } } - - virtual Module * CreateModule() + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleTimedBans; + return Version("Adds timed bans", VF_COMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleTimedBansFactory; -} +MODULE_INIT(ModuleTimedBans)