X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=b4adc93002c2eebffa8ffb7434b2381043e92645;hb=123eac3f25ce4dd3142b4ac66eb321f7df1e23e4;hp=c6ccbb7ebb5b85404efae29671279810797a85b3;hpb=2fe63d8a836d75d8cd58de5f01ee34d0dc5237b6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index c6ccbb7eb..b4adc9300 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 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,8 +11,7 @@ * --------------------------------------------------- */ -#include -"inspircd.h" +#include "inspircd.h" #include "xline.h" /* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */ @@ -22,7 +21,8 @@ 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, "SHUN") + Shun(time_t s_time, long d, std::string src, std::string re, std::string shunmask) + : XLine(s_time, d, src, re, "SHUN") { this->matchtext = shunmask; } @@ -33,7 +33,11 @@ public: bool Matches(User *u) { - if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext)) + // E: overrides shun + if (u->exempt) + return false; + + if (InspIRCd::Match(u->GetFullHost(), matchtext) || InspIRCd::Match(u->GetFullRealHost(), matchtext) || InspIRCd::Match(u->nick+"!"+u->ident+"@"+u->GetIPString(), matchtext)) return true; return false; @@ -48,14 +52,13 @@ public: void Apply(User *u) { - if (!u->GetExt("shunned")) - u->Extend("shunned"); } void DisplayExpiry() { - ServerInstance->SNO->WriteToSnoMask('x',"Expiring timed shun %s (set by %s %ld seconds ago)", this->matchtext.c_str(), this->source, this->duration); + ServerInstance->SNO->WriteToSnoMask('x',"Removing expired shun %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() @@ -69,13 +72,13 @@ public: class ShunFactory : public XLineFactory { public: - ShunFactory(InspIRCd* Instance) : XLineFactory(Instance, "SHUN") { } + ShunFactory() : XLineFactory("SHUN") { } /** Generate a shun */ - XLine* Generate(time_t set_time, long duration, const char* source, const char* reason, const char* xline_specific_mask) + XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) { - return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + return new Shun(set_time, duration, source, reason, xline_specific_mask); } }; @@ -83,14 +86,10 @@ class ShunFactory : public XLineFactory class CommandShun : public Command { - private: - InspIRCd *Srv; - public: - CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me) + CommandShun(Module* Creator) : Command(Creator, "SHUN", 1, 3) { - this->source = "m_shun.so"; - this->syntax = " [] :"; + flags_needed = 'o'; this->syntax = " [] :"; } CmdResult Handle(const std::vector& parameters, User *user) @@ -98,16 +97,22 @@ class CommandShun : public Command /* syntax: SHUN nick!user@host time :reason goes here */ /* 'time' is a human-readable timestring, like 2d3h2s. */ + std::string target = parameters[0]; + + User *find = ServerInstance->FindNick(target.c_str()); + if (find) + target = std::string("*!*@") + find->GetIPString(); + if (parameters.size() == 1) { - if (ServerInstance->XLines->DelLine(parameters[0].c_str(), "SHUN", user)) + if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick.c_str(),parameters[0].c_str()); + ServerInstance->SNO->WriteToSnoMask('x',"%s removed SHUN on %s",user->nick.c_str(),target.c_str()); } else { // XXX todo implement stats - user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats s.",user->nick.c_str(),parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Shun %s not found in list, try /stats S.",user->nick.c_str(),target.c_str()); } return CMD_SUCCESS; @@ -115,12 +120,23 @@ class CommandShun : public Command else if (parameters.size() >= 2) { // Adding - XXX todo make this respect tag perhaps.. - long duration = ServerInstance->Duration(parameters[1]); + long duration; + std::string expr; + if (parameters.size() > 2) + { + duration = ServerInstance->Duration(parameters[1]); + expr = parameters[2]; + } + else + { + duration = 0; + expr = parameters[1]; + } Shun *r = NULL; try { - r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), parameters[2].c_str(), parameters[0].c_str()); + r = new Shun(ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str()); } catch (...) { @@ -133,12 +149,14 @@ class CommandShun : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", user->nick.c_str(), parameters[0].c_str(), parameters[2].c_str()); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s", + user->nick.c_str(), target.c_str(), expr.c_str()); } else { time_t c_requires_crap = duration + ServerInstance->Time(); - 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->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s", + user->nick.c_str(), target.c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str()); } ServerInstance->XLines->ApplyLines(); @@ -146,54 +164,57 @@ class CommandShun : public Command else { delete r; - user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), parameters[0].c_str()); + user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), expr.c_str()); } } } return CMD_FAILURE; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + return ROUTE_BROADCAST; + } }; class ModuleShun : public Module { - CommandShun* mycommand; - ShunFactory *f; - std::map ShunEnabledCommands; + CommandShun cmd; + ShunFactory f; + std::set ShunEnabledCommands; bool NotifyOfShun; + bool affectopers; public: - ModuleShun(InspIRCd* Me) : Module(Me) + ModuleShun() : cmd(this) { - f = new ShunFactory(ServerInstance); - ServerInstance->XLines->RegisterFactory(f); - - mycommand = new CommandShun(ServerInstance); - ServerInstance->AddCommand(mycommand); + ServerInstance->XLines->RegisterFactory(&f); + ServerInstance->AddCommand(&cmd); Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash }; ServerInstance->Modules->Attach(eventlist, this, 4); - OnRehash(NULL, ""); + OnRehash(NULL); } virtual ~ModuleShun() { ServerInstance->XLines->DelAll("SHUN"); - ServerInstance->XLines->UnregisterFactory(f); + ServerInstance->XLines->UnregisterFactory(&f); } - virtual int OnStats(char symbol, User* user, string_list& out) + virtual ModResult OnStats(char symbol, User* user, string_list& out) { if (symbol != 'S') - return 0; + return MOD_RES_PASSTHRU; ServerInstance->XLines->InvokeStats("SHUN", 223, user, out); - return 1; + return MOD_RES_DENY; } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { - ConfigReader MyConf(ServerInstance); + ConfigReader MyConf; std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0); if (cmds.empty()) @@ -201,19 +222,21 @@ class ModuleShun : public Module ShunEnabledCommands.clear(); NotifyOfShun = true; + affectopers = false; std::stringstream dcmds(cmds); std::string thiscmd; while (dcmds >> thiscmd) { - ShunEnabledCommands[thiscmd] = true; + ShunEnabledCommands.insert(thiscmd); } NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0); + affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0); } - virtual void OnUserConnect(User* user) + virtual void OnUserConnect(LocalUser* user) { if (!IS_LOCAL(user)) return; @@ -228,24 +251,30 @@ class ModuleShun : public Module } } - virtual int OnPreCommand(std::string &command, std::vector& parameters, User* user, bool validated, const std::string &original_line) + virtual ModResult OnPreCommand(std::string &command, std::vector& parameters, User* user, bool validated, const std::string &original_line) { - if (validated || !user->GetExt("shunned")) - return 0; + if (validated) + return MOD_RES_PASSTHRU; if (!ServerInstance->XLines->MatchesLine("SHUN", user)) { - /* The shun previously set on this user has expired or been removed */ - user->Shrink("shunned"); - return 0; + /* Not shunned, don't touch. */ + return MOD_RES_PASSTHRU; } - std::map::iterator i = ShunEnabledCommands.find(command); + if (!affectopers && IS_OPER(user)) + { + /* Don't do anything if the user is an operator and affectopers isn't set */ + return MOD_RES_PASSTHRU; + } + + std::set::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 (NotifyOfShun) + 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 MOD_RES_DENY; } if (command == "QUIT") @@ -256,15 +285,16 @@ class ModuleShun : public Module else if (command == "PART") { /* same for PART */ - parameters.clear(); + parameters[1] = ""; } - return 1; + /* if we're here, allow the command. */ + return MOD_RES_PASSTHRU; } virtual Version GetVersion() { - return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION); + return Version("Provides the /shun command, which stops a user executing all commands except PING and PONG.",VF_VENDOR|VF_COMMON); } };