X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=f4532ecd1b5befc0a3b0bb198779aa4090a1ef76;hb=f25c4b7a2263f5f3ce9bb41ba56b43c0d3a6d124;hp=b4cdfac72cdd86ef69045e4b65a516a5ebf72440;hpb=a1a7b96a8c994eb09a3d071f3daf28252b8c188b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index b4cdfac72..f4532ecd1 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,3 +1,16 @@ +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * 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. + * + * --------------------------------------------------- + */ + #include "inspircd.h" #include "xline.h" @@ -19,7 +32,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; @@ -34,14 +51,12 @@ 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, (long int)(ServerInstance->Time() - this->set_time)); } const char* Displayable() @@ -67,15 +82,13 @@ 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) { this->source = "m_shun.so"; + this->syntax = " [] :"; } CmdResult Handle(const std::vector& parameters, User *user) @@ -83,16 +96,22 @@ class cmd_shun : 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; @@ -100,12 +119,23 @@ class cmd_shun : 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, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str()); } catch (...) { @@ -118,13 +148,14 @@ 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(), 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", 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(), target.c_str(), ServerInstance->TimeString(c_requires_crap).c_str(), expr.c_str()); } ServerInstance->XLines->ApplyLines(); @@ -132,7 +163,7 @@ class cmd_shun : 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()); } } } @@ -143,26 +174,27 @@ class cmd_shun : public Command class ModuleShun : public Module { - cmd_shun* mycommand; - ShunFactory *f; + CommandShun cmd; + ShunFactory f; + std::set ShunEnabledCommands; + bool NotifyOfShun; + bool affectopers; public: - ModuleShun(InspIRCd* Me) : Module(Me) + ModuleShun(InspIRCd* Me) : Module(Me), cmd(Me), f(Me) { - f = new ShunFactory(ServerInstance); - ServerInstance->XLines->RegisterFactory(f); - - mycommand = new cmd_shun(ServerInstance); - ServerInstance->AddCommand(mycommand); + ServerInstance->XLines->RegisterFactory(&f); + ServerInstance->AddCommand(&cmd); - 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); + ServerInstance->XLines->UnregisterFactory(&f); } virtual int OnStats(char symbol, User* user, string_list& out) @@ -174,6 +206,30 @@ class ModuleShun : public Module return 1; } + virtual void OnRehash(User* user) + { + ConfigReader MyConf(ServerInstance); + std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0); + + if (cmds.empty()) + cmds = "PING PONG QUIT"; + + ShunEnabledCommands.clear(); + NotifyOfShun = true; + affectopers = false; + + std::stringstream dcmds(cmds); + std::string thiscmd; + + while (dcmds >> thiscmd) + { + ShunEnabledCommands.insert(thiscmd); + } + + NotifyOfShun = MyConf.ReadFlag("shun", "notifyuser", "yes", 0); + affectopers = MyConf.ReadFlag("shun", "affectopers", "no", 0); + } + virtual void OnUserConnect(User* user) { if (!IS_LOCAL(user)) @@ -191,33 +247,48 @@ class ModuleShun : public Module virtual int OnPreCommand(std::string &command, std::vector& parameters, User* user, bool validated, const std::string &original_line) { - if (validated || !user->GetExt("shunned")) + if (validated) return 0; if (!ServerInstance->XLines->MatchesLine("SHUN", user)) { - /* The shun previously set on this user has expired or been removed */ - user->Shrink("shunned"); + /* Not shunned, don't touch. */ return 0; } + if (!affectopers && IS_OPER(user)) + { + /* Don't do anything if the user is an operator and affectopers isn't set */ + 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(); - return 0; + } + else if (command == "PART") + { + /* same for PART */ + parameters[1] = ""; } - /* Always allow PONG and PING */ - if (command == "PONG" || command == "PING") - return 0; - - return 1; + /* if we're here, allow the command. */ + return 0; } virtual Version GetVersion() { - return Version(1,2,0,0,VF_VENDOR|VF_COMMON,API_VERSION); + return Version("$Id$",VF_VENDOR|VF_COMMON,API_VERSION); } };