X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fmodcmd.c;h=4f861741ab0b3674c8622414cc99539c5fd9f190;hb=880457f83c5c05dbb54f31d294257f085abd6c58;hp=24776ff390e8b66e0d378fb8bae915dc766a0bf3;hpb=04565ba33cb54378a4b91a31de0ee162a1f80482;p=srvx.git diff --git a/src/modcmd.c b/src/modcmd.c index 24776ff..4f86174 100644 --- a/src/modcmd.c +++ b/src/modcmd.c @@ -1,11 +1,12 @@ /* modcmd.c - Generalized module command support - * Copyright 2002-2004 srvx Development Team + * Copyright 2002-2007 srvx Development Team * - * This program is free software; you can redistribute it and/or modify + * This file is part of srvx. + * + * srvx 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 - * (at your option) any later version. Important limitations are - * listed in the COPYING file that accompanies this software. + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,10 +14,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, email srvx-maintainers@srvx.net. + * along with srvx; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include "arch-version.h" #include "chanserv.h" #include "conf.h" #include "modcmd.h" @@ -33,11 +34,12 @@ static struct dict *services; static struct pending_template *pending_templates; static struct module *modcmd_module; static struct modcmd *bind_command, *help_command, *version_command; +unsigned short offchannel_allowed[256] = { 0 }; static const struct message_entry msgtab[] = { - { "MCMSG_VERSION", "$b"PACKAGE_STRING"$b ("CODENAME"), Built: " __DATE__ ", " __TIME__"." }, - { "MCMSG_BARE_FLAG", "Flag %.*s must be preceeded by a + or -." }, + { "MCMSG_BARE_FLAG", "Flag %.*s must be preceded by a + or -." }, { "MCMSG_UNKNOWN_FLAG", "Unknown module flag %.*s." }, { "MCMSG_BAD_OPSERV_LEVEL", "Invalid $O access level %s." }, + { "MCMSG_BAD_STAFF_LEVEL", "Invalid staff level %s." }, { "MCMSG_BAD_CHANSERV_LEVEL", "Invalid $C access level %s." }, { "MCMSG_LEVEL_TOO_LOW", "You cannot set the access requirements for %s (your level is too low.)" }, { "MCMSG_LEVEL_TOO_HIGH", "You cannot set the access requirements to %s (that is too high)." }, @@ -73,9 +75,10 @@ static const struct message_entry msgtab[] = { { "MCMSG_HELPFILE_UNBOUND", "Since that was the last command from module %s on the service, the helpfile for %s was removed." }, { "MCMSG_NO_HELPFILE", "Module %s does not have a help file." }, { "MCMSG_HELPFILE_ERROR", "Syntax error reading %s; help contents not changed." }, - { "MCMSG_HELPFILE_READ", "Read %s help database in "FMT_TIME_T".%03lu seconds." }, - { "MCMSG_COMMAND_TIME", "Command $b%s$b finished in "FMT_TIME_T".%06lu seconds." }, + { "MCMSG_HELPFILE_READ", "Read %s help database in %lu.%03lu seconds." }, + { "MCMSG_COMMAND_TIME", "Command $b%s$b finished in %lu.%06lu seconds." }, { "MCMSG_NEED_OPSERV_LEVEL", "You must have $O access of at least $b%u$b." }, + { "MCMSG_NEED_STAFF_LEVEL", "You must have staff access of at least $b%u$b." }, { "MCMSG_NEED_CHANSERV_LEVEL", "You must have $C access of at least $b%u$b in the channel." }, { "MCMSG_NEED_ACCOUNT_FLAGS", "You must have account flags $b%s$b." }, { "MCMSG_NEED_NOTHING", "Anyone may use the $b%s$b command." }, @@ -115,9 +118,18 @@ static const struct message_entry msgtab[] = { { "MCMSG_CURRENT_TRIGGER", "Trigger for $b%s$b is $b%c$b." }, { "MCMSG_NEW_TRIGGER", "Changed trigger for $b%s$b to $b%c$b." }, { "MCMSG_SERVICE_PRIVILEGED", "Service $b%s$b privileged: $b%s$b." }, + { "MCMSG_OFFCHANNEL_IS_ON", "Off-channel use for $b%s$b (trigger $b%c$b) is enabled" }, + { "MCMSG_OFFCHANNEL_IS_OFF", "Off-channel use for $b%s$b (trigger $b%c$b) is disabled" }, + { "MCMSG_OFFCHANNEL_ON", "Enabled off-channel use for $b%s$b (trigger $b%c$b)" }, + { "MCMSG_OFFCHANNEL_OFF", "Disabled off-channel use for $b%s$b (trigger $b%c$b)" }, { "MCMSG_SERVICE_REMOVED", "Service $b%s$b has been deleted." }, { "MCMSG_FILE_NOT_OPENED", "Unable to open file $b%s$b for writing." }, { "MCMSG_MESSAGES_DUMPED", "Messages written to $b%s$b." }, + { "MCMSG_MESSAGE_DUMP_FAILED", "Message dump failed: %s." }, + { "MCMSG_COMMAND_FLAGS", "Command flags are %s (inferred: %s)." }, + { "MCMSG_COMMAND_ACCOUNT_FLAGS", "Requires account flags +%s, prohibits account flags +%s." }, + { "MCMSG_COMMAND_ACCESS_LEVEL", "Requires channel access %d and $O access %d and staff access %d." }, + { "MCMSG_COMMAND_USES", "%s has been used %d times." }, { NULL, NULL } }; struct userData *_GetChannelUser(struct chanData *channel, struct handle_info *handle, int override, int allow_suspended); @@ -132,25 +144,25 @@ struct userData *_GetChannelUser(struct chanData *channel, struct handle_info *h static struct modcmd_flag { const char *name; unsigned int flag; -} flags[] = { +} modcmd_flags[] = { { "acceptchan", MODCMD_ACCEPT_CHANNEL }, { "acceptpluschan", MODCMD_ACCEPT_PCHANNEL }, { "authed", MODCMD_REQUIRE_AUTHED }, { "channel", MODCMD_REQUIRE_CHANNEL }, { "chanuser", MODCMD_REQUIRE_CHANUSER }, { "disabled", MODCMD_DISABLED }, + { "helping", MODCMD_REQUIRE_HELPING }, { "ignore_csuspend", MODCMD_IGNORE_CSUSPEND }, { "joinable", MODCMD_REQUIRE_JOINABLE }, { "keepbound", MODCMD_KEEP_BOUND }, { "loghostmask", MODCMD_LOG_HOSTMASK }, - { "nolog", MODCMD_NO_LOG }, { "networkhelper", MODCMD_REQUIRE_NETWORK_HELPER }, { "never_csuspend", MODCMD_NEVER_CSUSPEND }, + { "nolog", MODCMD_NO_LOG }, { "oper", MODCMD_REQUIRE_OPER }, { "qualified", MODCMD_REQUIRE_QUALIFIED }, { "regchan", MODCMD_REQUIRE_REGCHAN }, { "supporthelper", MODCMD_REQUIRE_SUPPORT_HELPER }, - { "helping", MODCMD_REQUIRE_HELPING }, { "toy", MODCMD_TOY }, { NULL, 0 } }; @@ -168,8 +180,8 @@ flags_qsort(const void *a, const void *b) { return irccasecmp(fa->name, fb->name); } -DEFINE_LIST(svccmd_list, struct svccmd*); -DEFINE_LIST(module_list, struct module*); +DEFINE_LIST(svccmd_list, struct svccmd*) +DEFINE_LIST(module_list, struct module*) static void free_service_command(void *data) { @@ -292,6 +304,8 @@ svccmd_copy_rules(struct svccmd *dest, struct svccmd *src) { dest->deny_account_flags |= src->deny_account_flags; if (src->min_opserv_level > dest->min_opserv_level) dest->min_opserv_level = src->min_opserv_level; + if (src->min_staff_level > dest->min_staff_level) + dest->min_staff_level = src->min_staff_level; if (src->min_channel_access > dest->min_channel_access) dest->min_channel_access = src->min_channel_access; modcmd_set_effective_flags(dest); @@ -318,7 +332,7 @@ svccmd_configure(struct svccmd *cmd, struct userNode *user, struct userNode *bot return 0; } value++; - flag = bsearch(value, flags, ArrayLength(flags)-1, sizeof(flags[0]), flags_bsearch); + flag = bsearch(value, modcmd_flags, ArrayLength(modcmd_flags)-1, sizeof(modcmd_flags[0]), flags_bsearch); if (!flag) { if (user) send_message(user, bot, "MCMSG_UNKNOWN_FLAG", end, value); @@ -337,7 +351,7 @@ svccmd_configure(struct svccmd *cmd, struct userNode *user, struct userNode *bot return 1; } else if (!irccasecmp(param, "channel_level") || !irccasecmp(param, "channel_access") || !irccasecmp(param, "access")) { unsigned short ul; - if (!irccasecmp(value, "none")) { + if (!irccasecmp(value, "none") || !irccasecmp(value, "0")) { cmd->min_channel_access = 0; return 1; } else if ((ul = user_level_from_name(value, UL_OWNER)) > 0) { @@ -369,6 +383,18 @@ svccmd_configure(struct svccmd *cmd, struct userNode *user, struct userNode *bot } cmd->min_opserv_level = newval; return 1; + } else if (!irccasecmp(param, "staff_level") || !irccasecmp(param, "staff_access")) { + unsigned int newval = atoi(value); + if (newval > 1000) { + if (user) { + send_message(user, bot, "MCMSG_BAD_STAFF_LEVEL", value); + } else { + log_module(MAIN_LOG, LOG_ERROR, "Invalid staff level %s (for command %s).", value, cmd->name); + } + return 0; + } + cmd->min_staff_level = newval; + return 1; } else if (!irccasecmp(param, "account_flags")) { return nickserv_modify_handle_flags(user, bot, value, &cmd->req_account_flags, &cmd->deny_account_flags); } else { @@ -428,6 +454,7 @@ modcmd_register(struct module *module, const char *name, modcmd_func_t func, uns */ int svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cmd, struct chanNode *channel, int options) { + extern struct userNode *chanserv; unsigned int uData_checked = 0; struct userData *uData = NULL; int rflags = 0, flags = cmd->effective_flags; @@ -461,26 +488,31 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm return 0; } if (flags & MODCMD_REQUIRE_REGCHAN) { - if (!channel->channel_info) { + if (!chanserv) { + /* Just use the inferred MODCMD_REQUIRE_CHANNEL. */ + } else if (!channel->channel_info) { if (options & SVCCMD_NOISY) send_message(user, bot, "MCMSG_CHAN_NOT_REGISTERED", channel->name); return 0; } else if (IsSuspended(channel->channel_info) && !(flags & MODCMD_IGNORE_CSUSPEND)) { - /* allow security-override users to always ignore channel suspensions, but flag it as a staff command */ - if (!user->handle_info - || !HANDLE_FLAGGED(user->handle_info, HELPING) - || (flags & MODCMD_NEVER_CSUSPEND)) { + /* Allow security-override users to ignore most channel + * suspensions, but flag that use as a staff command. + */ + if (!IsHelping(user) || (flags & MODCMD_NEVER_CSUSPEND)) { if (options & SVCCMD_NOISY) send_message(user, bot, "MCMSG_CHAN_SUSPENDED", channel->name, channel->channel_info->suspended->reason); return 0; } + if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0; rflags |= ACTION_STAFF; } } if (flags & MODCMD_REQUIRE_CHANUSER) { if (!uData_checked) uData = _GetChannelUser(channel->channel_info, user->handle_info, 1, 0), uData_checked = 1; - if (!uData) { + if (!chanserv) { + /* Assume someone knows what they're doing. */ + } else if (!uData) { if (options & SVCCMD_NOISY) send_message(user, bot, "MCMSG_NO_CHANNEL_ACCESS", channel->name); return 0; @@ -523,6 +555,7 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm || ((flags & MODCMD_REQUIRE_NETWORK_HELPER) && IsNetworkHelper(user)) || ((flags & MODCMD_REQUIRE_SUPPORT_HELPER) && IsSupportHelper(user))) { /* allow it */ + if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0; rflags |= ACTION_STAFF; } else { if (options & SVCCMD_NOISY) @@ -536,10 +569,12 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm send_message(user, bot, "MCMSG_MUST_BE_HELPING"); return 0; } + if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0; rflags |= ACTION_STAFF; } if (cmd->min_opserv_level > 0) { if (!oper_has_access(user, bot, cmd->min_opserv_level, !(options & SVCCMD_NOISY))) return 0; + if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0; rflags |= ACTION_STAFF; } if (cmd->req_account_flags || cmd->deny_account_flags) { @@ -560,10 +595,11 @@ svccmd_can_invoke(struct userNode *user, struct userNode *bot, struct svccmd *cm /* If it's an override, return a special value. */ if ((flags & MODCMD_REQUIRE_CHANUSER) && (options & SVCCMD_NOISY) - && (uData->access > 500) + && (!uData || (uData->access > 500)) && (!(uData = _GetChannelUser(channel->channel_info, user->handle_info, 0, 0)) || uData->access < cmd->min_channel_access) && !(flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING))) { + if (cmd->min_staff_level > 0 && !staff_has_access(user, bot, cmd->min_staff_level, !(options & SVCCMD_NOISY))) return 0; rflags |= ACTION_OVERRIDE; } return rflags | ACTION_ALLOW; @@ -602,6 +638,8 @@ svccmd_expand_alias(struct svccmd *cmd, unsigned int old_argc, char *old_argv[], log_module(MAIN_LOG, LOG_ERROR, "Alias expansion parse error in %s (near %s; %s.%s arg %d).", arg, end_num, cmd->parent->bot->nick, cmd->name, ii); return 0; } + if (lbound >= old_argc) + return -1; if (ubound >= old_argc) ubound = old_argc - 1; if (lbound < old_argc) @@ -619,7 +657,7 @@ int svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNode *channel, unsigned int argc, char *argv[], unsigned int server_qualified) { extern struct userNode *chanserv; struct svccmd *cmd; - unsigned int cmd_arg, perms, flags, options; + unsigned int cmd_arg, perms, flags, options, result; char channel_name[CHANNELLEN+1]; /* First check pubcmd for the channel. */ @@ -642,7 +680,8 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo } cmd = dict_find(service->commands, argv[cmd_arg], NULL); if (!cmd) { - send_message(user, service->bot, "MSG_COMMAND_UNKNOWN", argv[cmd_arg]); + if (!channel) + send_message(user, service->bot, "MSG_COMMAND_UNKNOWN", argv[cmd_arg]); return 0; } flags = cmd->effective_flags; @@ -683,11 +722,17 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo /* Expand the alias arguments, if there are any. */ if (cmd->alias.used) { char *new_argv[MAXNUMPARAMS]; - argc = svccmd_expand_alias(cmd, argc, argv, new_argv); - if (!argc) { - send_message(service->bot, user, "MCMSG_ALIAS_ERROR", cmd->name); + int res; + + res = svccmd_expand_alias(cmd, argc, argv, new_argv); + if (res < 0) { + send_message(user, service->bot, "MSG_MISSING_PARAMS", cmd->name); + return 0; + } else if (res == 0) { + send_message(user, service->bot, "MCMSG_ALIAS_ERROR", cmd->name); return 0; } + argc = res; argv = new_argv; /* Try again to grab a handle to the channel after alias @@ -729,11 +774,13 @@ svccmd_invoke_argv(struct userNode *user, struct service *service, struct chanNo safestrncpy(channel_name, channel->name, sizeof(channel_name)); else channel_name[0] = 0; - if (!cmd->command->func(user, channel, argc, argv, cmd)) + if (!(result = cmd->command->func(user, channel, argc, argv, cmd))) return 0; if (!(flags & MODCMD_NO_LOG)) { enum log_severity slvl; - if (perms & ACTION_STAFF) + if (result & CMD_LOG_OVERRIDE) + slvl = LOG_OVERRIDE; + else if ((perms & ACTION_STAFF) || (result & CMD_LOG_STAFF)) slvl = LOG_STAFF; else if (perms & ACTION_OVERRIDE) slvl = LOG_OVERRIDE; @@ -787,9 +834,10 @@ svccmd_send_help_2(struct userNode *user, struct service *service, const char *t } static int -svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *channel, char *text, int server_qualified) { +svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *channel, const char *text, int server_qualified) { unsigned int argc; char *argv[MAXNUMPARAMS]; + char tmpline[MAXLEN]; if (!*text) return 0; @@ -807,32 +855,87 @@ svccmd_invoke(struct userNode *user, struct service *service, struct chanNode *c return 0; } } - argc = split_line(text, false, ArrayLength(argv), argv); + safestrncpy(tmpline, text, sizeof(tmpline)); + argc = split_line(tmpline, false, ArrayLength(argv), argv); return argc ? svccmd_invoke_argv(user, service, channel, argc, argv, server_qualified) : 0; } void -modcmd_privmsg(struct userNode *user, struct userNode *bot, char *text, int server_qualified) { +modcmd_privmsg(struct userNode *user, struct userNode *bot, const char *text, int server_qualified) { struct service *service; + if (!(service = dict_find(services, bot->nick, NULL))) { log_module(MAIN_LOG, LOG_ERROR, "modcmd_privmsg got privmsg for unhandled service %s, unregistering.", bot->nick); reg_privmsg_func(bot, NULL); return; } + + if (text[0] == '\x01') { + char *term, response[MAXLEN]; + + text++; /* Skip leading ^A. */ + /* Chop off final ^A. */ + term = strchr(text, '\x01'); + if (!term) + return; + *term = '\0'; + /* Parse out leading text. */ + term = strchr(text, ' '); + if (term) { + *term++ = '\0'; + if (!*term) + term = NULL; + } + /* No dict lookup since these are so few. */ + if (!irccasecmp(text, "CLIENTINFO")) { + /* Use \001 instead of \x01 because apparently \x01C is + * interpreted as ASCII FS (\034, decimal 28, hex 1C). + */ + irc_notice_user(bot, user, "\001CLIENTINFO CLIENTINFO PING TIME USERINFO VERSION\x01"); + } else if (!irccasecmp(text, "PING")) { + if (term) { + snprintf(response, sizeof(response), "\x01PING %s\x01", term); + irc_notice_user(bot, user, response); + } else { + irc_notice_user(bot,user, "\x01PING\x01"); + } + } else if (!irccasecmp(text, "TIME")) { + time_t feh; + feh = now; + strftime(response, sizeof(response), "\x01TIME %a %b %d %H:%M:%S %Y\x01", localtime(&feh)); + irc_notice_user(bot, user, response); + } else if (!irccasecmp(text, "USERINFO")) { + snprintf(response, sizeof(response), "\x01USERINFO %s\x01", bot->info); + irc_notice_user(bot, user, response); + } else if (!irccasecmp(text, "VERSION")) { + /* This function provides copyright management information + * to end users of srvx. You should not alter, disable or + * remove this command or its accessibility to normal IRC + * users, except to add copyright information pertaining + * to changes you make to srvx. + */ + snprintf(response, sizeof(response), "\x01VERSION %s (%s) GIT Revision: %s\x01", PACKAGE_STRING, CODENAME, git_version); + irc_notice_user(bot, user, response); + } + return; + } + if (service->msg_hook && service->msg_hook(user, bot, text, server_qualified)) return; svccmd_invoke(user, service, NULL, text, server_qualified); } void -modcmd_chanmsg(struct userNode *user, struct chanNode *chan, char *text, struct userNode *bot) { +modcmd_chanmsg(struct userNode *user, struct chanNode *chan, const char *text, struct userNode *bot, unsigned int is_notice) { struct service *service; - if (!(service = dict_find(services, bot->nick, NULL))) return; + if (!(service = dict_find(services, bot->nick, NULL))) + return; svccmd_invoke(user, service, chan, text, 0); + (void)is_notice; } struct service * -service_register(struct userNode *bot, char trigger) { +service_register(struct userNode *bot) { struct service *service; if ((service = dict_find(services, bot->nick, NULL))) return service; @@ -840,12 +943,9 @@ service_register(struct userNode *bot, char trigger) { module_list_init(&service->modules); service->commands = dict_new(); service->bot = bot; - service->trigger = trigger; dict_set_free_data(service->commands, free_service_command); dict_insert(services, service->bot->nick, service); reg_privmsg_func(bot, modcmd_privmsg); - if (trigger) - reg_chanmsg_func(trigger, bot, modcmd_chanmsg); return service; } @@ -915,8 +1015,10 @@ check_alias_args(char *argv[], unsigned int argc) { continue; } else if (isdigit(argv[arg][1])) { char *end_num; + unsigned int tmp; - strtoul(argv[arg]+1, &end_num, 10); + tmp = strtoul(argv[arg]+1, &end_num, 10); + (void)tmp; switch (end_num[0]) { case 0: continue; @@ -1152,10 +1254,10 @@ static MODCMD_FUNC(cmd_readhelp) { stop.tv_sec -= start.tv_sec; stop.tv_usec -= start.tv_usec; if (stop.tv_usec < 0) { - stop.tv_sec -= 1; - stop.tv_usec += 1000000; + stop.tv_sec -= 1; + stop.tv_usec += 1000000; } - reply("MCMSG_HELPFILE_READ", module->name, stop.tv_sec, stop.tv_usec/1000); + reply("MCMSG_HELPFILE_READ", module->name, (unsigned long)stop.tv_sec, (unsigned long)stop.tv_usec/1000); return 1; } @@ -1177,10 +1279,10 @@ static MODCMD_FUNC(cmd_timecmd) { stop.tv_sec -= start.tv_sec; stop.tv_usec -= start.tv_usec; if (stop.tv_usec < 0) { - stop.tv_sec -= 1; - stop.tv_usec += 1000000; + stop.tv_sec -= 1; + stop.tv_usec += 1000000; } - reply("MCMSG_COMMAND_TIME", cmd_text, stop.tv_sec, stop.tv_usec); + reply("MCMSG_COMMAND_TIME", cmd_text, (unsigned long)stop.tv_sec, (unsigned long)stop.tv_usec); return 1; } @@ -1220,6 +1322,10 @@ static MODCMD_FUNC(cmd_command) { reply("MCMSG_NEED_OPSERV_LEVEL", svccmd->min_opserv_level); shown_flags |= MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_AUTHED; } + if (svccmd->min_staff_level > 0) { // && (IsNetworkHelper(user) || IsSupportHelper(user) || IsOper(user)) + reply("MCMSG_NEED_STAFF_LEVEL", svccmd->min_staff_level); + shown_flags |= MODCMD_REQUIRE_STAFF | MODCMD_REQUIRE_AUTHED; + } if (svccmd->min_channel_access > 0) { reply("MCMSG_NEED_CHANSERV_LEVEL", svccmd->min_channel_access); shown_flags |= MODCMD_REQUIRE_CHANUSER | MODCMD_REQUIRE_REGCHAN | MODCMD_REQUIRE_CHANNEL | MODCMD_REQUIRE_AUTHED; @@ -1297,6 +1403,55 @@ static MODCMD_FUNC(cmd_command) { return 1; } +static void +modcmd_describe_command(struct userNode *user, struct svccmd *cmd, struct svccmd *target) { + char buf1[MAXLEN], buf2[MAXLEN]; + unsigned int ii, len, buf1_used, buf2_used; + + if (target->alias.used) { + unsplit_string((char**)target->alias.list, target->alias.used, buf1); + reply("MCMSG_COMMAND_ALIASES", target->name, buf1); + } else { + snprintf(buf1, sizeof(buf1), "%s.%s", target->command->parent->name, target->command->name); + reply("MCMSG_COMMAND_BINDING", target->name, buf1); + } + for (ii = buf1_used = buf2_used = 0; modcmd_flags[ii].name; ++ii) { + const struct modcmd_flag *flag = &modcmd_flags[ii]; + if (target->flags & flag->flag) { + if (buf1_used) + buf1[buf1_used++] = ','; + len = strlen(flag->name); + memcpy(buf1 + buf1_used, flag->name, len); + buf1_used += len; + } else if (target->effective_flags & flag->flag) { + if (buf2_used) + buf2[buf2_used++] = ','; + len = strlen(flag->name); + memcpy(buf2 + buf2_used, flag->name, len); + buf2_used += len; + } + } + if (buf1_used) + buf1[buf1_used] = '\0'; + else + strcpy(buf1, user_find_message(user, "MSG_NONE")); + if (buf2_used) + buf2[buf2_used] = '\0'; + else + strcpy(buf2, user_find_message(user, "MSG_NONE")); + reply("MCMSG_COMMAND_FLAGS", buf1, buf2); + for (ii = buf1_used = buf2_used = 0; handle_flags[ii]; ++ii) { + if (target->req_account_flags & (1 << ii)) + buf1[buf1_used++] = handle_flags[ii]; + else if (target->deny_account_flags & (1 << ii)) + buf2[buf2_used++] = handle_flags[ii]; + } + buf1[buf1_used] = buf2[buf2_used] = '\0'; + reply("MCMSG_COMMAND_ACCOUNT_FLAGS", buf1, buf2); + reply("MCMSG_COMMAND_ACCESS_LEVEL", target->min_channel_access, target->min_opserv_level, target->min_staff_level); + reply("MCMSG_COMMAND_USES", target->name, target->uses); +} + static MODCMD_FUNC(cmd_modcmd) { struct svccmd *svccmd; unsigned int arg, changed; @@ -1304,7 +1459,7 @@ static MODCMD_FUNC(cmd_modcmd) { assert(argc >= 2); arg = collapse_cmdname(argv+1, argc-1, cmdname) + 1; - if (!arg || (arg+2 < argc)) { + if (!arg) { reply("MSG_MISSING_PARAMS", cmd->name); return 0; } @@ -1312,16 +1467,15 @@ static MODCMD_FUNC(cmd_modcmd) { reply("MCMSG_UNKNOWN_COMMAND_2", cmdname, cmd->parent->bot->nick); return 0; } - changed = 0; - while (arg+1 < argc) { + for (changed = 0; arg+1 < argc; arg += 2) { if (svccmd_configure(svccmd, user, cmd->parent->bot, argv[arg], argv[arg+1])) { reply("MCMSG_COMMAND_MODIFIED", argv[arg], svccmd->name); changed = 1; } - arg += 2; } if (changed) modcmd_set_effective_flags(svccmd); + modcmd_describe_command(user, cmd, svccmd); return changed; } @@ -1361,7 +1515,7 @@ static MODCMD_FUNC(cmd_god) { } static MODCMD_FUNC(cmd_joiner) { - char cmdname[80]; + char cmdname[MAXLEN]; if (argc < 2) { int len = sprintf(cmdname, "%s ", cmd->name); @@ -1457,7 +1611,7 @@ static MODCMD_FUNC(cmd_stats_services) { service = iter_data(it); tbl.contents[ii] = calloc(tbl.width, sizeof(tbl.contents[ii][0])); tbl.contents[ii][0] = service->bot->nick; - tbl.contents[ii][1] = strtab(dict_size(service->commands)); + tbl.contents[ii][1] = (service->commands && dict_size(service->commands) ? strtab(dict_size(service->commands)) : strtab(0)); tbl.contents[ii][2] = service->privileged ? "yes" : "no"; extra[ii*2] = service->trigger; tbl.contents[ii][3] = extra+ii*2; @@ -1562,20 +1716,20 @@ static MODCMD_FUNC(cmd_showcommands) { if (show_opserv_level) tbl.contents[ii+1][1] = strtab(svccmd->min_opserv_level); if (show_channel_access) { - const char *access; + const char *access_name; int flags = svccmd->effective_flags; if (flags & MODCMD_REQUIRE_HELPING) - access = "helping"; + access_name = "helping"; else if (flags & MODCMD_REQUIRE_STAFF) { - switch (flags & MODCMD_REQUIRE_STAFF) { - case MODCMD_REQUIRE_OPER: access = "oper"; break; - case MODCMD_REQUIRE_OPER | MODCMD_REQUIRE_NETWORK_HELPER: - case MODCMD_REQUIRE_NETWORK_HELPER: access = "net.helper"; break; - default: access = "staff"; break; - } + if (flags & MODCMD_REQUIRE_OPER) + access_name = "oper"; + else if (flags & MODCMD_REQUIRE_NETWORK_HELPER) + access_name = "net.helper"; + else + access_name = "staff"; } else - access = strtab(svccmd->min_channel_access); - tbl.contents[ii+1][1+show_opserv_level] = access; + access_name = strtab(svccmd->min_channel_access); + tbl.contents[ii+1][1+show_opserv_level] = access_name; } } svccmd_list_clean(&commands); @@ -1612,7 +1766,7 @@ static MODCMD_FUNC(cmd_helpfiles) { } static MODCMD_FUNC(cmd_service_add) { - const char *nick, *desc; + const char *nick, *hostname, *desc; struct userNode *bot; nick = argv[1]; @@ -1620,14 +1774,15 @@ static MODCMD_FUNC(cmd_service_add) { reply("MCMSG_BAD_SERVICE_NICK", nick); return 0; } - desc = unsplit_string(argv+2, argc-2, NULL); + hostname = argv[2]; + desc = unsplit_string(argv+3, argc-3, NULL); bot = GetUserH(nick); if (bot && IsService(bot)) { reply("MCMSG_ALREADY_SERVICE", bot->nick); return 0; } - bot = AddService(nick, desc); - service_register(bot, '\0'); + bot = AddLocalUser(nick, nick, hostname, desc, NULL); + service_register(bot); reply("MCMSG_NEW_SERVICE", bot->nick); return 1; } @@ -1647,6 +1802,7 @@ static MODCMD_FUNC(cmd_service_rename) { static MODCMD_FUNC(cmd_service_trigger) { struct userNode *bogon; struct service *service; + int old_oc = 0; if (!(service = service_find(argv[1]))) { reply("MCMSG_UNKNOWN_SERVICE", argv[1]); @@ -1659,9 +1815,13 @@ static MODCMD_FUNC(cmd_service_trigger) { reply("MCMSG_NO_TRIGGER", service->bot->nick); return 1; } - if (service->trigger) + if (service->trigger) { + old_oc = offchannel_allowed[(unsigned char)service->trigger]; + offchannel_allowed[(unsigned char)service->trigger] = 0; reg_chanmsg_func(service->trigger, NULL, NULL); + } if (!irccasecmp(argv[2], "none") || !irccasecmp(argv[2], "remove")) { + offchannel_allowed[(unsigned char)service->trigger] = 0; service->trigger = 0; reply("MCMSG_REMOVED_TRIGGER", service->bot->nick); } else if ((bogon = get_chanmsg_bot(argv[2][0]))) { @@ -1669,12 +1829,48 @@ static MODCMD_FUNC(cmd_service_trigger) { return 1; } else { service->trigger = argv[2][0]; + offchannel_allowed[(unsigned char)service->trigger] = old_oc; reg_chanmsg_func(service->trigger, service->bot, modcmd_chanmsg); reply("MCMSG_NEW_TRIGGER", service->bot->nick, service->trigger); } return 1; } +static MODCMD_FUNC(cmd_service_offchannel) { + struct service *service; + + if (!(service = service_find(argv[1]))) { + reply("MCMSG_UNKNOWN_SERVICE", argv[1]); + return 0; + } + + if(!service->trigger) { + reply("MCMSG_NO_TRIGGER", service->bot->nick); + return 0; + } + + if(argc < 3) { + if(offchannel_allowed[(unsigned char)service->trigger]) + reply("MCMSG_OFFCHANNEL_IS_ON", service->bot->nick, service->trigger); + else + reply("MCMSG_OFFCHANNEL_IS_OFF", service->bot->nick, service->trigger); + return 1; + } + + if(enabled_string(argv[2])) { + offchannel_allowed[(unsigned char)service->trigger] = 1; + reply("MCMSG_OFFCHANNEL_ON", service->bot->nick, service->trigger); + } else if(disabled_string(argv[2])) { + offchannel_allowed[(unsigned char)service->trigger] = 0; + reply("MCMSG_OFFCHANNEL_OFF", service->bot->nick, service->trigger); + } else { + reply("MSG_INVALID_BINARY", argv[2]); + return 0; + } + + return 1; +} + static MODCMD_FUNC(cmd_service_privileged) { struct service *service; const char *newval; @@ -1714,6 +1910,7 @@ static MODCMD_FUNC(cmd_dump_messages) { struct saxdb_context *ctx; dict_iterator_t it; FILE *pf; + int res; if (!(pf = fopen(fname, "w"))) { reply("MCMSG_FILE_NOT_OPENED", fname); @@ -1723,22 +1920,43 @@ static MODCMD_FUNC(cmd_dump_messages) { reply("MSG_INTERNAL_FAILURE"); return 0; } - for (it = dict_first(lang_C->messages); it; it = iter_next(it)) - saxdb_write_string(ctx, iter_key(it), iter_data(it)); - saxdb_close_context(ctx); - fclose(pf); - reply("MCMSG_MESSAGES_DUMPED", fname); - return 1; + if ((res = setjmp(*saxdb_jmp_buf(ctx))) != 0) { + saxdb_close_context(ctx, 1); + reply("MCMSG_MESSAGE_DUMP_FAILED", strerror(res)); + return 0; + } else { + for (it = dict_first(lang_C->messages); it; it = iter_next(it)) + saxdb_write_string(ctx, iter_key(it), iter_data(it)); + saxdb_close_context(ctx, 1); + reply("MCMSG_MESSAGES_DUMPED", fname); + return 1; + } } static MODCMD_FUNC(cmd_version) { - reply("MCMSG_VERSION"); - send_message_type(4, user, cmd->parent->bot, "Copyright 2000-2004 srvx Development Team.\nThe srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net."); - if ((argc > 1) && !irccasecmp(argv[1], "arch")) - send_message_type(4, user, cmd->parent->bot, "%s", ARCH_VERSION); + /* This function provides copyright management information to end + * users of srvx. You should not alter, disable or remove this + * command or its accessibility to normal IRC users, except to add + * copyright information pertaining to changes you make to srvx. + */ + send_message_type(4, user, cmd->parent->bot, "$b"PACKAGE_STRING"$b ("CODENAME"), GIT Revision: %s, Built: "__DATE__", "__TIME__". Copyright 2000-2008 srvx Development Team.", git_version); + send_message_type(12, user, cmd->parent->bot, "The srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.\nThis version has been modified by pk910 - visit #srvx @ irc.nextirc.net.\nThis version has been modified by Stricted - visit #dev @ irc.easy-scripting.net."); return 1; } +static MODCMD_FUNC(cmd_tell) { + struct userNode *target; + char *msg; + + target = GetUserH(argv[1]); + msg = unsplit_string(argv + 2, argc - 2, NULL); + if (!target) { + reply("MSG_NOT_TARGET_NAME"); + return 0; + } + send_message_type(MSG_TYPE_NOXLATE, target, cmd->parent->bot, "%s", msg); + return 1; +} void modcmd_nick_change(struct userNode *user, const char *old_nick) { @@ -1770,15 +1988,18 @@ modcmd_saxdb_write_command(struct saxdb_context *ctx, struct svccmd *cmd) { saxdb_write_string_list(ctx, "aliased", &cmd->alias); if (cmd->min_opserv_level != template->min_opserv_level) saxdb_write_int(ctx, "oper_access", cmd->min_opserv_level); + if (cmd->min_staff_level != template->min_staff_level) + saxdb_write_int(ctx, "staff_access", cmd->min_staff_level); if (cmd->min_channel_access != template->min_channel_access) saxdb_write_int(ctx, "channel_access", cmd->min_channel_access); if (cmd->flags != template->flags) { if (cmd->flags) { - for (nn=pos=0; flags[nn].name; ++nn) { - if (cmd->flags & flags[nn].flag) { + for (nn=pos=0; modcmd_flags[nn].name; ++nn) { + const struct modcmd_flag *flag = &modcmd_flags[nn]; + if (cmd->flags & flag->flag) { buf[pos++] = '+'; - len = strlen(flags[nn].name); - memcpy(buf+pos, flags[nn].name, len); + len = strlen(flag->name); + memcpy(buf+pos, flag->name, len); pos += len; buf[pos++] = ','; } @@ -1820,14 +2041,23 @@ modcmd_saxdb_write(struct saxdb_context *ctx) { saxdb_start_record(ctx, "bots", 1); for (it = dict_first(services); it; it = iter_next(it)) { char buff[16]; + char modes[32]; + service = iter_data(it); saxdb_start_record(ctx, service->bot->nick, 1); if (service->trigger) { buff[0] = service->trigger; buff[1] = '\0'; saxdb_write_string(ctx, "trigger", buff); + if(offchannel_allowed[(unsigned char)service->trigger]) + saxdb_write_int(ctx, "offchannel", 1); } saxdb_write_string(ctx, "description", service->bot->info); + saxdb_write_string(ctx, "hostname", service->bot->hostname); + if (service->bot->modes) { + irc_user_modes(service->bot, modes, sizeof(modes)); + saxdb_write_string(ctx, "modes", modes); + } if (service->privileged) saxdb_write_string(ctx, "privileged", "1"); saxdb_end_record(ctx); @@ -1906,14 +2136,13 @@ modcmd_expand(const char *variable) { } static void -modcmd_load_bots(struct dict *db) { +modcmd_load_bots(struct dict *db, int default_nick) { dict_iterator_t it; for (it = dict_first(db); it; it = iter_next(it)) { struct record_data *rd; - struct userNode *bot; - const char *nick, *desc; - char trigger; + struct service *svc; + const char *nick, *desc, *hostname, *modes; rd = iter_data(it); if (rd->type != RECDB_OBJECT) { @@ -1921,18 +2150,28 @@ modcmd_load_bots(struct dict *db) { continue; } nick = database_get_data(rd->d.object, "nick", RECDB_QSTRING); - if (!nick) - nick = iter_key(it); - if (service_find(nick)) - continue; - desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING); - trigger = desc ? desc[0] : '\0'; + if (!nick) { + if (default_nick) + nick = iter_key(it); + else + continue; + } + svc = service_find(nick); desc = database_get_data(rd->d.object, "description", RECDB_QSTRING); - if (desc) - { - struct service *svc; - bot = AddService(nick, desc); - svc = service_register(bot, trigger); + hostname = database_get_data(rd->d.object, "hostname", RECDB_QSTRING); + modes = database_get_data(rd->d.object, "modes", RECDB_QSTRING); + if (desc) { + if (!svc) + svc = service_register(AddLocalUser(nick, nick, hostname, desc, modes)); + else if (hostname) + strcpy(svc->bot->hostname, hostname); + desc = database_get_data(rd->d.object, "trigger", RECDB_QSTRING); + if (desc) { + svc->trigger = desc[0]; + desc = database_get_data(rd->d.object, "offchannel", RECDB_QSTRING); + if(desc) + offchannel_allowed[(unsigned char)svc->trigger] = atoi(desc); + } desc = database_get_data(rd->d.object, "privileged", RECDB_QSTRING); if (desc && (true_string(desc) || enabled_string(desc))) svc->privileged = 1; @@ -1942,12 +2181,12 @@ modcmd_load_bots(struct dict *db) { static void modcmd_conf_read(void) { - modcmd_load_bots(conf_get_data("services", RECDB_OBJECT)); + modcmd_load_bots(conf_get_data("services", RECDB_OBJECT), 0); } void modcmd_init(void) { - qsort(flags, ArrayLength(flags)-1, sizeof(flags[0]), flags_qsort); + qsort(modcmd_flags, ArrayLength(modcmd_flags)-1, sizeof(modcmd_flags[0]), flags_qsort); modules = dict_new(); dict_set_free_data(modules, free_module); services = dict_new(); @@ -1960,7 +2199,7 @@ modcmd_init(void) { bind_command = modcmd_register(modcmd_module, "bind", cmd_bind, 4, MODCMD_KEEP_BOUND, "oper_level", "800", NULL); help_command = modcmd_register(modcmd_module, "help", cmd_help, 1, 0, "flags", "+nolog", NULL); modcmd_register(modcmd_module, "command", cmd_command, 2, 0, "flags", "+nolog", NULL); - modcmd_register(modcmd_module, "modcmd", cmd_modcmd, 4, MODCMD_KEEP_BOUND, "template", "bind", NULL); + modcmd_register(modcmd_module, "modcmd", cmd_modcmd, 2, MODCMD_KEEP_BOUND, "template", "bind", NULL); modcmd_register(modcmd_module, "god", cmd_god, 0, MODCMD_REQUIRE_AUTHED, "flags", "+oper,+networkhelper", NULL); modcmd_register(modcmd_module, "readhelp", cmd_readhelp, 2, 0, "oper_level", "650", NULL); modcmd_register(modcmd_module, "timecmd", cmd_timecmd, 2, 0, "oper_level", "1", NULL); @@ -1970,12 +2209,14 @@ modcmd_init(void) { modcmd_register(modcmd_module, "stats services", cmd_stats_services, 1, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "showcommands", cmd_showcommands, 1, 0, "flags", "+acceptchan", NULL); modcmd_register(modcmd_module, "helpfiles", cmd_helpfiles, 2, 0, "template", "bind", NULL); - modcmd_register(modcmd_module, "service add", cmd_service_add, 3, 0, "flags", "+oper", NULL); + modcmd_register(modcmd_module, "service add", cmd_service_add, 4, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service rename", cmd_service_rename, 3, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service trigger", cmd_service_trigger, 2, 0, "flags", "+oper", NULL); + modcmd_register(modcmd_module, "service offchannel", cmd_service_offchannel, 2, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service privileged", cmd_service_privileged, 2, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "service remove", cmd_service_remove, 2, 0, "flags", "+oper", NULL); modcmd_register(modcmd_module, "dumpmessages", cmd_dump_messages, 1, 0, "oper_level", "1000", NULL); + modcmd_register(modcmd_module, "tell", cmd_tell, 3, 0, "flags", "+oper", NULL); version_command = modcmd_register(modcmd_module, "version", cmd_version, 1, 0, NULL); message_register_table(msgtab); } @@ -2029,6 +2270,10 @@ modcmd_db_load_command(struct service *service, const char *cmdname, struct dict || (str = database_get_data(obj, "opserv_level", RECDB_QSTRING))) { svccmd_configure(svccmd, NULL, service->bot, "oper_access", str); } + if ((str = database_get_data(obj, "staff_access", RECDB_QSTRING)) + || (str = database_get_data(obj, "staff_level", RECDB_QSTRING))) { + svccmd_configure(svccmd, NULL, service->bot, "staff_access", str); + } if ((str = database_get_data(obj, "channel_access", RECDB_QSTRING)) || (str = database_get_data(obj, "chanserv_level", RECDB_QSTRING))) { svccmd_configure(svccmd, NULL, service->bot, "channel_access", str); @@ -2086,7 +2331,7 @@ modcmd_saxdb_read(struct dict *db) { struct record_data *rd, *rd2; struct service *service; - modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT)); + modcmd_load_bots(database_get_data(db, "bots", RECDB_OBJECT), 1); db2 = database_get_data(db, "services", RECDB_OBJECT); if (!db2) { log_module(MAIN_LOG, LOG_ERROR, "Missing section 'services' in modcmd db."); @@ -2200,6 +2445,8 @@ create_default_binds(void) { struct svccmd *svccmd; svccmd = service_make_alias(service, "stats", "*modcmd.joiner", NULL); svccmd->min_opserv_level = 101; + svccmd = service_make_alias(service, "devnull", "*modcmd.joiner", NULL); + svccmd->min_opserv_level = 200; svccmd = service_make_alias(service, "service", "*modcmd.joiner", NULL); svccmd->min_opserv_level = 900; } @@ -2239,12 +2486,21 @@ import_aliases_db() { void modcmd_finalize(void) { + dict_iterator_t it; + /* Check databases. */ saxdb_register("modcmd", modcmd_saxdb_read, modcmd_saxdb_write); create_default_binds(); if (!saxdb_present) import_aliases_db(); + /* Register services for their triggers. */ + for (it = dict_first(services); it; it = iter_next(it)) { + struct service *svc = iter_data(it); + if (svc->trigger) + reg_chanmsg_func(svc->trigger, svc->bot, modcmd_chanmsg); + } + /* Resolve command rule-templates. */ while (pending_templates) { struct pending_template *ptempl = pending_templates;