X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmod-watchdog.c;h=ba8bc5988f2ae9584550dc74ee7a8c0c33f90040;hb=a323681dfb6ca5976f4e1d0648939166aa1e81fa;hp=690ed0d2069d11cdb9531b44f141d7a6caf57ffb;hpb=3ef353beaf44f0b925f7868141f58cc7b02c85a7;p=srvx.git diff --git a/src/mod-watchdog.c b/src/mod-watchdog.c index 690ed0d..ba8bc59 100644 --- a/src/mod-watchdog.c +++ b/src/mod-watchdog.c @@ -43,6 +43,7 @@ #define KEY_BADWORD_MASK "mask" #define KEY_BADWORD_TRIGGERED "count" #define KEY_BADWORD_ACTION "action" +#define KEY_BADWOR_ALERT "alert" #define KEY_CHANNELS "channel" #define KEY_BADWORDID "badwordid" @@ -59,6 +60,7 @@ static const struct message_entry msgtab[] = { { "WDMSG_BADWORD_SET", "Settings for BadWord entry $b%s$b" }, { "WDMSG_BADWORD_SET_MASK", "$bMASK$b: %s" }, { "WDMSG_BADWORD_SET_ACTION", "$bACTION$b: %s" }, + { "WDMSG_BADWORD_ALERT", "%s used badword '%s' in channel: %s" }, { NULL, NULL } }; @@ -67,6 +69,7 @@ struct badword { char *badword_mask; unsigned int triggered : 29; unsigned int action : 3; + unsigned int alert; }; struct watchdog_channel { @@ -175,6 +178,15 @@ static MODCMD_FUNC(cmd_setbad) } else { reply("WDMSG_BADWORD_SET_INVALID", setting); } + } + else if(!strcmp("ALERT",setting)) { + if (!strcmp("0",value)) { + badword->alert = 0; + } else if (!strcmp("1",value)) { + badword->alert = 1; + } else { + reply("WDMSG_BADWORD_SET_INVALID", setting); + } } else { reply("WDMSG_BADWORD_SETTING_INVALID", setting); } @@ -226,7 +238,7 @@ static MODCMD_FUNC(cmd_listbad) count++; } tbl.length = count+1; - tbl.width = 4; + tbl.width = 5; tbl.flags = 0; tbl.flags = TABLE_NO_FREE; tbl.contents = malloc(tbl.length * sizeof(tbl.contents[0])); @@ -235,6 +247,7 @@ static MODCMD_FUNC(cmd_listbad) tbl.contents[0][1] = "Badword"; tbl.contents[0][2] = "Action"; tbl.contents[0][3] = "(Triggered)"; + tbl.contents[0][4] = "Alert"; if(!count) { table_send(cmd->parent->bot, user->nick, 0, NULL, tbl); @@ -271,6 +284,7 @@ static MODCMD_FUNC(cmd_listbad) tbl.contents[ii][2] = "*undef*"; } tbl.contents[ii][3] = strtab(bw->triggered); + tbl.contents[ii][4] = strtab(bw->alert); } table_send(cmd->parent->bot, user->nick, 0, NULL, tbl); for(ii = 1; ii < tbl.length; ++ii) @@ -285,20 +299,42 @@ static MODCMD_FUNC(cmd_listbad) static MODCMD_FUNC(cmd_register) { dict_iterator_t it; + struct modeNode *mn; - if((argc < 2) || !IsChannelName(argv[1])) + if(channel) { - reply("MSG_NOT_CHANNEL_NAME"); - return 0; - } - if(opserv_bad_channel(argv[1])) - { - reply("CSMSG_ILLEGAL_CHANNEL", argv[1]); - return 0; + if(channel->bad_channel) + { + reply("CSMSG_ILLEGAL_CHANNEL", channel->name); + return 0; + } + + if(!IsHelping(user) + && (!(mn = GetUserMode(channel, user)) || !(mn->modes & MODE_CHANOP))) + { + reply("CSMSG_MUST_BE_OPPED", channel->name); + return 0; + } + } + else + { - channel = AddChannel(argv[1], now, NULL, NULL); + if((argc < 2) || !IsChannelName(argv[1])) + { + reply("MSG_NOT_CHANNEL_NAME"); + return 0; + } + + if(opserv_bad_channel(argv[1])) + { + reply("CSMSG_ILLEGAL_CHANNEL", argv[1]); + return 0; + } + + channel = AddChannel(argv[1], now, NULL, NULL); + } for (it = dict_first(chanlist); it; it = iter_next(it)) { struct watchdog_channel *chan = iter_data(it); @@ -326,7 +362,9 @@ static MODCMD_FUNC(cmd_unregister) if(chan && chan->channel == channel) { //found, unregister it! - DelChannelUser(watchdog, channel, "unregistered.", 0); + char reason[MAXLEN]; + sprintf(reason, "Unregistered by %s.", user->handle_info->handle); + DelChannelUser(watchdog, channel, reason, 0); dict_remove(chanlist, channel->name); reply("CSMSG_UNREG_SUCCESS", channel->name); return 1; @@ -343,37 +381,42 @@ watchdog_detected_badword(struct userNode *user, struct chanNode *chan, struct b char *hostmask; char *reason = watchdog_conf.punishment_reason; 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, watchdog->nick, now, now, now + watchdog_conf.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(watchdog, chan, &change); - free(hostmask); - - case BADACTION_KICK: - if(GetUserMode(chan, user)) - KickChannelUser(user, chan, watchdog, reason); - break; - case BADACTION_KILL: - DelUser(user, watchdog, 1, reason); - break; - case BADACTION_GLINE: - irc_ntop(mask + 2, sizeof(mask) - 2, &user->ip); - gline_add(watchdog->nick, mask, watchdog_conf.gline_duration, reason, now, now, 0, 1); - break; - default: - //error? - break; - } + if(!IsOper(user)) { + if(badword->alert == 1) { + log_module(MS_LOG, LOG_WARNING, "WDMSG_BADWORD_ALERT", user->nick, badword->badword_mask, channel->name); + } + 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, watchdog->nick, now, now, now + watchdog_conf.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(watchdog, chan, &change); + free(hostmask); + + case BADACTION_KICK: + if(GetUserMode(chan, user)) + KickChannelUser(user, chan, watchdog, reason); + break; + case BADACTION_KILL: + DelUser(user, watchdog, 1, reason); + break; + case BADACTION_GLINE: + irc_ntop(mask + 2, sizeof(mask) - 2, &user->ip); + gline_add(watchdog->nick, mask, watchdog_conf.gline_duration, reason, now, now, 0, 1); + break; + default: + //error? + break; + } + } } static void @@ -393,7 +436,7 @@ watchdog_channel_message(struct userNode *user, struct chanNode *chan, const cha } static struct badword* -add_badword(const char *badword_mask, unsigned int triggered, unsigned int action, const char *id) +add_badword(const char *badword_mask, unsigned int triggered, unsigned int action, unsigned int alert, const char *id) { struct badword *badword; @@ -409,6 +452,7 @@ add_badword(const char *badword_mask, unsigned int triggered, unsigned int actio badword->badword_mask = strdup(badword_mask); badword->triggered = triggered; badword->action = action; + badword->alert = alert; dict_insert(shitlist, badword->id, badword); return badword; } @@ -499,8 +543,9 @@ watchdog_saxdb_read_shitlist(const char *name, void *data, UNUSED_ARG(void *extr badword = database_get_data(obj, KEY_BADWORD_MASK, RECDB_QSTRING); triggered = database_get_data(obj, KEY_BADWORD_TRIGGERED, RECDB_QSTRING); action = database_get_data(obj, KEY_BADWORD_ACTION, RECDB_QSTRING); + alert = database_get_data(obj, KEY_BADWOR_ALERT, RECDB_QSTRING); - add_badword(badword, strtoul(triggered, NULL, 0), strtoul(action, NULL, 0), name); + add_badword(badword, strtoul(triggered, NULL, 0), strtoul(action, NULL, 0), strtoul(alert, NULL, 0), name); } return 0; } @@ -553,6 +598,7 @@ watchdog_saxdb_write(struct saxdb_context *ctx) saxdb_write_string(ctx, KEY_BADWORD_MASK, badword->badword_mask); saxdb_write_int(ctx, KEY_BADWORD_TRIGGERED, badword->triggered); saxdb_write_int(ctx, KEY_BADWORD_ACTION, badword->action); + saxdb_write_int(ctx, KEY_BADWOR_ALERT, badword->alert); saxdb_end_record(ctx); } @@ -615,7 +661,7 @@ watchdog_init(void) modcmd_register(watchdog_module, "delbad", cmd_delbad, 2, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL); modcmd_register(watchdog_module, "setbad", cmd_setbad, 2, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL); modcmd_register(watchdog_module, "listbad", cmd_listbad, 1, MODCMD_REQUIRE_AUTHED, "flags", "+oper", NULL); - modcmd_register(watchdog_module, "register", cmd_register, 2, MODCMD_REQUIRE_AUTHED, "flags", "+helping", NULL); + modcmd_register(watchdog_module, "register", cmd_register, 1, MODCMD_REQUIRE_AUTHED, "flags", "+acceptchan,+helping", NULL); modcmd_register(watchdog_module, "unregister", cmd_unregister, 1, MODCMD_REQUIRE_AUTHED | MODCMD_REQUIRE_CHANNEL, "flags", "+helping", NULL); message_register_table(msgtab);