X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.h;h=5e74177e5073ce59ccadd902c4d1074cd518a1c7;hb=e9d1efc1ae29ee86b3c2a42bf56531afac7add6d;hp=5797cc3109ef58f690e0ed6dabb7da39785b5d98;hpb=276bbd193ed9dc53f44a4f564401d577d8e31424;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h index 5797cc310..5e74177e5 100644 --- a/src/modules/m_filter.h +++ b/src/modules/m_filter.h @@ -13,6 +13,14 @@ #include "xline.h" +enum FilterFlags +{ + FLAG_PART = 2, + FLAG_QUIT = 4, + FLAG_PRIVMSG = 8, + FLAG_NOTICE = 16 +}; + class FilterResult : public classbase { public: @@ -20,9 +28,55 @@ class FilterResult : public classbase std::string reason; std::string action; long gline_time; + std::string flags; + + bool flag_no_opers; + bool flag_part_message; + bool flag_quit_message; + bool flag_privmsg; + bool flag_notice; + + FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt, const std::string &fla) : freeform(free), reason(rea), + action(act), gline_time(gt), flags(fla) + { + this->FillFlags(flags); + } - FilterResult(const std::string free, const std::string &rea, const std::string &act, long gt) : freeform(free), reason(rea), action(act), gline_time(gt) + int FillFlags(const std::string &fl) { + flags = fl; + flag_no_opers = flag_part_message = flag_quit_message = flag_privmsg = flag_notice = false; + size_t x = 0; + + for (std::string::const_iterator n = flags.begin(); n != flags.end(); ++n, ++x) + { + switch (*n) + { + case 'o': + flag_no_opers = true; + break; + case 'P': + flag_part_message = true; + break; + case 'q': + flag_quit_message = true; + break; + case 'p': + flag_privmsg = true; + break; + case 'n': + flag_notice = true; + break; + case '*': + flag_no_opers = flag_part_message = flag_quit_message = + flag_privmsg = flag_notice = true; + break; + default: + return x; + break; + } + } + return 0; } FilterResult() @@ -39,16 +93,17 @@ class cmd_filter; class FilterBase : public Module { cmd_filter* filtcommand; + int flags; public: FilterBase(InspIRCd* Me, const std::string &source); virtual ~FilterBase(); virtual void Implements(char* List); virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); - virtual FilterResult* FilterMatch(const std::string &text) = 0; + virtual FilterResult* FilterMatch(userrec* user, const std::string &text, int flags) = 0; virtual bool DeleteFilter(const std::string &freeform) = 0; virtual void SyncFilters(Module* proto, void* opaque) = 0; virtual void SendFilter(Module* proto, void* opaque, FilterResult* iter); - virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration) = 0; + virtual std::pair AddFilter(const std::string &freeform, const std::string &type, const std::string &reason, long duration, const std::string &flags) = 0; virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); virtual void OnRehash(userrec* user, const std::string ¶meter); virtual Version GetVersion(); @@ -58,6 +113,7 @@ class FilterBase : public Module virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata); virtual int OnStats(char symbol, userrec* user, string_list &results) = 0; virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line); + bool AppliesToMe(userrec* user, FilterResult* filter, int flags); }; class cmd_filter : public command_t @@ -67,7 +123,7 @@ class cmd_filter : public command_t cmd_filter(FilterBase* f, InspIRCd* Me, const std::string &source) : command_t(Me, "FILTER", 'o', 1), Base(f) { this->source = source; - this->syntax = " [] :"; + this->syntax = " [] :"; } CmdResult Handle(const char** parameters, int pcnt, userrec *user) @@ -89,13 +145,15 @@ class cmd_filter : public command_t else { /* Adding a filter */ - if (pcnt >= 3) + if (pcnt >= 4) { std::string freeform = parameters[0]; std::string type = parameters[1]; + std::string flags = parameters[2]; std::string reason; long duration = 0; + if ((type != "gline") && (type != "none") && (type != "block") && (type != "kill") && (type != "silent")) { user->WriteServ("NOTICE %s :*** Invalid filter type '%s'. Supported types are 'gline', 'none', 'block', 'silent' and 'kill'.", user->nick, freeform.c_str()); @@ -104,10 +162,10 @@ class cmd_filter : public command_t if (type == "gline") { - if (pcnt >= 4) + if (pcnt >= 5) { - duration = ServerInstance->Duration(parameters[2]); - reason = parameters[3]; + duration = ServerInstance->Duration(parameters[3]); + reason = parameters[4]; } else { @@ -117,14 +175,14 @@ class cmd_filter : public command_t } else { - reason = parameters[2]; + reason = parameters[3]; } - std::pair result = Base->AddFilter(freeform, type, reason, duration); + std::pair result = Base->AddFilter(freeform, type, reason, duration, flags); if (result.first) { - user->WriteServ("NOTICE %s :*** Added filter '%s', type '%s'%s%s, reason: '%s'", user->nick, freeform.c_str(), - type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[2] : ""), - reason.c_str()); + user->WriteServ("NOTICE %s :*** Added filter '%s', type '%s'%s%s, flags '%s', reason: '%s'", user->nick, freeform.c_str(), + type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[3] : ""), + flags.c_str(), reason.c_str()); return CMD_SUCCESS; } else @@ -148,7 +206,22 @@ class cmd_filter : public command_t } }; -FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module::Module(Me) +bool FilterBase::AppliesToMe(userrec* user, FilterResult* filter, int flags) +{ + if ((filter->flag_no_opers) && IS_OPER(user)) + return false; + if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg)) + return false; + if ((flags & FLAG_NOTICE) && (!filter->flag_notice)) + return false; + if ((flags & FLAG_QUIT) && (!filter->flag_quit_message)) + return false; + if ((flags & FLAG_PART) && (!filter->flag_part_message)) + return false; + return true; +} + +FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me) { filtcommand = new cmd_filter(this, Me, source); ServerInstance->AddCommand(filtcommand); @@ -165,16 +238,20 @@ void FilterBase::Implements(char* List) int FilterBase::OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { + flags = FLAG_PRIVMSG; return OnUserPreNotice(user,dest,target_type,text,status,exempt_list); } int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { + if (!flags) + flags = FLAG_NOTICE; + /* Leave ulines alone */ if ((ServerInstance->ULine(user->server)) || (!IS_LOCAL(user))) return 0; - FilterResult* f = this->FilterMatch(text); + FilterResult* f = this->FilterMatch(user, text, flags); if (f) { std::string target = ""; @@ -218,6 +295,7 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) { + flags = 0; if ((validated == 1) && (IS_LOCAL(user))) { std::string checkline; @@ -233,6 +311,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters checkline = parameters[0]; replacepoint = 0; parting = false; + flags = FLAG_QUIT; } else if (command == "PART") { @@ -243,12 +322,16 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters checkline = parameters[1]; replacepoint = 1; parting = true; + flags = FLAG_PART; } else /* We're only messing with PART and QUIT */ return 0; - FilterResult* f = this->FilterMatch(checkline); + FilterResult* f = NULL; + + if (flags) + f = this->FilterMatch(user, checkline, flags); if (!f) /* PART or QUIT reason doesnt match a filter */ @@ -258,7 +341,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters command_t* c = ServerInstance->Parser->GetHandler(command); if (c) { - const char* params[127]; + const char* params[MAXPARAMETERS]; for (int item = 0; item < pcnt; item++) params[item] = parameters[item]; params[replacepoint] = "Reason filtered"; @@ -276,12 +359,8 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters /* Are they parting, if so, kill is applicable */ if ((parting) && (f->action == "kill")) { - user->SetWriteError("Filtered: "+f->reason); - /* This WriteServ causes the write error to be applied. - * Its not safe to kill here with QuitUser in a PreCommand handler, - * so we do it this way, which is safe just about anywhere. - */ user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str()); + userrec::QuitUser(ServerInstance, user, "Filtered: " + f->reason); } if (f->action == "gline") { @@ -318,24 +397,29 @@ std::string FilterBase::EncodeFilter(FilterResult* filter) std::ostringstream stream; std::string x = filter->freeform; + /* Hax to allow spaces in the freeform without changing the design of the irc protocol */ for (std::string::iterator n = x.begin(); n != x.end(); n++) if (*n == ' ') *n = '\7'; - stream << x << " " << filter->action << " " << filter->gline_time << " " << filter->reason; + stream << x << " " << filter->action << " " << (filter->flags.empty() ? "-" : filter->flags) << " " << filter->gline_time << " :" << filter->reason; return stream.str(); } FilterResult FilterBase::DecodeFilter(const std::string &data) { FilterResult res; - std::istringstream stream(data); - - stream >> res.freeform; - stream >> res.action; - stream >> res.gline_time; - res.reason = stream.str(); - + irc::tokenstream tokens(data); + tokens.GetToken(res.freeform); + tokens.GetToken(res.action); + tokens.GetToken(res.flags); + if (res.flags == "-") + res.flags = ""; + res.FillFlags(res.flags); + tokens.GetToken(res.gline_time); + tokens.GetToken(res.reason); + + /* Hax to allow spaces in the freeform without changing the design of the irc protocol */ for (std::string::iterator n = res.freeform.begin(); n != res.freeform.end(); n++) if (*n == '\7') *n = ' '; @@ -358,7 +442,7 @@ void FilterBase::OnDecodeMetaData(int target_type, void* target, const std::stri if ((target_type == TYPE_OTHER) && (extname == "filter")) { FilterResult data = DecodeFilter(extdata); - this->AddFilter(data.freeform, data.action, data.reason, data.gline_time); + this->AddFilter(data.freeform, data.action, data.reason, data.gline_time, data.flags); } }