X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_timedbans.cpp;h=2f4f040c06f67b910cc15155b088756aa815d4eb;hb=2c6c072c1f5f19d1471feb43fa94bba0030e5fb6;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..2f4f040c0 100644 --- a/src/modules/m_timedbans.cpp +++ b/src/modules/m_timedbans.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * Inspire is copyright (C) 2002-2004 ChatSpike-Dev. + * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. * E-mail: * * @@ -14,76 +14,132 @@ * --------------------------------------------------- */ -/* $ModDesc: Adds timed bans */ +using namespace std; -/* - * ToDo: - * Err... not a lot really. - */ +/* $ModDesc: Adds timed bans */ #include #include #include "users.h" #include "channels.h" #include "modules.h" +#include "helperfuncs.h" +#include "hashcomp.h" -Server *Srv; +static Server *Srv; -class TimedBan +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) +class cmd_tban : public command_t { - chanrec* channel = Srv->FindChannel(parameters[0]); - if (channel) + public: + cmd_tban () : command_t("TBAN", 0, 3) { - std::string cm = Srv->ChanMode(user,channel); - if ((cm == "%") || (cm == "@")) + this->source = "m_timedbans.so"; + } + + void Handle (const char** parameters, int pcnt, userrec *user) + { + chanrec* channel = Srv->FindChannel(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."); + 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++) + { + 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]; + 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 + 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; } - 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); + WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); } - WriteServ(user->fd,"401 %s %s :No such channel",user->nick, parameters[0]); -} +}; class ModuleTimedBans : public Module { + cmd_tban* mycommand; public: - ModuleTimedBans() + ModuleTimedBans(Server* Me) + : Module::Module(Me) { - Srv = new Server; - Srv->AddCommand("TBAN",handle_tban,0,3,"m_timedbans.so"); + Srv = Me; + mycommand = new cmd_tban(); + Srv->AddCommand(mycommand); + TimedBanList.clear(); } virtual ~ModuleTimedBans() { - delete Srv; + TimedBanList.clear(); + } + + void Implements(char* List) + { + List[I_OnDelBan] = List[I_OnBackgroundTimer] = 1; + } + + virtual int OnDelBan(userrec* source, chanrec* chan, const std::string &banmask) + { + 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) @@ -94,20 +150,29 @@ class ModuleTimedBans : public Module again = false; for (timedbans::iterator i = TimedBanList.begin(); i < TimedBanList.end(); i++) { - if (i->expire >= curtime) + if (curtime > i->expire) { chanrec* cr = Srv->FindChannel(i->channel); again = true; if (cr) { - char *setban[3]; + Srv->SendChannelServerNotice(Srv->GetServerName(),cr,"NOTICE "+std::string(cr->name)+" :Timed ban on "+i->mask+" expired."); + const 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."); + // 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); } - TimedBanList.erase(i); + // we used to delete the item here, but we dont need to as the servermode above does it for us, break; } } @@ -132,9 +197,9 @@ class ModuleTimedBansFactory : public ModuleFactory { } - virtual Module * CreateModule() + virtual Module * CreateModule(Server* Me) { - return new ModuleTimedBans; + return new ModuleTimedBans(Me); } };