X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=1127d397dbf27aa65fab9f587adeefb69b90c431;hb=95fd083b589d7b16df98fe00711e8ac2cf9cc871;hp=cd777340a4058a8d225a0761786472ece1d5f40a;hpb=a914ae91957f617af0a21bcdb024a16361ae3398;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index cd777340a..1127d397d 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,11 +1,17 @@ -#include -#include -#include -#include +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * + * This program is free but copyrighted software; see + * the file COPYING for details. + * + * --------------------------------------------------- + */ + #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. */ @@ -26,7 +32,7 @@ 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; @@ -48,7 +54,7 @@ public: 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, (long int)(ServerInstance->Time() - this->set_time)); } const char* Displayable() @@ -74,15 +80,16 @@ class ShunFactory : public XLineFactory //typedef std::vector shunlist; -class cmd_shun : public Command +class CommandShun : public Command { private: InspIRCd *Srv; public: - cmd_shun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1), Srv(Me) + CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3), Srv(Me) { this->source = "m_shun.so"; + this->syntax = " [] :"; } CmdResult Handle(const std::vector& parameters, User *user) @@ -99,7 +106,7 @@ class cmd_shun : public Command 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(),parameters[0].c_str()); } return CMD_SUCCESS; @@ -125,13 +132,12 @@ class cmd_shun : public Command { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s.", user->nick.c_str(), parameters[0].c_str()); + 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.c_str(), parameters[0].c_str(), - 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(); @@ -150,8 +156,10 @@ class cmd_shun : public Command class ModuleShun : public Module { - cmd_shun* mycommand; + CommandShun* mycommand; ShunFactory *f; + std::set ShunEnabledCommands; + bool NotifyOfShun; public: ModuleShun(InspIRCd* Me) : Module(Me) @@ -159,25 +167,49 @@ class ModuleShun : public Module f = new ShunFactory(ServerInstance); ServerInstance->XLines->RegisterFactory(f); - mycommand = new cmd_shun(ServerInstance); + mycommand = new CommandShun(ServerInstance); ServerInstance->AddCommand(mycommand); - Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect }; - ServerInstance->Modules->Attach(eventlist, this, 3); + Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 4); + OnRehash(NULL, ""); } virtual ~ModuleShun() { + 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 void OnRehash(User* user, const std::string ¶meter) + { + 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) + { + ShunEnabledCommands.insert(thiscmd); + } + + NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0); } virtual void OnUserConnect(User* user) @@ -197,18 +229,42 @@ class ModuleShun : public Module virtual int OnPreCommand(std::string &command, std::vector& parameters, User* user, bool validated, const std::string &original_line) { - if((command != "PONG") && (command != "PING")) + 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::set::iterator i = ShunEnabledCommands.find(command); + + if (i == ShunEnabledCommands.end()) + { + 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 1; + } + + if (command == "QUIT") + { + /* Allow QUIT but dont show any quit message */ + parameters.clear(); + } + else if (command == "PART") { - if (user->GetExt("shunned")) - return 1; + /* same for PART */ + parameters.clear(); } - return 0; + return 1; } virtual Version GetVersion() { - return Version(1,0,0,0,0,API_VERSION); + return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION); } };