*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version. Important limitations are
* listed in the COPYING file that accompanies this software.
*
#include "timeq.h"
#include "gline.h"
+#include <ctype.h>
+
#define SPAMSERV_CONF_NAME "services/spamserv"
#define KEY_EXCEPTIONS "exceptions"
#define KEY_ADV_CHAN_MUST_EXIST "adv_chan_must_exist"
#define KEY_STRIP_MIRC_CODES "strip_mirc_codes"
#define KEY_ALLOW_MOVE_MERGE "allow_move_merge"
+#define KEY_CAPSMIN "capsmin"
+#define KEY_CAPSPERCENT "capspercent"
#define KEY_EXCEPTLEVEL "exceptlevel"
+#define KEY_EXCEPTSPAMLEVEL "exceptspamlevel"
+#define KEY_EXCEPTFLOODLEVEL "exceptfloodlevel"
+#define KEY_EXCEPTADVLEVEL "exceptadvlevel"
+#define KEY_EXCEPTBADWORDLEVEL "exceptbadwordlevel"
+#define KEY_EXCEPTCAPSLEVEL "exceptcapslevel"
#define SPAMSERV_FUNC(NAME) MODCMD_FUNC(NAME)
#define SPAMSERV_SYNTAX() svccmd_send_help(user, spamserv, cmd)
#define spamserv_debug(format...) do { if(spamserv_conf.debug_channel) send_channel_notice(spamserv_conf.debug_channel , spamserv , ## format); } while(0)
#define ss_reply(format...) send_message(user , spamserv , ## format)
-#define SET_SUBCMDS_SIZE 14
+#define SET_SUBCMDS_SIZE 20
-const char *set_subcommands[SET_SUBCMDS_SIZE] = {"EXCEPTLEVEL", "SPAMLIMIT", "BADREACTION", "ADVREACTION", "WARNREACTION", "ADVSCAN", "SPAMSCAN", "BADWORDSCAN", "CHANFLOODSCAN", "JOINFLOODSCAN", "SCANCHANOPS", "SCANHALFOPS", "SCANVOICED"};
+const char *set_subcommands[SET_SUBCMDS_SIZE] = {"EXCEPTLEVEL", "EXCEPTADVLEVEL", "EXCEPTBADWORDLEVEL", "EXCEPTCAPSLEVEL", "EXCEPTFLOODLEVEL", "EXCEPTSPAMLEVEL", "SPAMLIMIT", "BADREACTION", "CAPSREACTION", "ADVREACTION", "WARNREACTION", "ADVSCAN", "CAPSSCAN", "SPAMSCAN", "BADWORDSCAN", "CHANFLOODSCAN", "JOINFLOODSCAN", "CAPSMIN", "CAPSPERCENT"};
extern struct string_list *autojoin_channels;
static void spamserv_clear_spamNodes(struct chanNode *channel);
{ "SSMSG_MUST_BE_HELPING", "You must have security override (helping mode) on to use this command." },
- { "SSMSG_SET_EXCEPTLEVEL", "$bExceptLevel$b %d." },
+ { "SSMSG_SET_CAPSMIN", "$bCapsMin$b %d - atleast this min caps and atleast CapsPercent of the total line." },
+ { "SSMSG_SET_CAPSPERCENT", "$bCapsPercent$b %d - atleast CapsPercent of the total line." },
+ { "SSMSG_SET_EXCEPTLEVEL" , "$bExceptLevel$b %d - level and above will be excepted from all checks." },
+ { "SSMSG_SET_EXCEPTADVLEVEL", "$bExceptAdvLevel$b %d - and above will be excepted from advertising checks." },
+ { "SSMSG_SET_EXCEPTBADWORDLEVEL", "$bExceptBadWordLevel$b %d - and above will be excepted from badword checks." },
+ { "SSMSG_SET_EXCEPTCAPSLEVEL" , "$bExceptCapsLevel$b %d - and above will be excepted from caps checks." },
+ { "SSMSG_SET_EXCEPTFLOODLEVEL", "$bExceptFloodLevel$b %d - and above will be excepted from flood checks." },
+ { "SSMSG_SET_EXCEPTSPAMLEVEL", "$bExceptSpamLevel$b %d - and above will be excepted from spam checks." },
{ NULL, NULL }
};
#define SSMSG_FLOOD "Flooding the channel/network"
#define SSMSG_ADV "Advertising"
#define SSMSG_BAD "Badwords"
+#define SSMSG_CAPS "Caps"
#define SSMSG_JOINFLOOD "Join flooding the channel"
#define SSMSG_WARNING "%s is against the network rules"
cInfo->badwords = badwords ? string_list_copy(badwords) : alloc_string_list(1);
cInfo->flags = flags;
cInfo->exceptlevel = 300;
+ cInfo->exceptspamlevel = 100;
+ cInfo->exceptadvlevel = 100;
+ cInfo->exceptbadwordlevel = 100;
+ cInfo->exceptcapslevel = 100;
+ cInfo->exceptfloodlevel = 100;
+ cInfo->capsmin = 10;
+ cInfo->capspercent = 25;
+
+ /* XXX Rewrite the flag system */
+ if (strlen(info) < 5)
+ strcat(info, "s");
+ if (strlen(info) < 6)
+ strcat(info, "s");
+
safestrncpy(cInfo->info, info, sizeof(cInfo->info));
cInfo->suspend_expiry = 0;
dict_insert(registered_channels_dict, strdup(cInfo->channel->name), cInfo);
uInfo->warnlevel = kNode ? kNode->warnlevel : 0;
uInfo->lastadv = 0;
uInfo->lastbad = 0;
+ uInfo->lastcaps = 0;
dict_insert(connected_users_dict, strdup(user->nick), uInfo);
if(kNode)
{
+ /* free(kNode); dict_remove does this */
dict_remove(killed_users_dict, irc_ntoa(&user->ip));
- free(kNode);
}
}
}
static int
-spamserv_new_user_func(struct userNode *user)
+spamserv_new_user_func(struct userNode *user, UNUSED_ARG(void *extra))
{
if(!IsLocal(user))
spamserv_create_user(user);
}
static void
-spamserv_del_user_func(struct userNode *user, struct userNode *killer, UNUSED_ARG(const char *why))
+spamserv_del_user_func(struct userNode *user, struct userNode *killer, UNUSED_ARG(const char *why), UNUSED_ARG(void *extra))
{
struct userInfo *uInfo = get_userInfo(user->nick);
struct killNode *kNode;
}
static void
-spamserv_nick_change_func(struct userNode *user, const char *old_nick)
+spamserv_nick_change_func(struct userNode *user, const char *old_nick, UNUSED_ARG(void *extra))
{
struct userInfo *uInfo = get_userInfo(old_nick);
}
static int
-spamserv_user_join(struct modeNode *mNode)
+spamserv_user_join(struct modeNode *mNode, UNUSED_ARG(void *extra))
{
struct chanNode *channel = mNode->channel;
struct userNode *user = mNode->user;
}
static void
-spamserv_user_part(struct modeNode *mn, UNUSED_ARG(const char *reason))
+spamserv_user_part(struct modeNode *mn, UNUSED_ARG(const char *reason), UNUSED_ARG(void *extra))
{
struct userNode *user = mn->user;
struct chanNode *channel = mn->channel;
timeq_add(now + BAD_TIMEQ_FREQ, timeq_bad, NULL);
}
+static void
+timeq_caps(UNUSED_ARG(void *data))
+{
+ dict_iterator_t it;
+ struct userInfo *uInfo;
+
+ for(it = dict_first(connected_users_dict); it; it = iter_next(it))
+ {
+ uInfo = iter_data(it);
+
+ if(uInfo->lastcaps && uInfo->lastcaps - now > CAPS_EXPIRE)
+ {
+ uInfo->lastcaps = 0;
+ uInfo->flags &= ~USER_CAPS_WARNED;
+ }
+ }
+
+ timeq_add(now + CAPS_TIMEQ_FREQ, timeq_caps, NULL);
+}
+
static void
timeq_adv(UNUSED_ARG(void *data))
{
return subcmd->command->func(user, channel, argc - 1, argv + 1, subcmd);
}
+int ss_check_user_level(struct chanNode *channel, struct userNode *user, unsigned int minimum, int allow_override, int exempt_owner)
+{
+ struct userData *uData;
+ struct chanData *cData = channel->channel_info;
+ if(!minimum)
+ return 1;
+ uData = _GetChannelUser(cData, user->handle_info, allow_override, 0);
+ if(!uData)
+ return 0;
+ if(minimum <= uData->access)
+ return 1;
+ if((minimum > UL_OWNER) && (uData->access == UL_OWNER) && exempt_owner)
+ return 1;
+ return 0;
+}
+
+
static int
-channel_level_option(enum levelOption option, struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
+channel_except_level(struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
{
struct chanData *cData = channel->channel_info;
struct chanInfo *cInfo;
if(argc > 1)
{
- if(!check_user_level(channel, user, option, 1, 1))
+ if(!ss_check_user_level(channel, user, cInfo->exceptlevel, 1, 1))
{
reply("SSMSG_CANNOT_SET");
return 0;
return 0;
}
+static int
+channel_except_adv_level(struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
+{
+ struct chanData *cData = channel->channel_info;
+ struct chanInfo *cInfo;
+ struct userData *uData;
+ unsigned short value;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ if(!ss_check_user_level(channel, user, cInfo->exceptadvlevel, 1, 1))
+ {
+ reply("SSMSG_CANNOT_SET");
+ return 0;
+ }
+ value = user_level_from_name(argv[1], UL_OWNER+1);
+ if(!value && strcmp(argv[1], "0"))
+ {
+ reply("SSMSG_INVALID_ACCESS", argv[1]);
+ return 0;
+ }
+ uData = GetChannelUser(cData, user->handle_info);
+ if(!uData || ((uData->access < UL_OWNER) && (value > uData->access)))
+ {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ cInfo->exceptadvlevel = value;
+ }
+ reply("SSMSG_SET_EXCEPTADVLEVEL", cInfo->exceptadvlevel);
+ return 0;
+}
+
+static int
+channel_except_badword_level(struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
+{
+ struct chanData *cData = channel->channel_info;
+ struct chanInfo *cInfo;
+ struct userData *uData;
+ unsigned short value;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ if(!ss_check_user_level(channel, user, cInfo->exceptbadwordlevel, 1, 1))
+ {
+ reply("SSMSG_CANNOT_SET");
+ return 0;
+ }
+ value = user_level_from_name(argv[1], UL_OWNER+1);
+ if(!value && strcmp(argv[1], "0"))
+ {
+ reply("SSMSG_INVALID_ACCESS", argv[1]);
+ return 0;
+ }
+ uData = GetChannelUser(cData, user->handle_info);
+ if(!uData || ((uData->access < UL_OWNER) && (value > uData->access)))
+ {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ cInfo->exceptbadwordlevel = value;
+ }
+ reply("SSMSG_SET_EXCEPTBADWORDLEVEL", cInfo->exceptbadwordlevel);
+ return 0;
+}
+
+static int
+channel_except_caps_level(struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
+{
+ struct chanData *cData = channel->channel_info;
+ struct chanInfo *cInfo;
+ struct userData *uData;
+ unsigned short value;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ if(!ss_check_user_level(channel, user, cInfo->exceptcapslevel, 1, 1))
+ {
+ reply("SSMSG_CANNOT_SET");
+ return 0;
+ }
+ value = user_level_from_name(argv[1], UL_OWNER+1);
+ if(!value && strcmp(argv[1], "0"))
+ {
+ reply("SSMSG_INVALID_ACCESS", argv[1]);
+ return 0;
+ }
+ uData = GetChannelUser(cData, user->handle_info);
+ if(!uData || ((uData->access < UL_OWNER) && (value > uData->access)))
+ {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ cInfo->exceptcapslevel = value;
+ }
+ reply("SSMSG_SET_EXCEPTCAPSLEVEL", cInfo->exceptcapslevel);
+ return 0;
+}
+
+static int
+channel_except_flood_level(struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
+{
+ struct chanData *cData = channel->channel_info;
+ struct chanInfo *cInfo;
+ struct userData *uData;
+ unsigned short value;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ if(!ss_check_user_level(channel, user, cInfo->exceptfloodlevel, 1, 1))
+ {
+ reply("SSMSG_CANNOT_SET");
+ return 0;
+ }
+ value = user_level_from_name(argv[1], UL_OWNER+1);
+ if(!value && strcmp(argv[1], "0"))
+ {
+ reply("SSMSG_INVALID_ACCESS", argv[1]);
+ return 0;
+ }
+ uData = GetChannelUser(cData, user->handle_info);
+ if(!uData || ((uData->access < UL_OWNER) && (value > uData->access)))
+ {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ cInfo->exceptfloodlevel = value;
+ }
+ reply("SSMSG_SET_EXCEPTFLOODLEVEL", cInfo->exceptfloodlevel);
+ return 0;
+}
+
+static int
+channel_except_spam_level(struct userNode *user, struct chanNode *channel, int argc, char *argv[], struct svccmd *cmd)
+{
+ struct chanData *cData = channel->channel_info;
+ struct chanInfo *cInfo;
+ struct userData *uData;
+ unsigned short value;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ if(!ss_check_user_level(channel, user, cInfo->exceptspamlevel, 1, 1))
+ {
+ reply("SSMSG_CANNOT_SET");
+ return 0;
+ }
+ value = user_level_from_name(argv[1], UL_OWNER+1);
+ if(!value && strcmp(argv[1], "0"))
+ {
+ reply("SSMSG_INVALID_ACCESS", argv[1]);
+ return 0;
+ }
+ uData = GetChannelUser(cData, user->handle_info);
+ if(!uData || ((uData->access < UL_OWNER) && (value > uData->access)))
+ {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ cInfo->exceptspamlevel = value;
+ }
+ reply("SSMSG_SET_EXCEPTSPAMLEVEL", cInfo->exceptspamlevel);
+ return 0;
+}
+
+static
+SPAMSERV_FUNC(opt_capsmin)
+{
+ struct chanInfo *cInfo;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ char *mask = strdup(argv[1]);
+ unsigned int old = cInfo->capsmin;
+
+ if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+ cInfo->capsmin = mask ? strtoul(mask, NULL, 0) : 10;
+
+ if (cInfo->capsmin < 0) {
+ cInfo->capsmin = old;
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ } else {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ }
+ reply("SSMSG_SET_CAPSMIN", cInfo->capsmin);
+ return 0;
+}
+
+static
+SPAMSERV_FUNC(opt_capspercent)
+{
+ struct chanInfo *cInfo;
+
+ cInfo = get_chanInfo(channel->name);
+
+ if(argc > 1)
+ {
+ char *mask = strdup(argv[1]);
+ unsigned int old = cInfo->capspercent;
+
+ if (isdigit(*mask) && strspn(mask, "1234567890,-") == strlen(mask)) {
+ cInfo->capspercent = mask ? strtoul(mask, NULL, 0) : 10;
+
+ if ((cInfo->capspercent < 0) || (cInfo->capspercent > 100)) {
+ cInfo->capspercent = old;
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ } else {
+ reply("SSMSG_BAD_SETLEVEL");
+ return 0;
+ }
+ }
+ reply("SSMSG_SET_CAPSPERCENT", cInfo->capspercent);
+ return 0;
+}
+
static
SPAMSERV_FUNC(opt_exceptlevel)
{
- return channel_level_option(ci_SpamLimit, SSFUNC_ARGS);
+ return channel_except_level(SSFUNC_ARGS);
+}
+
+static
+SPAMSERV_FUNC(opt_exceptadvlevel)
+{
+ return channel_except_adv_level(SSFUNC_ARGS);
+}
+
+static
+SPAMSERV_FUNC(opt_exceptbadwordlevel)
+{
+ return channel_except_badword_level(SSFUNC_ARGS);
+}
+
+static
+SPAMSERV_FUNC(opt_exceptcapslevel)
+{
+ return channel_except_caps_level(SSFUNC_ARGS);
+}
+
+static
+SPAMSERV_FUNC(opt_exceptfloodlevel)
+{
+ return channel_except_flood_level(SSFUNC_ARGS);
+}
+
+static
+SPAMSERV_FUNC(opt_exceptspamlevel)
+{
+ return channel_except_spam_level(SSFUNC_ARGS);
}
static
MULTIPLE_OPTION("BadReaction ", "BadReaction", ci_BadReaction);
}
+static
+SPAMSERV_FUNC(opt_capsreaction)
+{
+ struct valueData values[] =
+ {
+ {"Kick on disallowed caps.", 'k', 0},
+ {"Kickban on disallowed caps.", 'b', 0},
+ {"Short timed ban on disallowed caps.", 's', 0},
+ {"Long timed ban on disallowed caps.", 'l', 0},
+ {"Kill on disallowed caps.", 'd', 1}
+ };
+
+ MULTIPLE_OPTION("CapsReaction ", "CapsReaction", ci_CapsReaction);
+}
+
static
SPAMSERV_FUNC(opt_advscan)
{
BINARY_OPTION("AdvScan ", CHAN_ADV_SCAN);
}
+static
+SPAMSERV_FUNC(opt_capsscan)
+{
+ BINARY_OPTION("CapsScan ", CHAN_CAPSSCAN);
+}
+
static
SPAMSERV_FUNC(opt_spamscan)
{
BINARY_OPTION("JoinFloodScan ", CHAN_JOINFLOOD);
}
-static
-SPAMSERV_FUNC(opt_scanops)
-{
- BINARY_OPTION("ScanChanOps ", CHAN_SCAN_CHANOPS);
-}
-
-static
-SPAMSERV_FUNC(opt_scanhalfops)
-{
- BINARY_OPTION("ScanHalfOps ", CHAN_SCAN_HALFOPS);
-}
-
-static
-SPAMSERV_FUNC(opt_scanvoiced)
-{
- BINARY_OPTION("ScanVoiced ", CHAN_SCAN_VOICED);
-}
-
static void
spamserv_add_trusted_account(const char *account, struct string_list *channel, const char *issuer, time_t issued)
{
struct handle_info *hi;
if (!(channel = GetChannel(argv[2]))) {
- ss_reply("SSMSG_NOT_REGISTERED", channel->name);
+ ss_reply("SSMSG_NOT_REGISTERED", argv[2]);
return 0;
}
struct handle_info *hi;
if (!(channel = GetChannel(argv[2]))) {
- ss_reply("SSMSG_NOT_REGISTERED", channel->name);
+ ss_reply("SSMSG_NOT_REGISTERED", argv[2]);
return 0;
}
return 0;
}
+static int
+check_caps(struct chanInfo *cInfo, char *message)
+{
+ int c;
+
+ if ( (c = strlen(message)) >= cInfo->capsmin) {
+ int i = 0;
+ char *s = strdup(message);
+
+ do {
+ if (isupper(*s))
+ i++;
+ } while (*s++);
+
+ if (i >= cInfo->capsmin && i * 100 / c >= cInfo->capspercent)
+ return 1;
+ }
+
+ return 0;
+}
+
static int
check_badwords(struct chanInfo *cInfo, char *message)
{
}
- if(!CHECK_CHANOPS(cInfo))
- {
- struct modeNode *mn = GetUserMode(channel, user);
- if (mn && (mn->modes & MODE_CHANOP))
- return;
- }
+ if(uData && (uData->access >= cInfo->exceptlevel))
+ return;
- if(!CHECK_HALFOPS(cInfo))
- {
- struct modeNode *mn = GetUserMode(channel, user);
- if (mn && (mn->modes & MODE_HALFOP))
- return;
- }
-
- if(!CHECK_VOICED(cInfo))
+ if(CHECK_CAPSSCAN(cInfo) && check_caps(cInfo, text))
{
- struct modeNode *mn = GetUserMode(channel, user);
- if (mn && ((mn->modes & MODE_VOICE) && !(mn->modes & MODE_CHANOP) && !(mn->modes & MODE_HALFOP)))
- return;
- }
+ if(uData && (uData->access >= cInfo->exceptcapslevel))
+ return;
- if(uData && (uData->access >= cInfo->exceptlevel))
- return;
+ if(CHECK_CAPS_WARNED(uInfo))
+ {
+ switch(cInfo->info[ci_CapsReaction])
+ {
+ case 'k': uInfo->flags |= USER_KICK; break;
+ case 'b': uInfo->flags |= USER_KICKBAN; break;
+ case 's': uInfo->flags |= USER_SHORT_TBAN; break;
+ case 'l': uInfo->flags |= USER_LONG_TBAN; break;
+ case 'd': uInfo->flags |= CHECK_KILLED(uInfo) ? USER_GLINE : USER_KILL; break;
+ }
+
+ uInfo->warnlevel += CAPS_WARNLEVEL;
+ violation = 5;
+ }
+ else
+ {
+ uInfo->flags |= USER_CAPS_WARNED;
+ uInfo->lastcaps = now;
+ uInfo->warnlevel += CAPS_WARNLEVEL;
+
+ if(uInfo->warnlevel < MAX_WARNLEVEL) {
+ if (spamserv_conf.network_rules)
+ spamserv_notice(user, "SSMSG_WARNING_RULES_T", SSMSG_CAPS, spamserv_conf.network_rules);
+ else
+ spamserv_notice(user, "SSMSG_WARNING_T", SSMSG_CAPS, spamserv_conf.network_rules);
+ }
+ }
+
+ }
to_lower(text);
if(CHECK_SPAM(cInfo))
{
+ if(uData && (uData->access >= cInfo->exceptspamlevel))
+ return;
+
if(!(sNode = uInfo->spam))
{
spamserv_create_spamNode(channel, uInfo, text);
if(CHECK_FLOOD(cInfo))
{
+ if(uData && (uData->access >= cInfo->exceptfloodlevel))
+ return;
+
if(!(fNode = uInfo->flood))
{
spamserv_create_floodNode(channel, user, &uInfo->flood);
if(CHECK_BADWORDSCAN(cInfo) && check_badwords(cInfo, text))
{
+ if(uData && (uData->access >= cInfo->exceptbadwordlevel))
+ return;
+
if(CHECK_BAD_WARNED(uInfo))
{
switch(cInfo->info[ci_BadReaction])
if(CHECK_ADV(cInfo) && check_advertising(cInfo, text))
{
+ if(uData && (uData->access >= cInfo->exceptspamlevel))
+ return;
+
if(CHECK_ADV_WARNED(uInfo))
{
switch(cInfo->info[ci_AdvReaction])
else
uInfo->flags |= USER_KILL;
- violation = 5;
+ violation = 6;
}
if(!violation)
case 2: snprintf(reason, sizeof(reason), spamserv_conf.network_rules ? SSMSG_WARNING_RULES : SSMSG_WARNING, SSMSG_FLOOD, spamserv_conf.network_rules); break;
case 3: snprintf(reason, sizeof(reason), spamserv_conf.network_rules ? SSMSG_WARNING_RULES : SSMSG_WARNING, SSMSG_ADV, spamserv_conf.network_rules); break;
case 4: snprintf(reason, sizeof(reason), spamserv_conf.network_rules ? SSMSG_WARNING_RULES : SSMSG_WARNING, SSMSG_BAD, spamserv_conf.network_rules); break;
+ case 5: snprintf(reason, sizeof(reason), spamserv_conf.network_rules ? SSMSG_WARNING_RULES : SSMSG_WARNING, SSMSG_CAPS, spamserv_conf.network_rules); break;
default: snprintf(reason, sizeof(reason), spamserv_conf.network_rules ? SSMSG_WARNING_RULES_2 : SSMSG_WARNING_2, spamserv_conf.network_rules); break;
}
struct chanNode *channel;
struct chanInfo *cInfo;
struct string_list *strlist, *strlist2;
- unsigned int flags, exceptlevel;
+ unsigned int flags;
+ unsigned int exceptlevel, exceptadvlevel, exceptbadwordlevel;
+ unsigned int exceptfloodlevel, exceptspamlevel, exceptcapslevel;
+ unsigned int capsmin, capspercent;
char *str, *info;
time_t expiry;
dict_t object;
str = database_get_data(hir->d.object, KEY_EXPIRY, RECDB_QSTRING);
expiry = str ? strtoul(str, NULL, 0) : 0;
+ str = database_get_data(hir->d.object, KEY_CAPSMIN, RECDB_QSTRING);
+ capsmin = str ? strtoul(str, NULL, 0) : 10;
+
+ str = database_get_data(hir->d.object, KEY_CAPSPERCENT, RECDB_QSTRING);
+ capspercent = str ? strtoul(str, NULL, 0) : 25;
+
str = database_get_data(hir->d.object, KEY_EXCEPTLEVEL, RECDB_QSTRING);
exceptlevel = str ? strtoul(str, NULL, 0) : UL_MANAGER;
+ str = database_get_data(hir->d.object, KEY_EXCEPTADVLEVEL, RECDB_QSTRING);
+ exceptadvlevel = str ? strtoul(str, NULL, 0) : UL_OP;
+
+ str = database_get_data(hir->d.object, KEY_EXCEPTBADWORDLEVEL, RECDB_QSTRING);
+ exceptbadwordlevel = str ? strtoul(str, NULL, 0) : UL_OP;
+
+ str = database_get_data(hir->d.object, KEY_EXCEPTCAPSLEVEL, RECDB_QSTRING);
+ exceptcapslevel = str ? strtoul(str, NULL, 0) : UL_OP;
+
+ str = database_get_data(hir->d.object, KEY_EXCEPTFLOODLEVEL, RECDB_QSTRING);
+ exceptfloodlevel = str ? strtoul(str, NULL, 0) : UL_OP;
+
+ str = database_get_data(hir->d.object, KEY_EXCEPTSPAMLEVEL, RECDB_QSTRING);
+ exceptspamlevel = str ? strtoul(str, NULL, 0) : UL_OP;
+
if(channel && info)
{
if((cInfo = spamserv_register_channel(channel, strlist, strlist2, flags, info)))
else
cInfo->suspend_expiry = expiry;
- cInfo->exceptlevel = exceptlevel;
+ cInfo->capsmin = capsmin;
+ cInfo->capspercent = capspercent;
+ cInfo->exceptlevel = exceptlevel;
+ cInfo->exceptadvlevel = exceptadvlevel;
+ cInfo->exceptbadwordlevel = exceptbadwordlevel;
+ cInfo->exceptcapslevel = exceptcapslevel;
+ cInfo->exceptfloodlevel = exceptfloodlevel;
+ cInfo->exceptspamlevel = exceptspamlevel;
}
}
else
if(cInfo->flags)
saxdb_write_int(ctx, KEY_FLAGS, cInfo->flags);
+ if(cInfo->capsmin)
+ saxdb_write_int(ctx, KEY_CAPSMIN, cInfo->capsmin);
+
+ if(cInfo->capspercent)
+ saxdb_write_int(ctx, KEY_CAPSPERCENT, cInfo->capspercent);
+
if(cInfo->exceptlevel)
saxdb_write_int(ctx, KEY_EXCEPTLEVEL, cInfo->exceptlevel);
+ if(cInfo->exceptadvlevel)
+ saxdb_write_int(ctx, KEY_EXCEPTADVLEVEL, cInfo->exceptadvlevel);
+
+ if(cInfo->exceptbadwordlevel)
+ saxdb_write_int(ctx, KEY_EXCEPTBADWORDLEVEL, cInfo->exceptbadwordlevel);
+
+ if(cInfo->exceptcapslevel)
+ saxdb_write_int(ctx, KEY_EXCEPTCAPSLEVEL, cInfo->exceptcapslevel);
+
+ if(cInfo->exceptfloodlevel)
+ saxdb_write_int(ctx, KEY_EXCEPTFLOODLEVEL, cInfo->exceptfloodlevel);
+
+ if(cInfo->exceptspamlevel)
+ saxdb_write_int(ctx, KEY_EXCEPTSPAMLEVEL, cInfo->exceptspamlevel);
+
saxdb_write_string(ctx, KEY_INFO, cInfo->info);
if(cInfo->suspend_expiry)
}
static void
-spamserv_db_cleanup(void)
+spamserv_db_cleanup(UNUSED_ARG(void* extra))
{
dict_iterator_t it;
return;
const char *modes = conf_get_data("services/spamserv/modes", RECDB_QSTRING);
- spamserv = AddService(nick, modes ? modes : NULL, "Anti Spam Services", NULL);
+ spamserv = AddLocalUser(nick, nick, NULL, "Anti Spam Services", modes);
spamserv_service = service_register(spamserv);
conf_register_reload(spamserv_conf_read);
saxdb_register("SpamServ", spamserv_saxdb_read, spamserv_saxdb_write);
- reg_new_user_func(spamserv_new_user_func);
- reg_del_user_func(spamserv_del_user_func);
- reg_nick_change_func(spamserv_nick_change_func);
- reg_join_func(spamserv_user_join);
- reg_part_func(spamserv_user_part);
+ reg_new_user_func(spamserv_new_user_func, NULL);
+ reg_del_user_func(spamserv_del_user_func, NULL);
+ reg_nick_change_func(spamserv_nick_change_func, NULL);
+ reg_join_func(spamserv_user_join, NULL);
+ reg_part_func(spamserv_user_part, NULL);
timeq_add(now + FLOOD_TIMEQ_FREQ, timeq_flood, NULL);
timeq_add(now + JOINFLOOD_TIMEQ_FREQ, timeq_joinflood, NULL);
timeq_add(now + ADV_TIMEQ_FREQ, timeq_adv, NULL);
timeq_add(now + BAD_TIMEQ_FREQ, timeq_bad, NULL);
+ timeq_add(now + CAPS_TIMEQ_FREQ, timeq_caps, NULL);
timeq_add(now + WARNLEVEL_TIMEQ_FREQ, timeq_warnlevel, NULL);
timeq_add(now + KILL_TIMEQ_FREQ, timeq_kill, NULL);
modcmd_register(spamserv_module, "STATUS", cmd_status, 1, 0, NULL);
modcmd_register(spamserv_module, "SET", cmd_set, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET EXCEPTLEVEL", opt_exceptlevel, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET EXCEPTADVLEVEL", opt_exceptadvlevel, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET EXCEPTBADWORDLEVEL", opt_exceptbadwordlevel, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET EXCEPTCAPSLEVEL", opt_exceptcapslevel, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET EXCEPTFLOODLEVEL", opt_exceptfloodlevel, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET EXCEPTSPAMLEVEL", opt_exceptspamlevel, 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 BADREACTION", opt_badreaction, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET CAPSREACTION", opt_capsreaction, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET ADVREACTION", opt_advreaction, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET WARNREACTION", opt_warnreaction, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET ADVSCAN", opt_advscan, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET CAPSSCAN", opt_capsscan, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET BADWORDSCAN", opt_badwordscan, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET SPAMSCAN", opt_spamscan, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET CHANFLOODSCAN", opt_chanfloodscan, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
modcmd_register(spamserv_module, "SET JOINFLOODSCAN", opt_joinflood, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
- modcmd_register(spamserv_module, "SET SCANCHANOPS", opt_scanops, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
- modcmd_register(spamserv_module, "SET SCANHALFOPS", opt_scanhalfops, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
- modcmd_register(spamserv_module, "SET SCANVOICED", opt_scanvoiced, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET CAPSMIN", opt_capsmin, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
+ modcmd_register(spamserv_module, "SET CAPSPERCENT", opt_capspercent, 1, MODCMD_REQUIRE_AUTHED|MODCMD_REQUIRE_CHANNEL, NULL);
spamserv_service->trigger = spamserv_conf.trigger;
}
}
- reg_exit_func(spamserv_db_cleanup);
+ reg_exit_func(spamserv_db_cleanup, NULL);
message_register_table(msgtab);
crc32_init();
}
projects / irc / evilnet / x3.git / blobdiff