X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=c82ab3f9d6052ecf7c21f571bdfee029291b119a;hb=541e74bc147f4614f61c2781b7a82f3dbf9c9a32;hp=2a8fbae94319502e98b51c1e3aad7a00772b580b;hpb=8fc3c90385f2c2a327e1cfbe47bf959802177d40;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 2a8fbae94..c82ab3f9d 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -1,18 +1,27 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005-2007 Craig Edwards + * Copyright (C) 2006 John Brooks * - * 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 "wildcard.h" /* $ModDesc: Provides support for the /SILENCE command */ @@ -54,14 +63,13 @@ static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */ class CommandSVSSilence : public Command { public: - CommandSVSSilence(InspIRCd* Instance) : Command(Instance,"SVSSILENCE", 0, 2) + CommandSVSSilence(Module* Creator) : Command(Creator,"SVSSILENCE", 2) { - this->source = "m_silence.so"; syntax = " {[+|-] }"; - TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ + TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { /* * XXX: thought occurs to me @@ -72,77 +80,92 @@ class CommandSVSSilence : public Command */ if (!ServerInstance->ULine(user->server)) return CMD_FAILURE; - + User *u = ServerInstance->FindNick(parameters[0]); if (!u) return CMD_FAILURE; - + if (IS_LOCAL(u)) { - ServerInstance->Parser->CallHandler("SILENCE", ¶meters[1], 1, u); + ServerInstance->Parser->CallHandler("SILENCE", std::vector(parameters.begin() + 1, parameters.end()), u); } - + return CMD_SUCCESS; } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + User* target = ServerInstance->FindNick(parameters[0]); + if (target) + return ROUTE_OPT_UCAST(target->server); + return ROUTE_LOCALONLY; + } }; class CommandSilence : public Command { unsigned int& maxsilence; public: - CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max) + SimpleExtItem ext; + CommandSilence(Module* Creator, unsigned int &max) : Command(Creator, "SILENCE", 0), + maxsilence(max), ext("silence_list", Creator) { - this->source = "m_silence_ext.so"; + allow_empty_last_param = false; syntax = "{[+|-] }"; TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { - if (!pcnt) + if (!parameters.size()) { // no parameters, show the current silence list. - // Use Extensible::GetExt to fetch the silence list - silencelist* sl; - user->GetExt("silence_list", sl); + silencelist* sl = ext.get(user); // if the user has a silence list associated with their user record, show it if (sl) { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - user->WriteNumeric(271, "%s %s %s %s",user->nick, user->nick,c->first.c_str(), DecompPattern(c->second).c_str()); + std::string decomppattern = DecompPattern(c->second); + user->WriteNumeric(271, "%s %s %s %s",user->nick.c_str(), user->nick.c_str(),c->first.c_str(), decomppattern.c_str()); } } - user->WriteNumeric(272, "%s :End of Silence List",user->nick); + user->WriteNumeric(272, "%s :End of Silence List",user->nick.c_str()); - return CMD_LOCALONLY; + return CMD_SUCCESS; } - else if (pcnt > 0) + else if (parameters.size() > 0) { // one or more parameters, add or delete entry from the list (only the first parameter is used) - std::string mask = parameters[0] + 1; - char action = *parameters[0]; + std::string mask = parameters[0].substr(1); + char action = parameters[0][0]; // Default is private and notice so clients do not break int pattern = CompilePattern("pn"); // if pattern supplied, use it - if (pcnt > 1) { - pattern = CompilePattern(parameters[1]); + if (parameters.size() > 1) { + pattern = CompilePattern(parameters[1].c_str()); } - + + if (pattern == 0) + { + user->WriteServ("NOTICE %s :Bad SILENCE pattern",user->nick.c_str()); + return CMD_INVALID; + } + if (!mask.length()) { // 'SILENCE +' or 'SILENCE -', assume *!*@* mask = "*!*@*"; } - + ModeParser::CleanMask(mask); if (action == '-') { + std::string decomppattern = DecompPattern(pattern); // fetch their silence list - silencelist* sl; - user->GetExt("silence_list", sl); + silencelist* sl = ext.get(user); // does it contain any entries and does it exist? if (sl) { @@ -153,40 +176,39 @@ class CommandSilence : public Command if (listitem == mask && i->second == pattern) { sl->erase(i); - user->WriteNumeric(950, "%s %s :Removed %s %s from silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); + user->WriteNumeric(950, "%s %s :Removed %s %s from silence list",user->nick.c_str(), user->nick.c_str(), mask.c_str(), decomppattern.c_str()); if (!sl->size()) { - delete sl; - user->Shrink("silence_list"); + ext.unset(user); } return CMD_SUCCESS; } } } - user->WriteNumeric(952, "%s %s :%s %s does not exist on your silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); + user->WriteNumeric(952, "%s %s :%s %s does not exist on your silence list",user->nick.c_str(), user->nick.c_str(), mask.c_str(), decomppattern.c_str()); } else if (action == '+') { // fetch the user's current silence list - silencelist* sl; - user->GetExt("silence_list", sl); - // what, they dont have one??? WE'RE ALL GONNA DIE! ...no, we just create an empty one. + silencelist* sl = ext.get(user); if (!sl) { sl = new silencelist; - user->Extend("silence_list", sl); + ext.set(user, sl); } if (sl->size() > maxsilence) { - user->WriteNumeric(952, "%s %s :Your silence list is full",user->nick, user->nick); + user->WriteNumeric(952, "%s %s :Your silence list is full",user->nick.c_str(), user->nick.c_str()); return CMD_FAILURE; } + + std::string decomppattern = DecompPattern(pattern); for (silencelist::iterator n = sl->begin(); n != sl->end(); n++) { irc::string listitem = n->first.c_str(); if (listitem == mask && n->second == pattern) { - user->WriteNumeric(952, "%s %s :%s %s is already on your silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); + user->WriteNumeric(952, "%s %s :%s %s is already on your silence list",user->nick.c_str(), user->nick.c_str(), mask.c_str(), decomppattern.c_str()); return CMD_FAILURE; } } @@ -198,11 +220,11 @@ class CommandSilence : public Command { sl->push_back(silenceset(mask,pattern)); } - user->WriteNumeric(951, "%s %s :Added %s %s to silence list",user->nick, user->nick, mask.c_str(), DecompPattern(pattern).c_str()); + user->WriteNumeric(951, "%s %s :Added %s %s to silence list",user->nick.c_str(), user->nick.c_str(), mask.c_str(), decomppattern.c_str()); return CMD_SUCCESS; } } - return CMD_LOCALONLY; + return CMD_SUCCESS; } /* turn the nice human readable pattern into a mask */ @@ -219,7 +241,7 @@ class CommandSilence : public Command case 'c': p |= SILENCE_CHANNEL; break; - case 'i': + case 'i': p |= SILENCE_INVITE; break; case 'n': @@ -246,110 +268,84 @@ class CommandSilence : public Command std::string DecompPattern (const int pattern) { std::string out; - if ((pattern & SILENCE_PRIVATE) > 0) + if (pattern & SILENCE_PRIVATE) out += ",privatemessages"; - if ((pattern & SILENCE_CHANNEL) > 0) + if (pattern & SILENCE_CHANNEL) out += ",channelmessages"; - if ((pattern & SILENCE_INVITE) > 0) + if (pattern & SILENCE_INVITE) out += ",invites"; - if ((pattern & SILENCE_NOTICE) > 0) + if (pattern & SILENCE_NOTICE) out += ",privatenotices"; - if ((pattern & SILENCE_CNOTICE) > 0) + if (pattern & SILENCE_CNOTICE) out += ",channelnotices"; - if ((pattern & SILENCE_ALL) > 0) + if (pattern & SILENCE_ALL) out = ",all"; - if ((pattern & SILENCE_EXCLUDE) > 0) + if (pattern & SILENCE_EXCLUDE) out += ",exclude"; - return "<" + out.substr(1) + ">"; + if (out.length()) + return "<" + out.substr(1) + ">"; + else + return ""; } }; class ModuleSilence : public Module { - CommandSilence* cmdsilence; - CommandSVSSilence *cmdsvssilence; unsigned int maxsilence; + CommandSilence cmdsilence; + CommandSVSSilence cmdsvssilence; public: - - ModuleSilence(InspIRCd* Me) - : Module(Me), maxsilence(32) + + ModuleSilence() + : maxsilence(32), cmdsilence(this, maxsilence), cmdsvssilence(this) { - OnRehash(NULL, ""); - cmdsilence = new CommandSilence(ServerInstance,maxsilence); - cmdsvssilence = new CommandSVSSilence(ServerInstance); - ServerInstance->AddCommand(cmdsilence); - ServerInstance->AddCommand(cmdsvssilence); - - Implementation eventlist[] = { I_OnRehash, I_OnBuildExemptList, I_OnUserQuit, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite }; - ServerInstance->Modules->Attach(eventlist, this, 7); } - virtual void OnRehash(User* user, const std::string ¶meter) + void init() { - ConfigReader Conf(ServerInstance); - maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true); - if (!maxsilence) - maxsilence = 32; - } + OnRehash(NULL); + ServerInstance->Modules->AddService(cmdsilence); + ServerInstance->Modules->AddService(cmdsvssilence); + ServerInstance->Modules->AddService(cmdsilence.ext); + Implementation eventlist[] = { I_OnRehash, I_On005Numeric, I_OnUserPreNotice, I_OnUserPreMessage, I_OnUserPreInvite }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + } - virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) + void OnRehash(User* user) { - // when the user quits tidy up any silence list they might have just to keep things tidy - silencelist* sl; - user->GetExt("silence_list", sl); - if (sl) - { - delete sl; - user->Shrink("silence_list"); - } + maxsilence = ServerInstance->Config->ConfValue("silence")->getInt("maxentries", 32); + if (!maxsilence) + maxsilence = 32; } - virtual void On005Numeric(std::string &output) + void On005Numeric(std::string &output) { // we don't really have a limit... output = output + " ESILENCE SILENCE=" + ConvToStr(maxsilence); } - virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) + void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE); - CUList *ulist; - switch (status) - { - case '@': - ulist = chan->GetOppedUsers(); - break; - case '%': - ulist = chan->GetHalfoppedUsers(); - break; - case '+': - ulist = chan->GetVoicedUsers(); - break; - default: - ulist = chan->GetUsers(); - break; - } + const UserMembList *ulist = chan->GetUsers(); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + for (UserMembCIter i = ulist->begin(); i != ulist->end(); i++) { if (IS_LOCAL(i->first)) { - if (MatchPattern(i->first, sender, public_silence) == 1) + if (MatchPattern(i->first, sender, public_silence) == MOD_RES_DENY) { - exempt_list[i->first] = i->first->nick; + exempt_list.insert(i->first); } } } } - virtual int PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type) + ModResult PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type) { - if (!IS_LOCAL(user)) - return 0; - - if (target_type == TYPE_USER) + if (target_type == TYPE_USER && IS_LOCAL(((User*)dest))) { return MatchPattern((User*)dest, user, silence_type); } @@ -361,50 +357,49 @@ class ModuleSilence : public Module this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list, ""); } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_PRIVATE); } - virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_NOTICE); } - virtual int OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout) + ModResult OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout) { return MatchPattern(dest, source, SILENCE_INVITE); } - int MatchPattern(User* dest, User* source, int pattern) + ModResult MatchPattern(User* dest, User* source, int pattern) { /* Server source */ if (!source || !dest) - return 1; + return MOD_RES_ALLOW; - silencelist* sl; - dest->GetExt("silence_list", sl); + silencelist* sl = cmdsilence.ext.get(dest); if (sl) { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (ServerInstance->MatchText(source->GetFullHost(), c->first))) - return !(((c->second & SILENCE_EXCLUDE) > 0)); + if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (InspIRCd::Match(source->GetFullHost(), c->first))) + return (c->second & SILENCE_EXCLUDE) ? MOD_RES_PASSTHRU : MOD_RES_DENY; } } - return 0; + return MOD_RES_PASSTHRU; } - virtual ~ModuleSilence() + ~ModuleSilence() { } - - virtual Version GetVersion() + + Version GetVersion() { - return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Provides support for the /SILENCE command", VF_OPTCOMMON | VF_VENDOR); } };