X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.h;h=ca1e1486ab3d85819267c354e4d255931b24ecba;hb=27cef863f7286b626e01f1287f31005478a66fea;hp=5313d523828bf7b9b55a61cba475b2a8899d8ed7;hpb=94afde43b086f092bf8128d76d418cb63840e8eb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h index 5313d5238..ca1e1486a 100644 --- a/src/modules/m_filter.h +++ b/src/modules/m_filter.h @@ -36,10 +36,10 @@ class FilterResult : public classbase 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) + 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); + this->FillFlags(fla); } int FillFlags(const std::string &fl) @@ -94,10 +94,11 @@ class FilterBase : public Module { CommandFilter* filtcommand; int flags; +protected: + std::vector exemptfromfilter; // List of channel names excluded from filtering. public: FilterBase(InspIRCd* Me, const std::string &source); virtual ~FilterBase(); - virtual void Implements(char* List); virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); virtual FilterResult* FilterMatch(User* user, const std::string &text, int flags) = 0; virtual bool DeleteFilter(const std::string &freeform) = 0; @@ -112,7 +113,7 @@ class FilterBase : public Module virtual void OnSyncOtherMetaData(Module* proto, void* opaque, bool displayable = false); virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata); virtual int OnStats(char symbol, User* user, string_list &results) = 0; - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line); + virtual int OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line); bool AppliesToMe(User* user, FilterResult* filter, int flags); }; @@ -120,32 +121,32 @@ class CommandFilter : public Command { FilterBase* Base; public: - CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f) + CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &ssource) : Command(Me, "FILTER", "o", 1), Base(f) { - this->source = source; + this->source = ssource; this->syntax = " [] :"; } - CmdResult Handle(const char** parameters, int pcnt, User *user) + CmdResult Handle(const std::vector ¶meters, User *user) { - if (pcnt == 1) + if (parameters.size() == 1) { /* Deleting a filter */ if (Base->DeleteFilter(parameters[0])) { - user->WriteServ("NOTICE %s :*** Deleted filter '%s'", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Deleted filter '%s'", user->nick.c_str(), parameters[0].c_str()); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Filter '%s' not found on list.", user->nick, parameters[0]); + user->WriteServ("NOTICE %s :*** Filter '%s' not found on list.", user->nick.c_str(), parameters[0].c_str()); return CMD_FAILURE; } } else { /* Adding a filter */ - if (pcnt >= 4) + if (parameters.size() >= 4) { std::string freeform = parameters[0]; std::string type = parameters[1]; @@ -156,13 +157,13 @@ class CommandFilter : public Command 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()); + user->WriteServ("NOTICE %s :*** Invalid filter type '%s'. Supported types are 'gline', 'none', 'block', 'silent' and 'kill'.", user->nick.c_str(), freeform.c_str()); return CMD_FAILURE; } if (type == "gline") { - if (pcnt >= 5) + if (parameters.size() >= 5) { duration = ServerInstance->Duration(parameters[3]); reason = parameters[4]; @@ -180,14 +181,14 @@ class CommandFilter : public Command std::pair result = Base->AddFilter(freeform, type, reason, duration, flags); if (result.first) { - 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] : ""), + user->WriteServ("NOTICE %s :*** Added filter '%s', type '%s'%s%s, flags '%s', reason: '%s'", user->nick.c_str(), freeform.c_str(), + type.c_str(), (duration ? " duration: " : ""), (duration ? parameters[3].c_str() : ""), flags.c_str(), reason.c_str()); return CMD_SUCCESS; } else { - user->WriteServ("NOTICE %s :*** Filter '%s' could not be added: %s", user->nick, freeform.c_str(), result.second.c_str()); + user->WriteServ("NOTICE %s :*** Filter '%s' could not be added: %s", user->nick.c_str(), freeform.c_str(), result.second.c_str()); return CMD_FAILURE; } } @@ -202,21 +203,21 @@ class CommandFilter : public Command void TooFewParams(User* user, const std::string &extra_text) { - user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick, extra_text.c_str()); + user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick.c_str(), extra_text.c_str()); } }; -bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int flags) +bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int iflags) { if ((filter->flag_no_opers) && IS_OPER(user)) return false; - if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg)) + if ((iflags & FLAG_PRIVMSG) && (!filter->flag_privmsg)) return false; - if ((flags & FLAG_NOTICE) && (!filter->flag_notice)) + if ((iflags & FLAG_NOTICE) && (!filter->flag_notice)) return false; - if ((flags & FLAG_QUIT) && (!filter->flag_quit_message)) + if ((iflags & FLAG_QUIT) && (!filter->flag_quit_message)) return false; - if ((flags & FLAG_PART) && (!filter->flag_part_message)) + if ((iflags & FLAG_PART) && (!filter->flag_part_message)) return false; return true; } @@ -225,17 +226,14 @@ FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me) { filtcommand = new CommandFilter(this, Me, source); ServerInstance->AddCommand(filtcommand); + Implementation eventlist[] = { I_OnPreCommand, I_OnStats, I_OnSyncOtherMetaData, I_OnDecodeMetaData, I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, 7); } FilterBase::~FilterBase() { } -void FilterBase::Implements(char* List) -{ - List[I_OnPreCommand] = List[I_OnStats] = List[I_OnSyncOtherMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnRehash] = 1; -} - int FilterBase::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { flags = FLAG_PRIVMSG; @@ -264,10 +262,12 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri { Channel* t = (Channel*)dest; target = std::string(t->name); + std::vector::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), target); + if (i != exemptfromfilter.end()) return 0; } if (f->action == "block") { - ServerInstance->SNO->WriteToSnoMask('O', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason); + ServerInstance->SNO->WriteToSnoMask('A', std::string("FILTER: ")+user->nick+" had their message filtered, target was "+target+": "+f->reason); user->WriteServ("NOTICE "+std::string(user->nick)+" :Your message has been filtered and opers notified: "+f->reason); } if (f->action == "silent") @@ -276,7 +276,7 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri } if (f->action == "kill") { - User::QuitUser(ServerInstance,user,"Filtered: "+f->reason); + ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason); } if (f->action == "gline") { @@ -289,16 +289,16 @@ int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::stri delete gl; } - ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action); + ServerInstance->Logs->Log("FILTER",DEFAULT,"FILTER: "+ user->nick + " had their message filtered, target was " + target + ": " + f->reason + " Action: " + f->action); return 1; } return 0; } -int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) +int FilterBase::OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) { flags = 0; - if ((validated == 1) && (IS_LOCAL(user))) + if (validated && IS_LOCAL(user)) { std::string checkline; int replacepoint = 0; @@ -307,7 +307,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters if (command == "QUIT") { /* QUIT with no reason: nothing to do */ - if (pcnt < 1) + if (parameters.size() < 1) return 0; checkline = parameters[0]; @@ -318,9 +318,11 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters else if (command == "PART") { /* PART with no reason: nothing to do */ - if (pcnt < 2) + if (parameters.size() < 2) return 0; + std::vector::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), parameters[0]); + if (i != exemptfromfilter.end()) return 0; checkline = parameters[1]; replacepoint = 1; parting = true; @@ -343,9 +345,9 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters Command* c = ServerInstance->Parser->GetHandler(command); if (c) { - const char* params[MAXPARAMETERS]; - for (int item = 0; item < pcnt; item++) - params[item] = parameters[item]; + std::vector params; + for (int item = 0; item < (int)parameters.size(); item++) + params.push_back(parameters[item]); params[replacepoint] = "Reason filtered"; /* We're blocking, OR theyre quitting and its a KILL action @@ -353,7 +355,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters */ if ((f->action == "block") || (((!parting) && (f->action == "kill"))) || (f->action == "silent")) { - c->Handle(params, pcnt, user); + c->Handle(params, user); return 1; } else @@ -361,8 +363,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->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str()); - User::QuitUser(ServerInstance, user, "Filtered: " + f->reason); + user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick.c_str(), f->reason.c_str()); + ServerInstance->Users->QuitUser(user, "Filtered: " + f->reason); } if (f->action == "gline") { @@ -385,8 +387,18 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters void FilterBase::OnRehash(User* user, const std::string ¶meter) { + ConfigReader* MyConf = new ConfigReader(ServerInstance); + std::vector().swap(exemptfromfilter); + for (int index = 0; index < MyConf->Enumerate("exemptfromfilter"); ++index) + { + std::string chan = MyConf->ReadValue("exemptfromfilter", "channel", index); + if (!chan.empty()) { + exemptfromfilter.push_back(chan); + } + } + delete MyConf; } - + Version FilterBase::GetVersion() { return Version(1,1,0,2,VF_VENDOR|VF_COMMON,API_VERSION);