X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_shun.cpp;h=8bf4d30e7bf341d4d6ce773bc7c1734455bb586e;hb=d8c72fd7af539cf0a2759740126e020b9ea2eb86;hp=ee10654b8ad2e5119038700465129ceb3b50cc8a;hpb=ab374312187b9b5ddc3c508210d4d4cd3d036982;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index ee10654b8..8bf4d30e7 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -1,23 +1,39 @@ -#include -#include -#include -#include +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2008 Thomas Stagner + * + * 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 "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. */ +/* $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() @@ -26,7 +42,11 @@ public: bool Matches(User *u) { - if (ServerInstance->MatchText(u->GetFullHost(), matchtext) || ServerInstance->MatchText(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; @@ -39,16 +59,10 @@ public: return false; } - 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() @@ -62,153 +76,216 @@ 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; } }; //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(Module* Creator) : Command(Creator, "SHUN", 1, 3) { - this->source = "m_shun.so"; + flags_needed = 'o'; 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) + 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], "S", user)) + if (ServerInstance->XLines->DelLine(target.c_str(), "SHUN", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed shun on %s.",user->nick,parameters[0]); + 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,parameters[0]); + 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 (pcnt >= 2) + else { // Adding - XXX todo make this respect tag perhaps.. - long duration = ServerInstance->Duration(parameters[1]); - Shun *r = NULL; - - try + long duration; + std::string expr; + if (parameters.size() > 2) { - r = new Shun(ServerInstance, ServerInstance->Time(), duration, user->nick, parameters[2], parameters[0]); + duration = ServerInstance->Duration(parameters[1]); + expr = parameters[2]; } - catch (...) + else { - ; // Do nothing. If we get here, the regex was fucked up, and they already got told it fucked up. + duration = 0; + expr = parameters[1]; } - 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.", user->nick, parameters[0]); - } - 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->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, parameters[0]); + 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; + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + if (IS_LOCAL(user)) + return ROUTE_LOCALONLY; // spanningtree will send ADDLINE - return CMD_FAILURE; + return ROUTE_BROADCAST; } }; 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() : cmd(this) { - f = new ShunFactory(ServerInstance); - ServerInstance->XLines->RegisterFactory(f); + } - mycommand = new cmd_shun(ServerInstance); - ServerInstance->AddCommand(mycommand); + void init() + { + ServerInstance->XLines->RegisterFactory(&f); + ServerInstance->Modules->AddService(cmd); - Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnUserConnect }; - ServerInstance->Modules->Attach(eventlist, this, 3); + Implementation eventlist[] = { I_OnStats, I_OnPreCommand, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); } virtual ~ModuleShun() { - ServerInstance->XLines->UnregisterFactory(f); + ServerInstance->XLines->DelAll("SHUN"); + ServerInstance->XLines->UnregisterFactory(&f); } - virtual int OnStats(char symbol, User* user, string_list& out) + void Prioritize() { - // XXX write me -//format << Srv->Config->ServerName << " 223 " << user->nick << " :" << iter->banmask << " " << iter->set_on << " " << iter->length << " " << -//iter->set_by << " " << iter->reason; - - return 0; + Module* alias = ServerInstance->Modules->Find("m_alias.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreCommand, PRIORITY_BEFORE, &alias); + } + + virtual ModResult OnStats(char symbol, User* user, string_list& out) + { + if (symbol != 'H') + return MOD_RES_PASSTHRU; + + ServerInstance->XLines->InvokeStats("SHUN", 223, user, out); + return MOD_RES_DENY; } - virtual void OnUserConnect(User* user) + virtual void OnRehash(User* user) { - if (!IS_LOCAL(user)) - return; + 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(); - // Apply lines on user connect - XLine *rl = ServerInstance->XLines->MatchesLine("SHUN", user); + std::stringstream dcmds(cmds); + std::string thiscmd; - if (rl) + while (dcmds >> thiscmd) { - // Bang. :P - rl->Apply(user); + ShunEnabledCommands.insert(thiscmd); } + + NotifyOfShun = tag->getBool("notifyuser", true); + affectopers = tag->getBool("affectopers", false); } - virtual int OnPreCommand(const std::string &command, const char* const*parameters, int pcnt, 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((command != "PONG") && (command != "PING")) + if (validated) + return MOD_RES_PASSTHRU; + + if (!ServerInstance->XLines->MatchesLine("SHUN", user)) + { + /* Not shunned, don't touch. */ + 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 MOD_RES_PASSTHRU; + } + + 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 MOD_RES_DENY; + } + + if (command == "QUIT") + { + /* Allow QUIT but dont show any quit message */ + parameters.clear(); + } + else if ((command == "PART") && (parameters.size() > 1)) { - if (user->GetExt("shunned")) - return 1; + /* same for PART */ + parameters[1].clear(); } - return 0; + /* if we're here, allow the command. */ + return MOD_RES_PASSTHRU; } virtual Version GetVersion() { - return Version(1,0,0,0,0,API_VERSION); + return Version("Provides the /SHUN command, which stops a user from executing all except configured commands.",VF_VENDOR|VF_COMMON); } };