* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2008 InspIRCd Development Team
* See: http://www.inspircd.org/wiki/index.php/Credits
*
* This program is free but copyrighted software; see
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)
}
};
-class cmd_filter;
+class CommandFilter;
class FilterBase : public Module
{
- cmd_filter* filtcommand;
+ CommandFilter* filtcommand;
int flags;
+protected:
+ std::vector<std::string> 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(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<bool, std::string> 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* const* 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 &ssource) : Command(Me, "FILTER", "o", 1), Base(f)
{
- this->source = source;
+ this->source = ssource;
this->syntax = "<filter-definition> <type> <flags> [<gline-duration>] :<reason>";
}
- CmdResult Handle(const char** parameters, int pcnt, userrec *user)
+ CmdResult Handle(const char* const* parameters, int pcnt, User *user)
{
if (pcnt == 1)
{
}
}
- 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 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;
}
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);
+ 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(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;
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);
+ std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), target);
+ if (i != exemptfromfilter.end()) return 0;
}
if (f->action == "block")
{
- ServerInstance->WriteOpers(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")
}
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,NULL))
{
- ServerInstance->XLines->apply_lines(APPLY_GLINES);
- FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP()));
+ ServerInstance->XLines->ApplyLines();
}
+ 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);
+ ServerInstance->Logs->Log("FILTER",DEFAULT,"FILTER: "+std::string(user->nick)+std::string(" 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, userrec *user, bool validated, const std::string &original_line)
+int FilterBase::OnPreCommand(const std::string &command, const char* const* parameters, int pcnt, User *user, bool validated, const std::string &original_line)
{
flags = 0;
if ((validated == 1) && (IS_LOCAL(user)))
if (pcnt < 2)
return 0;
+ std::vector<std::string>::iterator i = find(exemptfromfilter.begin(), exemptfromfilter.end(), parameters[0]);
+ if (i != exemptfromfilter.end()) return 0;
checkline = parameters[1];
replacepoint = 1;
parting = true;
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[MAXPARAMETERS];
if ((parting) && (f->action == "kill"))
{
user->WriteServ("NOTICE %s :*** Your PART message was filtered: %s", user->nick, f->reason.c_str());
- userrec::QuitUser(ServerInstance, user, "Filtered: " + f->reason);
+ 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,NULL))
{
- ServerInstance->XLines->apply_lines(APPLY_GLINES);
- FOREACH_MOD(I_OnAddGLine,OnAddGLine(f->gline_time, NULL, f->reason, user->MakeHostIP()));
+ ServerInstance->XLines->ApplyLines();
}
+ else
+ delete gl;
}
return 1;
}
return 0;
}
-void FilterBase::OnRehash(userrec* user, const std::string ¶meter)
+void FilterBase::OnRehash(User* user, const std::string ¶meter)
{
+ ConfigReader* MyConf = new ConfigReader(ServerInstance);
+ std::vector<std::string>().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);
projects / user / henk / code / inspircd.git / blobdiff