X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_silence.cpp;h=0786c4da4fa60e274b3890fed69ff14a94a190e3;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=42b7f96e9ef9df79dacffc6f7f8ff441137eed31;hpb=2b2c61df8e55a331768d54cdef738c4c5179ca10;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_silence.cpp b/src/modules/m_silence.cpp index 42b7f96e9..0786c4da4 100644 --- a/src/modules/m_silence.cpp +++ b/src/modules/m_silence.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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. @@ -11,36 +11,94 @@ * --------------------------------------------------- */ -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "hashcomp.h" #include "inspircd.h" -#include "wildcard.h" /* $ModDesc: Provides support for the /SILENCE command */ -// This typedef holds a silence list. Each user may or may not have a -// silencelist, if a silence list is empty for a user, he/she does not -// have one of these structures associated with their user record. -typedef std::map silencelist; +/* Improved drop-in replacement for the /SILENCE command + * syntax: /SILENCE [+|-] as in + * + * example that blocks all except private messages + * /SILENCE +*!*@* a + * /SILENCE +*!*@* px + * + * example that blocks all invites except from channel services + * /SILENCE +*!*@* i + * /SILENCE +chanserv!services@chatters.net ix + * + * example that blocks some bad dude from private, notice and inviting you + * /SILENCE +*!kiddie@lamerz.net pin + * + * TODO: possibly have add and remove check for existing host and only modify flags according to + * what's been changed instead of having to remove first, then add if you want to change + * an entry. + */ + +// pair of hostmask and flags +typedef std::pair silenceset; + +// deque list of pairs +typedef std::deque silencelist; + +// intmasks for flags +static int SILENCE_PRIVATE = 0x0001; /* p private messages */ +static int SILENCE_CHANNEL = 0x0002; /* c channel messages */ +static int SILENCE_INVITE = 0x0004; /* i invites */ +static int SILENCE_NOTICE = 0x0008; /* n notices */ +static int SILENCE_CNOTICE = 0x0010; /* t channel notices */ +static int SILENCE_ALL = 0x0020; /* a all, (pcint) */ +static int SILENCE_EXCLUDE = 0x0040; /* x exclude this pattern */ + + +class CommandSVSSilence : public Command +{ + public: + CommandSVSSilence(InspIRCd* Instance) : Command(Instance,"SVSSILENCE", 0, 2) + { + this->source = "m_silence.so"; + syntax = " {[+|-] }"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_END); /* we watch for a nick. not a UID. */ + } + + CmdResult Handle (const std::vector& parameters, User *user) + { + /* + * XXX: thought occurs to me + * We may want to change the syntax of this command to + * SVSSILENCE + - + + * style command so services can modify lots of entries at once. + * leaving it backwards compatible for now as it's late. -- w + */ + 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", std::vector(++parameters.begin(), parameters.end()), u); + } + + return CMD_SUCCESS; + } +}; -class cmd_silence : public command_t +class CommandSilence : public Command { unsigned int& maxsilence; public: - cmd_silence (InspIRCd* Instance, unsigned int &max) : command_t(Instance,"SILENCE", 0, 0), maxsilence(max) + CommandSilence (InspIRCd* Instance, unsigned int &max) : Command(Instance,"SILENCE", 0, 0), maxsilence(max) { this->source = "m_silence.so"; - syntax = "{[+|-]}"; + syntax = "{[+|-] }"; + TRANSLATE3(TR_TEXT, TR_TEXT, TR_END); } - CmdResult Handle (const char** parameters, int pcnt, userrec *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 @@ -51,25 +109,32 @@ class cmd_silence : public command_t { for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) { - user->WriteServ("271 %s %s %s :%lu",user->nick, user->nick, c->first.c_str(), (unsigned long)c->second); + user->WriteNumeric(271, "%s %s %s %s",user->nick.c_str(), user->nick.c_str(),c->first.c_str(), DecompPattern(c->second).c_str()); } } - user->WriteServ("272 %s :End of Silence List",user->nick); + user->WriteNumeric(272, "%s :End of Silence List",user->nick.c_str()); - return CMD_SUCCESS; + return CMD_LOCALONLY; } - 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 (parameters.size() > 1) { + pattern = CompilePattern(parameters[1].c_str()); + } + if (!mask.length()) { // 'SILENCE +' or 'SILENCE -', assume *!*@* mask = "*!*@*"; } - + ModeParser::CleanMask(mask); if (action == '-') @@ -80,22 +145,24 @@ class cmd_silence : public command_t // does it contain any entries and does it exist? if (sl) { - silencelist::iterator i = sl->find(mask.c_str()); - if (i != sl->end()) + for (silencelist::iterator i = sl->begin(); i != sl->end(); i++) { - sl->erase(i); - user->WriteServ("950 %s %s :Removed %s from silence list",user->nick, user->nick, mask.c_str()); - if (!sl->size()) + // search through for the item + irc::string listitem = i->first.c_str(); + if (listitem == mask && i->second == pattern) { - // tidy up -- if a user's list is empty, theres no use having it - // hanging around in the user record. - DELETE(sl); - user->Shrink("silence_list"); + sl->erase(i); + user->WriteNumeric(950, "%s %s :Removed %s %s from silence list",user->nick.c_str(), user->nick.c_str(), mask.c_str(), DecompPattern(pattern).c_str()); + if (!sl->size()) + { + delete sl; + user->Shrink("silence_list"); + } + return CMD_SUCCESS; } } - else - user->WriteServ("952 %s %s :%s does not exist on your silence list",user->nick, user->nick, mask.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(pattern).c_str()); } else if (action == '+') { @@ -108,47 +175,114 @@ class cmd_silence : public command_t sl = new silencelist; user->Extend("silence_list", sl); } - silencelist::iterator n = sl->find(mask.c_str()); - if (n != sl->end()) + if (sl->size() > maxsilence) { - user->WriteServ("952 %s %s :%s is already on your silence list",user->nick, user->nick, mask.c_str()); + user->WriteNumeric(952, "%s %s :Your silence list is full",user->nick.c_str(), user->nick.c_str()); return CMD_FAILURE; } - if (sl->size() >= maxsilence) + for (silencelist::iterator n = sl->begin(); n != sl->end(); n++) { - user->WriteServ("952 %s %s :Your silence list is full",user->nick, user->nick, mask.c_str()); - return CMD_FAILURE; + 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.c_str(), user->nick.c_str(), mask.c_str(), DecompPattern(pattern).c_str()); + return CMD_FAILURE; + } } - sl->insert(std::make_pair(mask.c_str(), ServerInstance->Time())); - user->WriteServ("951 %s %s :Added %s to silence list",user->nick, user->nick, mask.c_str()); + if (((pattern & SILENCE_EXCLUDE) > 0)) + { + sl->push_front(silenceset(mask,pattern)); + } + else + { + sl->push_back(silenceset(mask,pattern)); + } + user->WriteNumeric(951, "%s %s :Added %s %s to silence list",user->nick.c_str(), user->nick.c_str(), mask.c_str(), DecompPattern(pattern).c_str()); return CMD_SUCCESS; } } - return CMD_SUCCESS; + return CMD_LOCALONLY; + } + + /* turn the nice human readable pattern into a mask */ + int CompilePattern(const char* pattern) + { + int p = 0; + for (const char* n = pattern; *n; n++) + { + switch (*n) + { + case 'p': + p |= SILENCE_PRIVATE; + break; + case 'c': + p |= SILENCE_CHANNEL; + break; + case 'i': + p |= SILENCE_INVITE; + break; + case 'n': + p |= SILENCE_NOTICE; + break; + case 't': + p |= SILENCE_CNOTICE; + break; + case 'a': + case '*': + p |= SILENCE_ALL; + break; + case 'x': + p |= SILENCE_EXCLUDE; + break; + default: + break; + } + } + return p; + } + + /* turn the mask into a nice human readable format */ + std::string DecompPattern (const int pattern) + { + std::string out; + if ((pattern & SILENCE_PRIVATE) > 0) + out += ",privatemessages"; + if ((pattern & SILENCE_CHANNEL) > 0) + out += ",channelmessages"; + if ((pattern & SILENCE_INVITE) > 0) + out += ",invites"; + if ((pattern & SILENCE_NOTICE) > 0) + out += ",privatenotices"; + if ((pattern & SILENCE_CNOTICE) > 0) + out += ",channelnotices"; + if ((pattern & SILENCE_ALL) > 0) + out = ",all"; + if ((pattern & SILENCE_EXCLUDE) > 0) + out += ",exclude"; + return "<" + out.substr(1) + ">"; } + }; class ModuleSilence : public Module { - - cmd_silence* mycommand; unsigned int maxsilence; + CommandSilence cmdsilence; + CommandSVSSilence cmdsvssilence; public: - + ModuleSilence(InspIRCd* Me) - : Module::Module(Me), maxsilence(32) + : Module(Me), maxsilence(32), cmdsilence(Me, maxsilence), cmdsvssilence(Me) { - OnRehash(NULL, ""); - mycommand = new cmd_silence(ServerInstance, maxsilence); - ServerInstance->AddCommand(mycommand); - } + OnRehash(NULL); + ServerInstance->AddCommand(&cmdsilence); + ServerInstance->AddCommand(&cmdsvssilence); - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserQuit] = List[I_On005Numeric] = List[I_OnUserPreNotice] = List[I_OnUserPreMessage] = 1; + 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(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ConfigReader Conf(ServerInstance); maxsilence = Conf.ReadInteger("silence", "maxentries", 0, true); @@ -156,15 +290,15 @@ class ModuleSilence : public Module maxsilence = 32; } - virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + + virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) { // when the user quits tidy up any silence list they might have just to keep things tidy - // and to prevent a HONKING BIG MEMORY LEAK! silencelist* sl; user->GetExt("silence_list", sl); if (sl) { - DELETE(sl); + delete sl; user->Shrink("silence_list"); } } @@ -172,71 +306,100 @@ class ModuleSilence : public Module virtual void On005Numeric(std::string &output) { // we don't really have a limit... - output = output + " SILENCE=" + ConvToStr(maxsilence); + output = output + " ESILENCE SILENCE=" + ConvToStr(maxsilence); } - - virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + + virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text) { - // im not sure how unreal's silence operates but ours is sensible. It blocks notices and - // privmsgs from people on the silence list, directed privately at the user. - // channel messages are unaffected (ever tried to follow the flow of conversation in - // a channel when you've set an ignore on the two most talkative people?) - if ((target_type == TYPE_USER) && (IS_LOCAL(user))) + int public_silence = (message_type == MSG_PRIVMSG ? SILENCE_CHANNEL : SILENCE_CNOTICE); + CUList *ulist; + switch (status) { - userrec* u = (userrec*)dest; - silencelist* sl; - u->GetExt("silence_list", sl); - if (sl) + case '@': + ulist = chan->GetOppedUsers(); + break; + case '%': + ulist = chan->GetHalfoppedUsers(); + break; + case '+': + ulist = chan->GetVoicedUsers(); + break; + default: + ulist = chan->GetUsers(); + break; + } + + for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + { + if (IS_LOCAL(i->first)) { - for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) + if (MatchPattern(i->first, sender, public_silence) == 1) { - if (match(user->GetFullHost(), c->first.c_str())) - { - return 1; - } + exempt_list[i->first] = i->first->nick; } } } - return 0; } - virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) + virtual int PreText(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list, int silence_type) { - return OnUserPreNotice(user,dest,target_type,text,status,exempt_list); + if (target_type == TYPE_USER && IS_LOCAL(((User*)dest))) + { + return MatchPattern((User*)dest, user, silence_type); + } + else if (target_type == TYPE_CHANNEL) + { + Channel* chan = (Channel*)dest; + if (chan) + { + this->OnBuildExemptList((silence_type == SILENCE_PRIVATE ? MSG_PRIVMSG : MSG_NOTICE), chan, user, status, exempt_list, ""); + } + } + return 0; } - virtual ~ModuleSilence() + virtual int 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 Version GetVersion() + + virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return PreText(user, dest, target_type, text, status, exempt_list, SILENCE_NOTICE); } -}; + virtual int OnUserPreInvite(User* source,User* dest,Channel* channel, time_t timeout) + { + return MatchPattern(dest, source, SILENCE_INVITE); + } -class ModuleSilenceFactory : public ModuleFactory -{ - public: - ModuleSilenceFactory() + int MatchPattern(User* dest, User* source, int pattern) { + /* Server source */ + if (!source || !dest) + return 1; + + silencelist* sl; + dest->GetExt("silence_list", sl); + if (sl) + { + for (silencelist::const_iterator c = sl->begin(); c != sl->end(); c++) + { + if (((((c->second & pattern) > 0)) || ((c->second & SILENCE_ALL) > 0)) && (InspIRCd::Match(source->GetFullHost(), c->first))) + return !(((c->second & SILENCE_EXCLUDE) > 0)); + } + } + return 0; } - - ~ModuleSilenceFactory() + + virtual ~ModuleSilence() { } - - virtual Module * CreateModule(InspIRCd* Me) + + virtual Version GetVersion() { - return new ModuleSilence(Me); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleSilenceFactory; -} - +MODULE_INIT(ModuleSilence)