#define KEY_INFO "info"
#define KEY_EXCEPTLEVEL "exceptlevel"
#define KEY_EXPIRY "expiry"
-#define KEY_LASTBADWORDID "last_badword_id"
-#define KEY_BADWORDS "badwords"
+#define KEY_LASTBADWORDID "last_badword_id"\r
+#define KEY_BADWORDS "badwords"\r
-#define KEY_BADWORD_MASK "mask"
-#define KEY_BADWORD_TRIGGERED "count"
-#define KEY_BADWORD_ACTION "action"
-#define KEY_BADWORDID "badwordid"
+#define KEY_BADWORD_MASK "mask"
+#define KEY_BADWORD_TRIGGERED "count"
+#define KEY_BADWORD_ACTION "action"
+#define KEY_BADWORDID "badwordid"
#define KEY_DEBUG_CHANNEL "debug_channel"
+#define KEY_OPER_CHANNEL "oper_channel"
#define KEY_GLOBAL_EXCEPTIONS "global_exceptions"
#define KEY_NETWORK_RULES "network_rules"
#define KEY_TRIGGER "trigger"
#define spamserv_notice(target, format...) send_message(target , spamserv , ## format)
#define spamserv_debug(format...) do { if(spamserv_conf.debug_channel) send_channel_message(spamserv_conf.debug_channel , spamserv , ## format); } while(0)
+#define spamserv_oper_message(format...) do { if(spamserv_conf.oper_channel) send_channel_message(spamserv_conf.oper_channel , spamserv , ## format); } while(0)
#define ss_reply(format...) send_message(user , spamserv , ## format)
#define SET_SUBCMDS_SIZE 10
{ "SSMSG_STATUS_MEMORY", "$bMemory Information:$b" },
{ "SSMSG_STATUS_CHANNEL_LIST", "$bRegistered Channels:$b" },
{ "SSMSG_STATUS_NO_CHANNEL", "No channels registered." },
-
+
{ "SSMSG_BADWORD_ALREADY_ADDED", "$b%s$b is already added. (ID: %s)" },
- { "SSMSG_BADWORD_ADDED", "added '$b%s$b' to the badword list with ID %s." },
- { "SSMSG_BADWORD_SET_DONE", "Done." },
- { "SSMSG_BADWORD_SET_INVALID", "Invalid Option for setting %s" },
- { "SSMSG_BADWORD_SET", "Settings for BadWord entry $b%s$b" },
- { "SSMSG_BADWORD_SET_MASK", "$bMASK$b: %s" },
- { "SSMSG_BADWORD_SET_ACTION", "$bACTION$b: %s" },
+ { "SSMSG_BADWORD_ADDED", "added '$b%s$b' to the badword list with ID %s." },
+ { "SSMSG_BADWORD_SET_DONE", "Done." },
+ { "SSMSG_BADWORD_SET_INVALID", "Invalid Option for setting %s" },
+ { "SSMSG_BADWORD_SET", "Settings for BadWord entry $b%s$b" },
+ { "SSMSG_BADWORD_SET_MASK", "$bMASK$b: %s" },
+ { "SSMSG_BADWORD_SET_ACTION", "$bACTION$b: %s" },
+ { "SSMSG_BADWORD_NOT_FOUND", "badword with ID %s does not exist." },
+ { "SSMSG_BADWORD_REMOVED", "badword ID $b%s$b has been removed (mask: '%s')" },
{ NULL, NULL }
};
#define SSMSG_WARNING_RULES "%s is against the network rules. Read the network rules at %s"
#define SSMSG_WARNING_RULES_2 "You are violating the network rules. Read the network rules at %s"
#define SSMSG_BADWORD_DETECTED "Your message contained a forbidden word."
+#define SSMSG_CHANNEL_REGISTERED "%s (channel %s) registered by %s."
+#define SSMSG_CHANNEL_UNREGISTERED "%s (channel %s) unregistered by %s."
static struct
{
struct chanNode *debug_channel;
+ struct chanNode *oper_channel;
struct string_list *global_exceptions;
const char *network_rules;
unsigned char trigger;
cInfo->exceptlevel = 400;
safestrncpy(cInfo->info, info, sizeof(cInfo->info));
cInfo->suspend_expiry = 0;
- cInfo->badwords = dict_new();
- cInfo->last_badword_id = 0;
dict_insert(registered_channels_dict, cInfo->channel->name, cInfo);
return cInfo;
spamserv_join_channel(cInfo->channel);
- snprintf(reason, sizeof(reason), "%s (channel %s) registered by %s.", spamserv->nick, channel->name, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ spamserv_oper_message(SSMSG_CHANNEL_REGISTERED, spamserv->nick, channel->name, user->handle_info->handle);
ss_reply("SSMSG_REG_SUCCESS", channel->name);
return 1;
spamserv_unregister_channel(cInfo);
- snprintf(reason, sizeof(reason), "%s (channel %s) unregistered by %s.", spamserv->nick, channel->name, user->handle_info->handle);
- global_message(MESSAGE_RECIPIENT_OPERS | MESSAGE_RECIPIENT_HELPERS, reason);
+ spamserv_oper_message(SSMSG_CHANNEL_UNREGISTERED, channel->name, user->handle_info->handle);
ss_reply("SSMSG_UNREG_SUCCESS", channel->name);
return 1;
{
struct chanInfo *cInfo = get_chanInfo(channel->name);
struct userData *uData;
+ unsigned int n;
if(!cInfo)
{
ss_reply("SSMSG_NO_ACCESS");
return 0;
}
+
+ for (n=1; n<argc; n++) {
+ struct badword *badword = dict_find(cInfo->badwords, argv[n], NULL);
+ if (!badword) {
+ reply("SSMSG_BADWORD_NOT_FOUND", argv[n]);
+ continue;
+ }
+ reply("SSMSG_BADWORD_REMOVED", argv[n], badword->badword_mask);
+ dict_remove(cInfo->badwords, argv[n]);
+ }
+ return 1;
}
static SPAMSERV_FUNC(cmd_setbad)
KickChannelUser(user, channel, spamserv, reason);
}
-static void
-spamserv_detected_badword(struct userNode *user, struct chanNode *chan, struct badword *badword)
-{
- char *hostmask;
- char *reason = SSMSG_BADWORD_DETECTED;
- char mask[IRC_NTOP_MAX_SIZE+3] = { '*', '@', '\0' };
- switch(badword->action) {
- case BADACTION_BAN:
- hostmask = generate_hostmask(user, GENMASK_STRICT_HOST | GENMASK_ANY_IDENT);
- sanitize_ircmask(hostmask);
- if(chan->channel_info) {
- //registered channel
- add_channel_ban(chan->channel_info, hostmask, spamserv->nick, now, now, now + spamserv_conf.long_ban_duration, reason);
- }
- struct mod_chanmode change;
- mod_chanmode_init(&change);
- change.argc = 1;
- change.args[0].mode = MODE_BAN;
- change.args[0].u.hostmask = hostmask;
- mod_chanmode_announce(spamserv, chan, &change);
- free(hostmask);
-
- case BADACTION_KICK:
- if(GetUserMode(chan, user))
- KickChannelUser(user, chan, spamserv, reason);
- break;
- case BADACTION_KILL:
- DelUser(user, spamserv, 1, reason);
- break;
- case BADACTION_GLINE:
- irc_ntop(mask + 2, sizeof(mask) - 2, &user->ip);
- gline_add(spamserv->nick, mask, spamserv_conf.gline_duration, reason, now, now, 0, 1);
- break;
- default:
- //error?
- break;
- }
-}
-
void
spamserv_channel_message(struct chanNode *channel, struct userNode *user, char *text)
{
}
}
}
-
- dict_iterator_t it;
+
+ dict_iterator_t it;
for (it = dict_first(cInfo->badwords); it; it = iter_next(it)) {
struct badword *badword = iter_data(it);
static int
spamserv_saxdb_read(struct dict *database)
{
- dict_iterator_t it, itbad;
- struct dict *object, *badwords;
- struct record_data *hir, hirbad;
+ dict_iterator_t it;
+ struct dict *badwords;
+ struct record_data *hir;
struct chanNode *channel;
struct chanInfo *cInfo;
struct string_list *strlist;
- unsigned int flags,exceptlevel,badwordid,action,triggered;
- char *str, *info, *mask;
+ unsigned int flags,exceptlevel,badwordid;
+ char *str, *info;
unsigned long expiry;
for(it = dict_first(database); it; it = iter_next(it))
}
str = database_get_data(conf_node, KEY_DEBUG_CHANNEL, RECDB_QSTRING);
-
if(str)
{
spamserv_conf.debug_channel = AddChannel(str, now, "+tinms", NULL);
spamserv_conf.debug_channel = NULL;
}
+ str = database_get_data(conf_node, KEY_OPER_CHANNEL, RECDB_QSTRING);
+ if(str)
+ {
+ spamserv_conf.oper_channel = AddChannel(str, now, "+tinms", NULL);
+ }
+ else
+ {
+ spamserv_conf.oper_channel = NULL;
+ }
+
spamserv_conf.global_exceptions = database_get_data(conf_node, KEY_GLOBAL_EXCEPTIONS, RECDB_STRING_LIST);
str = database_get_data(conf_node, KEY_NETWORK_RULES, RECDB_QSTRING);
modcmd_register(spamserv_module, "ADDEXCEPTION", cmd_addexception, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "DELEXCEPTION", cmd_delexception, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "STATUS", cmd_status, 1, 0, NULL);
- modcmd_register(spamserv_module, "ADDBAD", cmd_addbad, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
- modcmd_register(spamserv_module, "DELBAD", cmd_delbad, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
- modcmd_register(spamserv_module, "SETBAD", cmd_setbad, 2, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
- modcmd_register(spamserv_module, "LISTBAD", cmd_listbad, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET", cmd_set, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET SPAMLIMIT", opt_spamlimit, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET ADVREACTION", opt_advreaction, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
projects / srvx.git / blobdiff