X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=8bf4d30e7bf341d4d6ce773bc7c1734455bb586e;hb=9c6a2d1b5ba5a2aeb91d00e1115534fbde670841;hp=6fdc4c77266e45f05a1fd797f534b0c00d16f4a1;hpb=fcafba14c5408360ec725ed1649ede75b7ae52c1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index 6fdc4c772..8bf4d30e7 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,29 +1,39 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" #include "xline.h" -/* $ModDesc: Provides the /shun command, which stops a user executing all commands except PING and PONG. */ +/* $ModDesc: Provides the /SHUN command, which stops a user from executing all except configured commands. */ 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, const std::string& src, const std::string& re, const std::string& shunmask) + : XLine(s_time, d, src, re, "SHUN") + , matchtext(shunmask) { - this->matchtext = shunmask; } ~Shun() @@ -32,7 +42,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; @@ -45,14 +59,10 @@ public: return false; } - void Apply(User *u) - { - } - - void DisplayExpiry() { - 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)); + 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() @@ -66,13 +76,18 @@ 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(set_time, duration, source, reason, xline_specific_mask); + } + + bool AutoApplyToUserList(XLine *x) { - return new Shun(ServerInstance, set_time, duration, source, reason, xline_specific_mask); + return false; } }; @@ -81,10 +96,9 @@ class ShunFactory : public XLineFactory class CommandShun : public Command { public: - CommandShun(InspIRCd* Me) : Command(Me, "SHUN", "o", 1, 3) + 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) @@ -92,21 +106,25 @@ 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); + if ((find) && (find->registered == REG_ALL)) + 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 H.",user->nick.c_str(),target.c_str()); + return CMD_FAILURE; } - - return CMD_SUCCESS; } - else if (parameters.size() >= 2) + else { // Adding - XXX todo make this respect tag perhaps.. long duration; @@ -121,95 +139,96 @@ class CommandShun : public Command duration = 0; expr = parameters[1]; } - Shun *r = NULL; - - try - { - r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), parameters[0].c_str()); - } - catch (...) - { - ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. - } - if (r) + Shun* r = new Shun(ServerInstance->Time(), duration, user->nick.c_str(), expr.c_str(), target.c_str()); + if (ServerInstance->XLines->AddLine(r, user)) { - if (ServerInstance->XLines->AddLine(r, user)) + if (!duration) { - if (!duration) - { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent shun for %s: %s", - user->nick.c_str(), parameters[0].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(), expr.c_str()); - } - - ServerInstance->XLines->ApplyLines(); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent SHUN for %s: %s", + user->nick.c_str(), target.c_str(), expr.c_str()); } else { - delete r; - user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), expr.c_str()); + time_t c_requires_crap = duration + ServerInstance->Time(); + std::string timestr = ServerInstance->TimeString(c_requires_crap); + ServerInstance->SNO->WriteToSnoMask('x', "%s added timed SHUN for %s to expire on %s: %s", + user->nick.c_str(), target.c_str(), timestr.c_str(), expr.c_str()); } } + else + { + delete r; + user->WriteServ("NOTICE %s :*** Shun for %s already exists", user->nick.c_str(), target.c_str()); + return CMD_FAILURE; + } } + return CMD_SUCCESS; + } - return CMD_FAILURE; + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + if (IS_LOCAL(user)) + return ROUTE_LOCALONLY; // spanningtree will send ADDLINE + + return ROUTE_BROADCAST; } }; class ModuleShun : public Module { - CommandShun* mycommand; - ShunFactory *f; + 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); + void init() + { + ServerInstance->XLines->RegisterFactory(&f); + ServerInstance->Modules->AddService(cmd); - Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 4); - OnRehash(NULL, ""); + Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); } virtual ~ModuleShun() { ServerInstance->XLines->DelAll("SHUN"); - ServerInstance->XLines->UnregisterFactory(f); + ServerInstance->XLines->UnregisterFactory(&f); + } + + void Prioritize() + { + Module* alias = ServerInstance->Modules->Find("m_alias.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &alias); } - 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; + if (symbol != 'H') + 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); - std::string cmds = MyConf.ReadValue("shun", "enabledcommands", 0); + ConfigTag* tag = ServerInstance->Config->ConfValue("shun"); + std::string cmds = tag->getString("enabledcommands"); + std::transform(cmds.begin(), cmds.end(), cmds.begin(), ::toupper); if (cmds.empty()) cmds = "PING PONG QUIT"; ShunEnabledCommands.clear(); - NotifyOfShun = true; - affectopers = false; std::stringstream dcmds(cmds); std::string thiscmd; @@ -219,40 +238,25 @@ class ModuleShun : public Module 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)) - return; - - // Apply lines on user connect - XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user); - - if (rl) - { - // Bang. :P - rl->Apply(user); - } + NotifyOfShun = tag->getBool("notifyuser", true); + affectopers = tag->getBool("affectopers", false); } - 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, LocalUser* user, bool validated, const std::string &original_line) { if (validated) - return 0; + return MOD_RES_PASSTHRU; if (!ServerInstance->XLines->MatchesLine("SHUN", user)) { /* Not shunned, don't touch. */ - return 0; + return MOD_RES_PASSTHRU; } if (!affectopers && IS_OPER(user)) { /* Don't do anything if the user is an operator and affectopers isn't set */ - return 0; + return MOD_RES_PASSTHRU; } std::set::iterator i = ShunEnabledCommands.find(command); @@ -261,7 +265,7 @@ class ModuleShun : public Module { 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; + return MOD_RES_DENY; } if (command == "QUIT") @@ -269,19 +273,19 @@ class ModuleShun : public Module /* Allow QUIT but dont show any quit message */ parameters.clear(); } - else if (command == "PART") + else if ((command == "PART") && (parameters.size() > 1)) { /* same for PART */ - parameters[1] = ""; + parameters[1].clear(); } /* if we're here, allow the command. */ - return 0; + 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 from executing all except configured commands.",VF_VENDOR|VF_COMMON); } };