X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=c013776ed217029838b9018601908a1eb2d565bc;hb=a23a840749db9646884907ae28588b1962dc2449;hp=a0b2adffc67b5d7e700726879dde63ed4a49bc6b;hpb=5f68c4e91296fdd3ad1fc51b2c382ce218dc10d8;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index a0b2adffc..c013776ed 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,11 +1,4 @@ -#include -#include -#include -#include #include "inspircd.h" -#include "modules.h" -#include "hashcomp.h" -#include "configreader.h" #include "xline.h" /* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */ @@ -15,7 +8,7 @@ class Shun : public XLine public: std::string matchtext; - Shun(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *shunmask) : XLine(Instance, s_time, d, src, re, "S") + Shun(InspIRCd* Instance, time_t s_time, long d, const char* src, const char* re, const char *shunmask) : XLine(Instance, s_time, d, src, re, "SHUN") { this->matchtext = shunmask; } @@ -26,21 +19,23 @@ public: bool Matches(User *u) { - if (ServerInstance->MatchText(u->GetFullHost(), matchtext) || ServerInstance->MatchText(u->GetFullRealHost(), matchtext)) + if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext)) return true; return false; } - // XXX unused, why do we *have* to implement this bool Matches(const std::string &s) { + if (matchtext == s) + return true; return false; } void Apply(User *u) { - // Application is done by the module. + if (!u->GetExt("shunned")) + u->Extend("shunned"); } @@ -55,6 +50,21 @@ public: } }; +/** An XLineFactory specialized to generate shun pointers + */ +class ShunFactory : public XLineFactory +{ + public: + ShunFactory(InspIRCd* Instance) : XLineFactory(Instance, "SHUN") { } + + /** Generate a shun + */ + XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) + { + return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + } +}; + //typedef std::vector shunlist; class cmd_shun : public Command @@ -63,31 +73,32 @@ class cmd_shun : public Command InspIRCd *Srv; public: - cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1), Srv(Me) + cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me) { this->source = "m_shun.so"; + this->syntax = " [] :"; } - CmdResult Handle(const char* const*parameters, int pcnt, User *user) + CmdResult Handle(const std::vector& parameters, User *user) { /* syntax: SHUN nick!user@host time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ - if(pcnt == 1) + if (parameters.size() == 1) { - if (ServerInstance->XLines->DelLine(parameters[0], "S", user)) + if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed R-Line on %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),parameters[0].c_str()); } else { // XXX todo implement stats - user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** Shun %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) { // Adding - XXX todo make this respect tag perhaps.. long duration = ServerInstance->Duration(parameters[1]); @@ -95,7 +106,7 @@ class cmd_shun : public Command try { - r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); + r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); } catch (...) { @@ -108,13 +119,12 @@ class cmd_shun : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick, parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); } else { time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s", user->nick, parameters[0], - ServerInstance->TimeString(c_requires_crap).c_str()); + ServerInstance->SNO->WriteToSnoMask('x', "%s added timed shun for %s, expires on %s: %s", user->nick.c_str(), parameters[0].c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), parameters[2].c_str()); } ServerInstance->XLines->ApplyLines(); @@ -122,7 +132,7 @@ class cmd_shun : public Command else { delete r; - user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str()); } } } @@ -134,51 +144,113 @@ class cmd_shun : public Command class ModuleShun : public Module { cmd_shun* mycommand; + ShunFactory *f; + std::map ShunEnabledCommands; + bool NotifyOfShun; public: ModuleShun(InspIRCd* Me) : Module(Me) { + f = new ShunFactory(ServerInstance); + ServerInstance->XLines->RegisterFactory(f); + mycommand = new cmd_shun(ServerInstance); ServerInstance->AddCommand(mycommand); + + Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 4); + OnRehash(NULL, ""); } - void Implements(char* List) + virtual ~ModuleShun() { - List[I_OnPreCommand] = List[I_OnStats] = 1; + ServerInstance->XLines->DelAll("SHUN"); + ServerInstance->XLines->UnregisterFactory(f); } - + virtual int OnStats(char symbol, User* user, string_list& out) { - // XXX write me -//format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " << -//iter->set_by << " " << iter->reason; - - return 0; + if (symbol != 'S') + return 0; + + ServerInstance->XLines->InvokeStats("SHUN", 223, user, out); + return 1; } - virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, User* user, bool validated, const std::string &original_line) + virtual void OnRehash(User* user, const std::string ¶meter) { - if((command != "PONG") && (command != "PING")) + ConfigReader MyConf(ServerInstance); + std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0); + + if (cmds.empty()) + cmds = "PING PONG QUIT"; + + ShunEnabledCommands.clear(); + NotifyOfShun = true; + + std::stringstream dcmds(cmds); + std::string thiscmd; + + while (dcmds >> thiscmd) { - // Don't let them issue cmd if they are shunned.. - XLine *rl = ServerInstance->XLines->MatchesLine("R", user); + ShunEnabledCommands[thiscmd] = true; + } - if (rl) - { - return 1; - } + NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0); + } + + virtual void OnUserConnect(User* user) + { + if (!IS_LOCAL(user)) + return; + + // Apply lines on user connect + XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user); + + if (rl) + { + // Bang. :P + rl->Apply(user); } - - return 0; } - virtual ~ModuleShun() + virtual int OnPreCommand(std::string &command, std::vector& parameters, User* user, bool validated, const std::string &original_line) { + if (validated || !user->GetExt("shunned")) + return 0; + + if (!ServerInstance->XLines->MatchesLine("SHUN", user)) + { + /* The shun previously set on this user has expired or been removed */ + user->Shrink("shunned"); + return 0; + } + + std::map::iterator i = ShunEnabledCommands.find(command); + + if (i == ShunEnabledCommands.end()) + { + user->WriteServ("NOTICE %s :*** Command %s not processed, as you have been blocked from issuing commands (SHUN)", user->nick.c_str(), command.c_str()); + return 1; + } + + if (command == "QUIT") + { + /* Allow QUIT but dont show any quit message */ + parameters.clear(); + } + else if (command == "PART") + { + /* same for PART */ + parameters.clear(); + } + + return 1; } virtual Version GetVersion() { - return Version(1,0,0,0,0,API_VERSION); + return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION); } };