X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_svshold.cpp;h=276fef038cab386c6695a06b738eb8ce689d5e11;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=fa16658286c4e14c4d7b555c43cc2b3d88e7549f;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index fa1665828..276fef038 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.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. @@ -11,261 +11,183 @@ * --------------------------------------------------- */ -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" #include "inspircd.h" +#include "xline.h" /* $ModDesc: Implements SVSHOLD. Like Q:Lines, but can only be added/removed by Services. */ /** Holds a SVSHold item */ -class SVSHold : public classbase +class SVSHold : public XLine { public: - std::string nickname; - std::string set_by; - time_t set_on; - long length; - std::string reason; + irc::string nickname; - SVSHold() + SVSHold(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *nick) : XLine(Instance, s_time, d, src, re, "SVSHOLD") { + this->nickname = nick; } - SVSHold(const std::string &nn, const std::string &sb, const time_t so, const long ln, const std::string &rs) : nickname(nn), set_by(sb), set_on(so), length(ln), reason(rs) + ~SVSHold() { } -}; + bool Matches(User *u) + { + if (u->nick == nickname) + return true; + return false; + } -bool SVSHoldComp(const SVSHold &ban1, const SVSHold &ban2); + bool Matches(const std::string &s) + { + if (nickname == s) + return true; + return false; + } -typedef std::vector SVSHoldlist; + void DisplayExpiry() + { + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired SVSHOLD %s (set by %s %ld seconds ago)", this->nickname.c_str(), this->source, (long int)(ServerInstance->Time() - this->set_time)); + } -/* SVSHolds is declared here, as our type is right above. Don't try move it. */ -SVSHoldlist SVSHolds; + const char* Displayable() + { + return nickname.c_str(); + } +}; + +/** An XLineFactory specialized to generate SVSHOLD pointers + */ +class SVSHoldFactory : public XLineFactory +{ + public: + SVSHoldFactory(InspIRCd* Instance) : XLineFactory(Instance, "SVSHOLD") { } + + /** Generate a shun + */ + XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) + { + return new SVSHold(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + } +}; /** Handle /SVSHold */ -class cmd_svshold : public command_t +class CommandSvshold : public Command { public: - cmd_svshold(InspIRCd* Me) : command_t(Me, "SVSHOLD", 'o', 1) + CommandSvshold(InspIRCd* Me) : Command(Me, "SVSHOLD", "o", 1) { this->source = "m_svshold.so"; - this-> - syntax = " [ :]"; + this->syntax = " [ :]"; + TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const std::vector ¶meters, User *user) { /* syntax: svshold nickname time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ - if (pcnt == 1) + if (!ServerInstance->ULine(user->server)) { - /* form: svshold nickname removes a hold. */ - for (SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) + /* don't allow SVSHOLD from non-ulined clients */ + return CMD_FAILURE; + } + + if (parameters.size() == 1) + { + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SVSHOLD", user)) { - if (irc::string(parameters[0]) == irc::string(iter->nickname.c_str())) - { - unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); - user->WriteServ( "386 %s %s :Removed SVSHOLD with %lu seconds left before expiry (%s)", user->nick, iter->nickname.c_str(), remaining, iter->reason.c_str()); - SVSHolds.erase(iter); - break; - } + ServerInstance->SNO->WriteToSnoMask('x',"%s Removed SVSHOLD on %s.",user->nick.c_str(),parameters[0].c_str()); } + else + { + user->WriteServ("NOTICE %s :*** SVSHOLD %s not found in list, try /stats S.",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 SVSHold */ - if (ServerInstance->IsNick(parameters[0])) + // Adding - XXX todo make this respect tag perhaps.. + long duration = ServerInstance->Duration(parameters[1]); + SVSHold *r = NULL; + + try { - // parameters[0] = w00t - // parameters[1] = 1h3m2s - // parameters[2] = Registered nickname - long length = ServerInstance->Duration(parameters[1]); - std::string reason = (pcnt > 2) ? parameters[2] : "No reason supplied"; - - SVSHolds.push_back(SVSHold(parameters[0], user->nick, ServerInstance->Time(), length, reason)); - - std::sort(SVSHolds.begin(), SVSHolds.end(), SVSHoldComp); - - if(length > 0) + r = new SVSHold(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + } + catch (...) + { + ; // Do nothing. + } + + if (r) + { + if (ServerInstance->XLines->AddLine(r, user)) { - user->WriteServ( "385 %s %s :Added %lu second SVSHOLD (%s)", user->nick, parameters[0], length, reason.c_str()); - ServerInstance->WriteOpers("*** %s added %lu second SVSHOLD on %s (%s)", user->nick, length, parameters[0], reason.c_str()); + ServerInstance->XLines->ApplyLines(); } else { - user->WriteServ( "385 %s %s :Added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str()); - ServerInstance->WriteOpers("*** %s added permanent SVSHOLD on %s (%s)", user->nick, parameters[0], reason.c_str()); + delete r; } } - else - { - /* as this is primarily a Services command, do not provide an error */ - return CMD_FAILURE; - } } return CMD_SUCCESS; } }; -bool SVSHoldComp(const SVSHold &ban1, const SVSHold &ban2) -{ - return ((ban1.set_on + ban1.length) < (ban2.set_on + ban2.length)); -} - class ModuleSVSHold : public Module { - cmd_svshold *mycommand; - + CommandSvshold cmd; + SVSHoldFactory s; - public: - ModuleSVSHold(InspIRCd* Me) : Module::Module(Me) - { - mycommand = new cmd_svshold(Me); - ServerInstance->AddCommand(mycommand); - } - void Implements(char* List) - { - List[I_OnUserPreNick] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnStats] = 1; - } - - virtual int OnStats(char symbol, userrec* user, string_list &results) - { - ExpireBans(); - - if(symbol == 'S') - { - for(SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - unsigned long remaining = (iter->set_on + iter->length) - ServerInstance->Time(); - results.push_back(std::string(ServerInstance->Config->ServerName)+" 210 "+user->nick+" "+iter->nickname.c_str()+" "+iter->set_by+" "+ConvToStr(iter->set_on)+" "+ConvToStr(iter->length)+" "+ConvToStr(remaining)+" :"+iter->reason); - } - } - - return 0; - } - - virtual int OnUserPreNick(userrec *user, const std::string &newnick) - { - ExpireBans(); - - /* check SVSHolds in here, and apply as necessary. */ - for(SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - if (irc::string(iter->nickname.c_str()) == irc::string(newnick.c_str())) - { - // nope, boned. - user->WriteServ( "432 %s %s :Reserved nickname: %s", user->nick, newnick.c_str(), iter->reason.c_str()); - return 1; - } - } - return 0; - } - - virtual void OnSyncOtherMetaData(Module* proto, void* opaque) - { - for(SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - proto->ProtoSendMetaData(opaque, TYPE_OTHER, NULL, "SVSHold", EncodeSVSHold(*iter)); - } - } - - virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata) + public: + ModuleSVSHold(InspIRCd* Me) : Module(Me), cmd(Me), s(Me) { - if((target_type == TYPE_OTHER) && (extname == "SVSHold")) - { - SVSHolds.push_back(DecodeSVSHold(extdata)); - std::sort(SVSHolds.begin(), SVSHolds.end(), SVSHoldComp); - } + ServerInstance->XLines->RegisterFactory(&s); + ServerInstance->AddCommand(&cmd); + Implementation eventlist[] = { I_OnUserPreNick, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 2); } - virtual ~ModuleSVSHold() - { - } - - virtual Version GetVersion() - { - return Version(1,1,0,1,VF_VENDOR|VF_COMMON,API_VERSION); - } - std::string EncodeSVSHold(const SVSHold &ban) + virtual int OnStats(char symbol, User* user, string_list &out) { - std::ostringstream stream; - stream << ban.nickname << " " << ban.set_by << " " << ban.set_on << " " << ban.length << " " << ban.reason; - return stream.str(); - } + if(symbol != 'S') + return 0; - SVSHold DecodeSVSHold(const std::string &data) - { - SVSHold res; - std::istringstream stream(data); - stream >> res.nickname; - stream >> res.set_by; - stream >> res.set_on; - stream >> res.length; - res.reason = stream.str(); - - return res; + ServerInstance->XLines->InvokeStats("SVSHOLD", 210, user, out); + return 1; } - void ExpireBans() + virtual int OnUserPreNick(User *user, const std::string &newnick) { - bool go_again = true; + XLine *rl = ServerInstance->XLines->MatchesLine("SVSHOLD", newnick); - while (go_again) + if (rl) { - go_again = false; - - for (SVSHoldlist::iterator iter = SVSHolds.begin(); iter != SVSHolds.end(); iter++) - { - /* 0 == permanent, don't mess with them! -- w00t */ - if (iter->length != 0) - { - if (iter->set_on + iter->length <= ServerInstance->Time()) - { - ServerInstance->Log(DEBUG, "m_svshold.so: hold on %s expired, removing...", iter->nickname.c_str()); - ServerInstance->WriteOpers("*** %li second SVSHOLD on %s (%s) set %u seconds ago expired", iter->length, iter->nickname.c_str(), iter->reason.c_str(), ServerInstance->Time() - iter->set_on); - SVSHolds.erase(iter); - go_again = true; - } - } - - if (go_again == true) - break; - } + user->WriteServ( "432 %s %s :Services reserved nickname: %s", user->nick.c_str(), newnick.c_str(), rl->reason); + return 1; } - } -}; -class ModuleSVSHoldFactory : public ModuleFactory -{ - public: - ModuleSVSHoldFactory() - { + return 0; } - - ~ModuleSVSHoldFactory() + + virtual ~ModuleSVSHold() { + ServerInstance->XLines->DelAll("SVSHOLD"); + ServerInstance->XLines->UnregisterFactory(&s); } - - virtual Module * CreateModule(InspIRCd* Me) + + virtual Version GetVersion() { - return new ModuleSVSHold(Me); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSVSHoldFactory; -} +MODULE_INIT(ModuleSVSHold)