X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=1285d7a776aff1545e5c39d8e6454e1039ae4e4c;hb=95c1fb9bdd5f93cf4f8306a7b8ae9ca098aade1a;hp=fa554102f842d953d7aff67f943f445391c688ed;hpb=7f89baebc58c2e27740aa01c33187c0c0229abd8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index fa554102f..1285d7a77 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -2,263 +2,212 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see * the file COPYING for details. * * --------------------------------------------------- */ -#include -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "helperfuncs.h" -#include "hashcomp.h" +#include "inspircd.h" +#include "xline.h" /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ -class CBan +/** Holds a CBAN item + */ +class CBan : public XLine { public: - irc::string chname; - std::string set_by; - time_t set_on; - long length; - std::string reason; + irc::string matchtext; - CBan() + CBan(time_t s_time, long d, std::string src, std::string re, std::string ch) + : XLine(s_time, d, src, re, "CBAN") { + this->matchtext = ch.c_str(); } - CBan(irc::string cn, std::string sb, time_t so, long ln, std::string rs) : chname(cn), set_by(sb), set_on(so), length(ln), reason(rs) + ~CBan() { } -}; -std::string EncodeCBan(const CBan &ban); -CBan DecodeCBan(const std::string &data); -bool CBanComp(const CBan &ban1, const CBan &ban2); -void ExpireBans(); + // XXX I shouldn't have to define this + bool Matches(User *u) + { + return false; + } -extern time_t TIME; -typedef std::vector cbanlist; + bool Matches(const std::string &s) + { + if (matchtext == s) + return true; + return false; + } -/* cbans is declared here, as our type is right above. Don't try move it. */ -cbanlist cbans; + void DisplayExpiry() + { + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)", + this->matchtext.c_str(), this->source.c_str(), (long int)(ServerInstance->Time() - this->set_time)); + } + + const char* Displayable() + { + return matchtext.c_str(); + } +}; -class cmd_cban : public command_t +/** An XLineFactory specialized to generate cban pointers + */ +class CBanFactory : public XLineFactory { - private: - Server *Srv; + public: + CBanFactory() : XLineFactory("CBAN") { } + + /** Generate a shun + */ + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) + { + return new CBan(set_time, duration, source, reason, xline_specific_mask); + } + + bool AutoApplyToUserList(XLine *x) + { + return false; // No, we apply to channels. + } +}; +/** Handle /CBAN + */ +class CommandCBan : public Command +{ public: - cmd_cban(Server* Me) : command_t("CBAN", 'o', 1) + CommandCBan(Module* Creator) : Command(Creator, "CBAN", 1, 3) { - this->source = "m_cban.so"; - this->Srv = Me; + flags_needed = 'o'; this->syntax = " [ :]"; + TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END); } - void Handle(char **parameters, int pcnt, userrec *user) + CmdResult Handle(const std::vector ¶meters, User *user) { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ - - ExpireBans(); - if(pcnt == 1) + if (parameters.size() == 1) { - /* form: CBAN #channel removes a CBAN */ - for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "CBAN", user)) { - if (parameters[0] == iter->chname) - { - unsigned long remaining = (iter->set_on + iter->length) - TIME; - WriteServ(user->fd, "386 %s %s :Removed CBAN with %lu seconds left before expiry (%s)", user->nick, iter->chname.c_str(), remaining, iter->reason.c_str()); - cbans.erase(iter); - break; - } + ServerInstance->SNO->WriteGlobalSno('x', "%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str()); } + else + { + user->WriteServ("NOTICE %s :*** CBan %s not found in list, try /stats C.",user->nick.c_str(),parameters[0].c_str()); + } + + return CMD_SUCCESS; } - else if (pcnt >= 2) + else if (parameters.size() >= 2) { - /* full form to add a CBAN */ - if (IsValidChannelName(parameters[0])) + // Adding - XXX todo make this respect tag perhaps.. + long duration = ServerInstance->Duration(parameters[1]); + CBan *r = NULL; + const char *reason = (parameters.size() > 2) ? parameters[2].c_str() : "No reason supplied"; + + try + { + r = new CBan(ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str()); + } + catch (...) { - // parameters[0] = #channel - // parameters[1] = 1h3m2s - // parameters[2] = Tortoise abuser - long length = Srv->CalcDuration(parameters[1]); - std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - - cbans.push_back(CBan(parameters[0], user->nick, TIME, length, reason)); - - std::sort(cbans.begin(), cbans.end(), CBanComp); - - if(length > 0) + ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. + } + + if (r) + { + if (ServerInstance->XLines->AddLine(r, user)) { - WriteServ(user->fd, "385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str()); - WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + if (!duration) + { + ServerInstance->SNO->WriteGlobalSno('x', "%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason); + } + else + { + time_t c_requires_crap = duration + ServerInstance->Time(); + ServerInstance->SNO->WriteGlobalSno('x', "%s added timed CBan for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), reason); + } + + ServerInstance->XLines->ApplyLines(); } else { - WriteServ(user->fd, "385 %s %s :Added permenant channel ban (%s)", user->nick, parameters[0], reason.c_str()); - WriteOpers("*** %s added permenant channel ban on %s (%s)", user->nick, parameters[0], reason.c_str()); + delete r; + user->WriteServ("NOTICE %s :*** CBan for %s already exists", user->nick.c_str(), parameters[0].c_str()); } } - else - { - WriteServ(user->fd, "403 %s %s :Invalid channel name", user->nick, parameters[0]); - } } + + return CMD_FAILURE; + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; } }; class ModuleCBan : public Module { - cmd_cban* mycommand; - Server* Srv; + CommandCBan mycommand; + CBanFactory f; public: - ModuleCBan(Server* Me) : Module::Module(Me) + ModuleCBan() : mycommand(this) { - Srv = Me; - mycommand = new cmd_cban(Srv); - Srv->AddCommand(mycommand); - } + ServerInstance->XLines->RegisterFactory(&f); - void Implements(char* List) - { - List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1; - } - - virtual int OnStats(char symbol, userrec* user) - { - ExpireBans(); - - if(symbol == 'C') - { - for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) - { - unsigned long remaining = (iter->set_on + iter->length) - TIME; - WriteServ(user->fd, "210 %s %s %s %lu %lu %lu :%s", user->nick, iter->chname.c_str(), iter->set_by.c_str(), iter->set_on, iter->length, remaining, iter->reason.c_str()); - } - } - - return 0; - } - - virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname) - { - ExpireBans(); - - /* check cbans in here, and apply as necessary. */ - for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) - { - if(iter->chname == cname && !strchr(user->modes, 'o')) - { - // Channel is banned. - WriteServ(user->fd, "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str()); - WriteOpers("*** %s tried to join %s which is CBANed (%s)", user->nick, cname, iter->reason.c_str()); - return 1; - } - } - return 0; - } - - virtual void OnSyncOtherMetaData(Module* proto, void* opaque) - { - for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) - { - proto->ProtoSendMetaData(opaque, TYPE_OTHER, NULL, "cban", EncodeCBan(*iter)); - } - } - - virtual void OnDecodeMetaData(int target_type, void* target, std::string extname, std::string extdata) - { - if((target_type == TYPE_OTHER) && (extname == "cban")) - { - cbans.push_back(DecodeCBan(extdata)); - std::sort(cbans.begin(), cbans.end(), CBanComp); - } + ServerInstance->AddCommand(&mycommand); + Implementation eventlist[] = { I_OnUserPreJoin, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 2); } virtual ~ModuleCBan() { + ServerInstance->XLines->DelAll("CBAN"); + ServerInstance->XLines->UnregisterFactory(&f); } - - virtual Version GetVersion() + + virtual ModResult OnStats(char symbol, User* user, string_list &out) { - return Version(1,0,0,1,VF_VENDOR); + if (symbol != 'C') + return MOD_RES_PASSTHRU; + + ServerInstance->XLines->InvokeStats("CBAN", 210, user, out); + return MOD_RES_DENY; } -}; -std::string EncodeCBan(const CBan &ban) -{ - std::ostringstream stream; - stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason; - return stream.str(); -} + virtual ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) + { + XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname); -CBan DecodeCBan(const std::string &data) -{ - CBan res; - std::istringstream stream(data); - stream >> res.chname; - stream >> res.set_by; - stream >> res.set_on; - stream >> res.length; - res.reason = stream.str(); - - return res; -} - -bool CBanComp(const CBan &ban1, const CBan &ban2) -{ - return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); -} + if (rl) + { + // Channel is banned. + user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason.c_str()); + ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)", + user->nick.c_str(), cname, rl->reason.c_str()); + ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + rl->reason + ")"); + return MOD_RES_DENY; + } -void ExpireBans() -{ - while(cbans.size() && ((cbans.begin()->set_on + cbans.begin()->length) <= TIME)) - { - cbanlist::iterator iter = cbans.begin(); - - log(DEBUG, "m_cban.so: Ban on %s expired, removing...", iter->chname.c_str()); - WriteOpers("*** %li second CBAN on %s (%s) set %u seconds ago expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), TIME - iter->set_on); - cbans.erase(iter); + return MOD_RES_PASSTHRU; } -} -class ModuleCBanFactory : public ModuleFactory -{ - public: - ModuleCBanFactory() - { - } - - ~ModuleCBanFactory() - { - } - - virtual Module * CreateModule(Server* Me) + virtual Version GetVersion() { - return new ModuleCBan(Me); + return Version("Gives /cban, aka C:lines. Think Q:lines, for channels.", VF_COMMON | VF_VENDOR); } - }; +MODULE_INIT(ModuleCBan) -extern "C" void * init_module( void ) -{ - return new ModuleCBanFactory; -}