+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * E-mail:
+ * <brain@chatspike.net>
+ * <Craig@chatspike.net>
+ *
+ * Written by Craig Edwards, Craig McLure, and others.
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+using namespace std;
+
// Message and notice filtering using glob patterns
// a module based on the original work done by Craig Edwards in 2003
// for the chatspike network.
#include "users.h"
#include "channels.h"
#include "modules.h"
+#include "helperfuncs.h"
/* $ModDesc: An enhanced version of the unreal m_filter.so used by chatspike.net */
-
-
class ModuleFilter : public Module
{
Server *Srv;
ConfigReader *Conf, *MyConf;
public:
- ModuleFilter()
+ ModuleFilter(Server* Me)
+ : Module::Module(Me)
{
// read the configuration file on startup.
// it is perfectly valid to set <filter file> to the value of the
// main config file, then append your <keyword> tags to the bottom
// of the main config... but rather messy. That's why the capability
// of using a seperate config file is provided.
- Srv = new Server;
+ Srv = Me;
Conf = new ConfigReader;
std::string filterfile = Conf->ReadValue("filter","file",0);
- if (filterfile == "")
+ MyConf = new ConfigReader(filterfile);
+ if ((filterfile == "") || (!MyConf->Verify()))
{
- printf("Error, could not find <filter file=\"\"> definition in your config file!");
- exit(0);
+ printf("Error, could not find <filter file=\"\"> definition in your config file!\n");
+ log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
+ return;
}
- MyConf = new ConfigReader(filterfile);
Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
}
virtual ~ModuleFilter()
{
- delete Srv;
delete MyConf;
delete Conf;
}
- // format of a config entry is <keyword pattern="*glob*" reason="Some reason here">
+ // format of a config entry is <keyword pattern="*glob*" reason="Some reason here" action="kill/block">
- virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string text)
+ virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text)
{
- text = text + " ";
+ std::string text2 = text+" ";
for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
{
std::string pattern = MyConf->ReadValue("keyword","pattern",index);
- if (Srv->MatchText(text,pattern))
+ if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
{
std::string target = "";
std::string reason = MyConf->ReadValue("keyword","reason",index);
- std::string action = MyConf->ReadValue("keyword","action",index);
- std::string operaction = MyConf->ReadValue("keyword","operaction",index);
- std::string do_action = "none";
-
- if (action == "")
- action = "none";
- if (operaction == "")
- operaction = "none";
+ std::string do_action = MyConf->ReadValue("keyword","action",index);
+
+ if (do_action == "")
+ do_action = "none";
+
if (target_type == TYPE_USER)
{
userrec* t = (userrec*)dest;
chanrec* t = (chanrec*)dest;
target = std::string(t->name);
}
- if (strchr(user->modes,'o'))
- {
- do_action = operaction;
- }
- else
- {
- do_action = action;
- }
if (do_action == "block")
{
Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+
std::string(" had their message filtered, target was ")+
- target+": "+reason);
+ target+": "+reason+" Action: "+do_action);
if (do_action == "kill")
{
return 0;
}
- virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string text)
+ virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text)
{
- text = text + " ";
+ std::string text2 = text+" ";
for (int index = 0; index < MyConf->Enumerate("keyword"); index++)
{
std::string pattern = MyConf->ReadValue("keyword","pattern",index);
- if (Srv->MatchText(text,pattern))
+ if ((Srv->MatchText(text2,pattern)) || (Srv->MatchText(text,pattern)))
{
std::string target = "";
std::string reason = MyConf->ReadValue("keyword","reason",index);
- std::string action = MyConf->ReadValue("keyword","action",index);
- std::string operaction = MyConf->ReadValue("keyword","operaction",index);
- std::string do_action = "none";
-
- if (action == "")
- action = "none";
- if (operaction == "")
- operaction = "none";
+ std::string do_action = MyConf->ReadValue("keyword","action",index);
+
+ if (do_action == "")
+ do_action = "none";
+
if (target_type == TYPE_USER)
{
userrec* t = (userrec*)dest;
chanrec* t = (chanrec*)dest;
target = std::string(t->name);
}
- if (strchr(user->modes,'o'))
- {
- do_action = operaction;
- }
- else
- {
- do_action = action;
- }
if (do_action == "block")
{
Srv->SendOpers(std::string("FILTER: ")+std::string(user->nick)+
std::string(" had their notice filtered, target was ")+
- target+": "+MyConf->ReadValue("keyword","reason",index));
+ target+": "+reason);
Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+
" :Your notice has been filtered and opers notified: "+reason);
}
Srv->Log(DEFAULT,std::string("FILTER: ")+std::string(user->nick)+
std::string(" had their notice filtered, target was ")+
- target+": "+MyConf->ReadValue("keyword","reason",index));
+ target+": "+reason+" Action: "+do_action);
if (do_action == "kill")
{
return 0;
}
- virtual void OnRehash()
+ virtual void OnRehash(std::string parameter)
{
// reload our config file on rehash - we must destroy and re-allocate the classes
// to call the constructor again and re-read our data.
delete MyConf;
Conf = new ConfigReader;
std::string filterfile = Conf->ReadValue("filter","file",0);
- if (filterfile == "")
+ // this automatically re-reads the configuration file into the class
+ MyConf = new ConfigReader(filterfile);
+ if ((filterfile == "") || (!MyConf->Verify()))
{
// bail if the user forgot to create a config file
printf("Error, could not find <filter file=\"\"> definition in your config file!");
- exit(0);
+ log(DEFAULT,"Error, could not find <filter file=\"\"> definition in your config file!");
+ return;
}
- // this automatically re-reads the configuration file into the class
- MyConf = new ConfigReader(filterfile);
Srv->Log(DEFAULT,std::string("m_filter: read configuration from ")+filterfile);
}
virtual Version GetVersion()
{
// This is version 2 because version 1.x is the unreleased unrealircd module
- return Version(2,0,0,0);
+ return Version(2,0,0,1,VF_VENDOR);
}
};
{
}
- virtual Module * CreateModule()
+ virtual Module * CreateModule(Server* Me)
{
- return new ModuleFilter;
+ return new ModuleFilter(Me);
}
};
projects / user / henk / code / inspircd.git / blobdiff