X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_filter.h;h=fc0d97938f436c8e762266fed971e0f85563af28;hb=ca7cb01b7a286f346748986da74b634edfe195c7;hp=f2986804c3fe63a67df338b7d487693faba887d8;hpb=17d91b065e98963451e595d7697357a40a1c4425;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_filter.h b/src/modules/m_filter.h index f2986804c..fc0d97938 100644 --- a/src/modules/m_filter.h +++ b/src/modules/m_filter.h @@ -15,7 +15,6 @@ enum FilterFlags { - FLAG_NOOPERS = 1, FLAG_PART = 2, FLAG_QUIT = 4, FLAG_PRIVMSG = 8, @@ -89,45 +88,45 @@ class FilterResult : public classbase } }; -class cmd_filter; +class CommandFilter; class FilterBase : public Module { - cmd_filter* filtcommand; + CommandFilter* 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(userrec* user, const std::string &text, int flags) = 0; + 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; 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, 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 int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list); + virtual void OnRehash(User* user, const std::string ¶meter); virtual Version GetVersion(); std::string EncodeFilter(FilterResult* filter); FilterResult DecodeFilter(const std::string &data); 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, 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); + 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); + bool AppliesToMe(User* user, FilterResult* filter, int flags); }; -class cmd_filter : public command_t +class CommandFilter : public Command { FilterBase* Base; public: - cmd_filter(FilterBase* f, InspIRCd* Me, const std::string &source) : command_t(Me, "FILTER", 'o', 1), Base(f) + CommandFilter(FilterBase* f, InspIRCd* Me, const std::string &source) : Command(Me, "FILTER", 'o', 1), Base(f) { this->source = source; this->syntax = " [] :"; } - CmdResult Handle(const char** parameters, int pcnt, userrec *user) + CmdResult Handle(const char** parameters, int pcnt, User *user) { if (pcnt == 1) { @@ -201,15 +200,15 @@ class cmd_filter : public command_t } } - void TooFewParams(userrec* user, const std::string &extra_text) + void TooFewParams(User* user, const std::string &extra_text) { user->WriteServ("NOTICE %s :*** Not enough parameters%s", user->nick, extra_text.c_str()); } }; -bool FilterBase::AppliesToMe(userrec* user, FilterResult* filter, int flags) +bool FilterBase::AppliesToMe(User* user, FilterResult* filter, int flags) { - if ((flags & FLAG_NOOPERS) && (filter->flag_no_opers) && IS_OPER(user)) + if ((filter->flag_no_opers) && IS_OPER(user)) return false; if ((flags & FLAG_PRIVMSG) && (!filter->flag_privmsg)) return false; @@ -224,7 +223,7 @@ bool FilterBase::AppliesToMe(userrec* user, FilterResult* filter, int flags) FilterBase::FilterBase(InspIRCd* Me, const std::string &source) : Module(Me) { - filtcommand = new cmd_filter(this, Me, source); + filtcommand = new CommandFilter(this, Me, source); ServerInstance->AddCommand(filtcommand); } @@ -237,13 +236,13 @@ 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(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) +int FilterBase::OnUserPreMessage(User* 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) +int FilterBase::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list) { if (!flags) flags = FLAG_NOTICE; @@ -258,12 +257,12 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s std::string target = ""; if (target_type == TYPE_USER) { - userrec* t = (userrec*)dest; + User* t = (User*)dest; target = std::string(t->nick); } else if (target_type == TYPE_CHANNEL) { - chanrec* t = (chanrec*)dest; + Channel* t = (Channel*)dest; target = std::string(t->name); } if (f->action == "block") @@ -277,15 +276,18 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s } if (f->action == "kill") { - userrec::QuitUser(ServerInstance,user,"Filtered: "+f->reason); + User::QuitUser(ServerInstance,user,"Filtered: "+f->reason); } if (f->action == "gline") { - if (ServerInstance->XLines->add_gline(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), user->MakeHostIP())) + GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString()); + if (ServerInstance->XLines->AddLine(gl)) { - ServerInstance->XLines->apply_lines(APPLY_GLINES); + ServerInstance->XLines->ApplyLines(); FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP())); } + else + delete gl; } ServerInstance->Log(DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" had their message filtered, target was ")+target+": "+f->reason+" Action: "+f->action); @@ -294,7 +296,7 @@ int FilterBase::OnUserPreNotice(userrec* user,void* dest,int target_type, std::s return 0; } -int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, userrec *user, bool validated, const std::string &original_line) +int FilterBase::OnPreCommand(const std::string &command, const char** parameters, int pcnt, User *user, bool validated, const std::string &original_line) { flags = 0; if ((validated == 1) && (IS_LOCAL(user))) @@ -339,10 +341,10 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters return 0; /* We cant block a part or quit, so instead we change the reason to 'Reason filtered' */ - command_t* c = ServerInstance->Parser->GetHandler(command); + Command* 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"; @@ -360,24 +362,20 @@ 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()); + User::QuitUser(ServerInstance, user, "Filtered: " + f->reason); } if (f->action == "gline") { /* Note: We gline *@IP so that if their host doesnt resolve the gline still applies. */ - std::string wild = "*@"; - wild.append(user->GetIPString()); - - if (ServerInstance->XLines->add_gline(f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), wild.c_str())) + GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), f->gline_time, ServerInstance->Config->ServerName, f->reason.c_str(), "*", user->GetIPString()); + if (ServerInstance->XLines->AddLine(gl)) { - ServerInstance->XLines->apply_lines(APPLY_GLINES); + ServerInstance->XLines->ApplyLines(); FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP())); } + else + delete gl; } return 1; } @@ -387,7 +385,7 @@ int FilterBase::OnPreCommand(const std::string &command, const char** parameters return 0; } -void FilterBase::OnRehash(userrec* user, const std::string ¶meter) +void FilterBase::OnRehash(User* user, const std::string ¶meter) { }