X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=78915e3ef5280956fd8a7933beb8c16f2d3b9ad0;hb=8f7f74cf0f297e2b8476fc4c670515f8940580ea;hp=7a3c714ed4d7598d0d6a3dd85f30ca4b8da197c5;hpb=450c234e966cd915f7f4b5c74bb2e89b53e1e839;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_timedbans.cpp b/src/modules/m_timedbans.cpp index 7a3c714ed..78915e3ef 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,145 +2,193 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ /* $ModDesc: Adds timed bans */ -/* - * ToDo: - * Err... not a lot really. - */ - -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" -Server *Srv; - -class TimedBan +/** Holds a timed ban + */ +class TimedBan : public classbase { public: std::string channel; std::string mask; - std::string expire; + time_t expire; }; 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 (InspIRCd* Instance) : Command(Instance,"TBAN", 0, 3) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) + this->source = "m_timedbans.so"; + syntax = " "; + TRANSLATE4(TR_TEXT, TR_TEXT, TR_TEXT, TR_END); + } + + CmdResult Handle (const std::vector ¶meters, User *user) + { + Channel* channel = ServerInstance->FindChan(parameters[0]); + if (channel) { - TimedBan T; - std::string channelname = parameters[0]; - unsigned long expire = Srv->Duration(parameters[1]) + time(NULL); - char duration[MAXBUF]; - snprintf(duration,MAXBUF,"%lu",Srv->Duration(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,std::string(user->nick)+" added a timed ban on "+mask+" lasting for "+std::string(duration)+" seconds."); + 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].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 + time(NULL); + if (duration < 1) + { + user->WriteServ("NOTICE "+std::string(user->nick)+" :Invalid ban time"); + return CMD_FAILURE; + } + std::string mask = parameters[2]; + std::vector 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,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, user->nick, 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, user->nick, 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, channel->name, + ServerInstance->Config->AllowHalfop ? " half-" : " channel "); + return CMD_FAILURE; } - 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); + user->WriteNumeric(401, "%s %s :No such channel",user->nick, parameters[0].c_str()); + return CMD_FAILURE; } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); -} +}; class ModuleTimedBans : public Module { + CommandTban* mycommand; public: - ModuleTimedBans() + ModuleTimedBans(InspIRCd* Me) + : Module(Me) { - Srv = new Server; - Srv->AddCommand("TBAN",handle_tban,0,3,"m_timedbans.so"); + + mycommand = new CommandTban(ServerInstance); + ServerInstance->AddCommand(mycommand); + TimedBanList.clear(); + Implementation eventlist[] = { I_OnDelBan, I_OnBackgroundTimer }; + ServerInstance->Modules->Attach(eventlist, this, 2); } virtual ~ModuleTimedBans() { - delete Srv; + TimedBanList.clear(); } - virtual void OnBackgroundTimer(time_t curtime) + virtual int OnDelBan(User* source, Channel* chan, const std::string &banmask) { - bool again = true; - while (again) + irc::string listitem = banmask.c_str(); + irc::string thischan = chan->name; + 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 (i->expire >= curtime) - { - chanrec* cr = Srv->FindChannel(i->channel); - again = true; - if (cr) - { - char *setban[3]; - setban[0] = i->channel.c_str(); - setban[1] = "-b"; - setban[2] = i->mask.c_str(); - Srv->SendMode(setban,3,NULL); - Srv->SendChannelServerNotice(Srv->GetServerName(),channel,"Timed ban on "+i->mask+" expired."); - } - TimedBanList.erase(i); - break; - } + TimedBanList.erase(i); + break; } } + return 0; } - - virtual Version GetVersion() + + virtual void OnBackgroundTimer(time_t curtime) { - return Version(1,0,0,0,VF_VENDOR); - } -}; + timedbans::iterator safei; + 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 > safei->expire) + { + Channel* cr = ServerInstance->FindChan(safei->channel); + if (cr) + { + std::string mask = safei->mask; + std::vector setban; + setban.push_back(safei->channel); + setban.push_back("-b"); + setban.push_back(mask); -class ModuleTimedBansFactory : public ModuleFactory -{ - public: - ModuleTimedBansFactory() - { - } - - ~ModuleTimedBansFactory() - { + CUList empty; + cr->WriteAllExcept(ServerInstance->FakeClient, true, '@', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, safei->mask.c_str()); + if (ServerInstance->Config->AllowHalfop) + cr->WriteAllExcept(ServerInstance->FakeClient, true, '%', empty, "NOTICE %s :*** Timed ban on %s expired.", cr->name, 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); + } + } + } } - virtual Module * CreateModule() + virtual Version GetVersion() { - return new ModuleTimedBans; + return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - }; +MODULE_INIT(ModuleTimedBans) -extern "C" void * init_module( void ) -{ - return new ModuleTimedBansFactory; -}