X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=11bd32c8a03cdf484c975a0701a855829f50087f;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=c8e6a86b913552757fe7941e61d3e48caf0b6534;hpb=2b8ce39c6ea5e7a22fe39b21756f82051465f143;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index c8e6a86b9..11bd32c8a 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -12,238 +12,197 @@ */ #include "inspircd.h" -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" +#include "xline.h" /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ /** Holds a CBAN item */ -class CBan : public classbase +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(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *ch) : XLine(Instance, s_time, d, src, re, "CBAN") { + this->matchtext = ch; } - 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() { } + + // XXX I shouldn't have to define this + bool Matches(User *u) + { + return false; + } + + bool Matches(const std::string &s) + { + if (matchtext == s) + return true; + return false; + } + + void DisplayExpiry() + { + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired CBan %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time)); + ServerInstance->PI->SendSNONotice("x", "Removing expired CBan " + assign(this->matchtext) + " (set by " + std::string(this->source) + " " + ConvToStr(ServerInstance->Time() - this->set_time) + " seconds ago)"); + } + + const char* Displayable() + { + return matchtext.c_str(); + } }; -bool CBanComp(const CBan &ban1, const CBan &ban2); +/** An XLineFactory specialized to generate cban pointers + */ +class CBanFactory : public XLineFactory +{ + public: + CBanFactory(InspIRCd* Instance) : XLineFactory(Instance, "CBAN") { } -typedef std::vector cbanlist; + /** Generate a shun + */ + XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) + { + return new CBan(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + } -/* cbans is declared here, as our type is right above. Don't try move it. */ -cbanlist cbans; + bool AutoApplyToUserList(XLine *x) + { + return false; // No, we apply to channels. + } +}; /** Handle /CBAN */ -class cmd_cban : public command_t +class CommandCBan : public Command { public: - cmd_cban(InspIRCd* Me) : command_t(Me, "CBAN", 'o', 1) + CommandCBan(InspIRCd* Me) : Command(Me, "CBAN", "o", 1, 3) { this->source = "m_cban.so"; this->syntax = " [ :]"; + TRANSLATE4(TR_TEXT,TR_TEXT,TR_TEXT,TR_END); } - CmdResult Handle(const 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. */ - 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) - { - long remaining = iter->length + ServerInstance->Time(); - user->WriteServ("386 %s %s :Removed CBAN due to expire at %s (%s)", user->nick, iter->chname.c_str(), ServerInstance->TimeString(remaining).c_str(), iter->reason.c_str()); - cbans.erase(iter); - break; - } + ServerInstance->SNO->WriteToSnoMask('x',"%s removed CBan on %s.",user->nick.c_str(),parameters[0].c_str()); + ServerInstance->PI->SendSNONotice("x", user->nick + " removed CBan on " + parameters[0]); + } + 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 (ServerInstance->IsChannel(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, ServerInstance->Time(), duration, user->nick.c_str(), reason, parameters[0].c_str()); + } + catch (...) + { + ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. + } + + if (r) { - // parameters[0] = #channel - // parameters[1] = 1h3m2s - // parameters[2] = Tortoise abuser - long length = ServerInstance->Duration(parameters[1]); - std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - - cbans.push_back(CBan(parameters[0], user->nick, ServerInstance->Time(), length, reason)); - - std::sort(cbans.begin(), cbans.end(), CBanComp); - - if(length > 0) + if (ServerInstance->XLines->AddLine(r, user)) { - user->WriteServ("385 %s %s :Added %lu second channel ban (%s)", user->nick, parameters[0], length, reason.c_str()); - ServerInstance->WriteOpers("*** %s added %lu second channel ban on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + if (!duration) + { + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent CBan for %s: %s", user->nick.c_str(), parameters[0].c_str(), reason); + ServerInstance->PI->SendSNONotice("x", user->nick + " added permenant CBan for " + parameters[0] + ": " + std::string(reason)); + } + else + { + time_t c_requires_crap = duration + ServerInstance->Time(); + ServerInstance->SNO->WriteToSnoMask('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->PI->SendSNONotice("x", user->nick + " added timed CBan for " + parameters[0] + ", expires on " + ServerInstance->TimeString(c_requires_crap) + ": " + std::string(reason)); + } + + ServerInstance->XLines->ApplyLines(); } else { - user->WriteServ("385 %s %s :Added permanent channel ban (%s)", user->nick, parameters[0], reason.c_str()); - ServerInstance->WriteOpers("*** %s added permanent 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 - { - user->WriteServ("403 %s %s :Invalid channel name", user->nick, parameters[0]); - return CMD_FAILURE; - } } - /* we want this routed! */ - return CMD_SUCCESS; + return CMD_FAILURE; } }; -bool CBanComp(const CBan &ban1, const CBan &ban2) -{ - return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); -} - class ModuleCBan : public Module { - cmd_cban* mycommand; - + CommandCBan mycommand; + CBanFactory f; public: - ModuleCBan(InspIRCd* Me) : Module(Me) + ModuleCBan(InspIRCd* Me) : Module(Me), mycommand(Me), f(Me) { - - mycommand = new cmd_cban(Me); - ServerInstance->AddCommand(mycommand); - } - - void Implements(char* List) - { - List[I_OnUserPreJoin] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1; - } - - virtual int OnStats(char symbol, userrec* user, string_list &results) - { - ExpireBans(); - - if(symbol == 'C') - { - for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) - { - unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); - results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->chname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason); - } - } - - return 0; - } + ServerInstance->XLines->RegisterFactory(&f); - virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs) - { - ExpireBans(); - - /* check cbans in here, and apply as necessary. */ - for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) - { - if(iter->chname == cname && !user->modes[UM_OPERATOR]) - { - // Channel is banned. - user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick, cname, iter->reason.c_str()); - ServerInstance->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, bool displayable) - { - 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, const std::string &extname, const 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() { - } - - virtual Version GetVersion() - { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + ServerInstance->XLines->DelAll("CBAN"); + ServerInstance->XLines->UnregisterFactory(&f); } - std::string EncodeCBan(const CBan &ban) + virtual int OnStats(char symbol, User* user, string_list &out) { - std::ostringstream stream; - stream << ban.chname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " :" << ban.reason; - return stream.str(); - } + if (symbol != 'C') + return 0; - CBan DecodeCBan(const std::string &data) - { - CBan res; - int set_on; - irc::tokenstream tokens(data); - tokens.GetToken(res.chname); - tokens.GetToken(res.set_by); - tokens.GetToken(set_on); - res.set_on = set_on; - tokens.GetToken(res.length); - tokens.GetToken(res.reason); - return res; + ServerInstance->XLines->InvokeStats("CBAN", 210, user, out); + return 1; } - void ExpireBans() + virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) { - bool go_again = true; + XLine *rl = ServerInstance->XLines->MatchesLine("CBAN", cname); - while (go_again) + if (rl) { - go_again = false; - - for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) - { - /* 0 == permanent, don't mess with them! -- w00t */ - if (iter->length != 0) - { - if (iter->set_on + iter->length <= ServerInstance->Time()) - { - ServerInstance->WriteOpers("*** %li second CBAN on %s (%s) set on %s expired", iter->length, iter->chname.c_str(), iter->reason.c_str(), ServerInstance->TimeString(iter->set_on).c_str()); - cbans.erase(iter); - go_again = true; - } - } - - if (go_again == true) - break; - } + // Channel is banned. + user->WriteServ( "384 %s %s :Cannot join channel, CBANed (%s)", user->nick.c_str(), cname, rl->reason); + ServerInstance->SNO->WriteToSnoMask('a', "%s tried to join %s which is CBANed (%s)", user->nick.c_str(), cname, rl->reason); + ServerInstance->PI->SendSNONotice("A", user->nick + " tried to join " + std::string(cname) + " which is CBANed (" + std::string(rl->reason) + ")"); + return 1; } + + return 0; + } + + virtual Version GetVersion() + { + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };