X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cban.cpp;h=57bb9490a20c73749d069e73edea7ebad954252d;hb=2330fc9ddd48c939e894e7e37e9bb2e62eafc38d;hp=9c35f631c65dd0cd37c03d9d10d1f17fffb3a5b7;hpb=0d38ae95e43ef7acef7d07b94927d4cb4d2500e5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index 9c35f631c..57bb9490a 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -1,64 +1,60 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ * - * Inspire is copyright (C) 2002-2005 ChatSpike-Dev. - * E-mail: - * - * - * + * InspIRCd is copyright (C) 2002-2006 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. + *the file COPYING for details. * * --------------------------------------------------- */ -using namespace std; - -#include +#include +#include +#include +#include #include "users.h" #include "channels.h" #include "modules.h" #include "helperfuncs.h" +#include "hashcomp.h" /* $ModDesc: Gives /cban, aka C:lines. Think Q:lines, for channels. */ -extern time_t TIME; - -class CBan +class CBan : public classbase { - private: - unsigned long expiry; - std::string chname; +public: + irc::string chname; + std::string set_by; + time_t set_on; + long length; std::string reason; - public: - CBan(std::string cn, std::string rs, unsigned long ex) + CBan() { - chname = cn; - reason = rs; - expiry = ex; } - std::string GetName() + 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) { - return this->chname; } +}; - std::string GetReason() - { - return this->reason; - } +std::string EncodeCBan(const CBan &ban); +CBan DecodeCBan(const std::string &data); +bool CBanComp(const CBan &ban1, const CBan &ban2); +void ExpireBans(); - unsigned long GetExpiry() - { - return this->expiry; - } -}; +extern time_t TIME; +typedef std::vector cbanlist; -vector cbans; -/* don't ask why this is here. */ +/* cbans is declared here, as our type is right above. Don't try move it. */ +cbanlist cbans; class cmd_cban : public command_t { @@ -66,35 +62,63 @@ class cmd_cban : public command_t Server *Srv; public: - cmd_cban (Server* Me) : command_t("CBAN", 'o', 1) + cmd_cban(Server* Me) : command_t("CBAN", 'o', 1) { this->source = "m_cban.so"; this->Srv = Me; } - void Handle(char **parameters, int pcnt, userrec *user) + void Handle(const char** parameters, int pcnt, userrec *user) { /* syntax: CBAN #channel time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ + + ExpireBans(); - std::string chname; - std::string reason; - unsigned long expiry; - - if (pcnt == 1) + if(pcnt == 1) { /* form: CBAN #channel removes a CBAN */ + for (cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) + { + 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; + } + } } else if (pcnt >= 2) { /* full form to add a CBAN */ - /* XXX - checking on chnames */ - chname = parameters[0]; - expiry = TIME + Srv->CalcDuration(parameters[1]); - reason = parameters[2]; - - CBan meow(chname, reason, expiry); - cbans.push_back(meow); + if (IsValidChannelName(parameters[0])) + { + // 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) + { + 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()); + } + 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()); + } + } + else + { + WriteServ(user->fd, "403 %s %s :Invalid channel name", user->nick, parameters[0]); + } } } }; @@ -112,29 +136,61 @@ class ModuleCBan : public Module Srv->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) + { + 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. */ - log(DEBUG,"In OnUserPreJoin cbans.size() == %d",cbans.size()); - - std::string chname = cname; - - for (unsigned int a = 0; a < cbans.size(); a++) + for(cbanlist::iterator iter = cbans.begin(); iter != cbans.end(); iter++) { - log(DEBUG,"m_cban: DEBUG: checking %s against %s in OnPreUserJoin()", chname.c_str(), cbans[a].GetName().c_str()); - if (chname == cbans[a].GetName()) + if(iter->chname == cname && !user->modes[UM_OPERATOR]) { - /* matches CBAN */ - WriteOpers("DENY join"); + // 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; } } - - log(DEBUG,"DONE checking, allowed"); - - /* Allow the change. */ 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, 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); + } + } virtual ~ModuleCBan() { @@ -142,10 +198,62 @@ class ModuleCBan : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_VENDOR); + return Version(1,0,0,1,VF_VENDOR); } }; +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(); +} + +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)); +} + +void ExpireBans() +{ + bool go_again = true; + + while (go_again) + { + 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 <= TIME) + { + 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); + go_again = true; + } + } + + if (go_again == true) + break; + } + } +} class ModuleCBanFactory : public ModuleFactory { @@ -170,4 +278,3 @@ extern "C" void * init_module( void ) { return new ModuleCBanFactory; } -