X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/d07e3fffd6db5d033193385012d500c7b954f1be..574bfc14685e7a08572ff03e1547f62a370777d6:/src/nickserv.c diff --git a/src/nickserv.c b/src/nickserv.c index 60e2021..d63a35a 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -42,6 +42,7 @@ #define KEY_VALID_HANDLE_REGEX "valid_handle_regex" #define KEY_VALID_ACCOUNT_REGEX "valid_account_regex" #define KEY_VALID_NICK_REGEX "valid_nick_regex" +#define KEY_VALID_FAKEHOST_REGEX "valid_fakehost_regex" #define KEY_DB_BACKUP_FREQ "db_backup_freq" #define KEY_MODOPER_LEVEL "modoper_level" #define KEY_SET_EPITHET_LEVEL "set_epithet_level" @@ -109,7 +110,7 @@ #define NICKSERV_VALID_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_" #define NICKSERV_FUNC(NAME) MODCMD_FUNC(NAME) -#define OPTION_FUNC(NAME) int NAME(struct userNode *user, struct handle_info *hi, UNUSED_ARG(unsigned int override), unsigned int argc, char *argv[]) +#define OPTION_FUNC(NAME) int NAME(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, UNUSED_ARG(unsigned int override), unsigned int argc, char *argv[]) typedef OPTION_FUNC(option_func_t); DEFINE_LIST(handle_info_list, struct handle_info*); @@ -191,7 +192,7 @@ static const struct message_entry msgtab[] = { { "NSMSG_STAMPED_AUTH", "You have already authenticated to an account once this session; you may not authenticate to another." }, { "NSMSG_STAMPED_RESETPASS", "You have already authenticated to an account once this session; you may not reset your password to authenticate again." }, { "NSMSG_STAMPED_AUTHCOOKIE", "You have already authenticated to an account once this session; you may not use a cookie to authenticate to another account." }, - { "NSMSG_TITLE_INVALID", "Titles cannot contain any dots; please choose another." }, + { "NSMSG_TITLE_INVALID", "Titles may contain only a-z, A-Z, 0-9, and '-'. Please choose another." }, { "NSMSG_TITLE_TRUNCATED", "That title combined with the user's account name would result in a truncated host; please choose a shorter title." }, { "NSMSG_FAKEHOST_INVALID", "Fake hosts must be shorter than %d characters and cannot start with a dot." }, { "NSMSG_HANDLEINFO_ON", "$bAccount Information for %s$b" }, @@ -363,6 +364,7 @@ static const struct message_entry msgtab[] = { { "NSMSG_DENIED_FAKEHOST_WORD", "Access denied because there's a prohibited word in $b%s$b (%s)." }, { "NSMSG_NOT_VALID_FAKEHOST_LEN", "$b%s$b is not a valid vhost. (can only be 63 characters)" }, { "NSMSG_NOT_VALID_FAKEHOST_TLD_LEN", "$b%s$b is not a valid vhost. (TLD can only be 4 characters and less)" }, + { "NSMSG_NOT_VALID_FAKEHOST_REGEX", "$b%s$b is not allowed by the admin, consult the valid vhost regex pattern in the config file under nickserv/valid_fakehost_regex." }, { "CHECKPASS_YES", "Yes." }, { "CHECKPASS_NO", "No." }, { NULL, NULL } @@ -381,6 +383,7 @@ static struct { unsigned int disable_nicks : 1; unsigned int valid_handle_regex_set : 1; unsigned int valid_nick_regex_set : 1; + unsigned int valid_fakehost_regex_set : 1; unsigned int autogag_enabled : 1; unsigned int email_enabled : 1; unsigned int email_required : 1; @@ -410,6 +413,7 @@ static struct { const char *titlehost_suffix; regex_t valid_handle_regex; regex_t valid_nick_regex; + regex_t valid_fakehost_regex; dict_t weak_password_dict; struct policer_params *auth_policer_params; enum reclaim_action reclaim_action; @@ -791,7 +795,7 @@ smart_get_handle_info(struct userNode *service, struct userNode *user, const cha } int -oper_outranks(struct userNode *user, struct handle_info *hi) { +oper_outranks(struct svccmd *cmd, struct userNode *user, struct handle_info *hi) { if (user->handle_info->opserv_level > hi->opserv_level) return 1; if (user->handle_info->opserv_level == hi->opserv_level) { @@ -803,12 +807,12 @@ oper_outranks(struct userNode *user, struct handle_info *hi) { return 1; } } - send_message(user, nickserv, "MSG_USER_OUTRANKED", hi->handle); + reply("MSG_USER_OUTRANKED", hi->handle); return 0; } struct handle_info * -get_victim_oper(struct userNode *user, const char *target) +get_victim_oper(struct svccmd *cmd, struct userNode *user, const char *target) { struct handle_info *hi; if (!(hi = smart_get_handle_info(nickserv, user, target))) @@ -817,7 +821,7 @@ get_victim_oper(struct userNode *user, const char *target) send_message(user, nickserv, "MSG_OPER_SUSPENDED"); return 0; } - return oper_outranks(user, hi) ? hi : NULL; + return oper_outranks(cmd, user, hi) ? hi : NULL; } static int @@ -1478,25 +1482,24 @@ static NICKSERV_FUNC(cmd_oregister) } static int -nickserv_ignore(struct userNode *user, struct handle_info *hi, char *mask) +nickserv_ignore(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, char *mask) { unsigned int i; struct userNode *target; char *new_mask = strdup(pretty_mask(mask)); for (i=0; iignores->used; i++) { if (!irccasecmp(new_mask, hi->ignores->list[i])) { - send_message(user, nickserv, "NSMSG_ADDIGNORE_ALREADY", new_mask); + reply("NSMSG_ADDIGNORE_ALREADY", new_mask); free(new_mask); return 0; } } string_list_append(hi->ignores, new_mask); - send_message(user, nickserv, "NSMSG_ADDIGNORE_SUCCESS", new_mask); + reply("NSMSG_ADDIGNORE_SUCCESS", new_mask); for (target = hi->users; target; target = target->next_authed) { irc_silence(target, new_mask, 1); } - /* does string_list_append make a copy of new_mask and we should free() it here? */ return 1; } @@ -1504,7 +1507,7 @@ static NICKSERV_FUNC(cmd_addignore) { NICKSERV_MIN_PARMS(2); - return nickserv_ignore(user, user->handle_info, argv[1]); + return nickserv_ignore(cmd, user, user->handle_info, argv[1]); } static NICKSERV_FUNC(cmd_oaddignore) @@ -1512,14 +1515,14 @@ static NICKSERV_FUNC(cmd_oaddignore) struct handle_info *hi; NICKSERV_MIN_PARMS(3); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; - return nickserv_ignore(user, hi, argv[2]); + return nickserv_ignore(cmd, user, hi, argv[2]); } static int -nickserv_delignore(struct userNode *user, struct handle_info *hi, char *del_mask) +nickserv_delignore(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, char *del_mask) { unsigned int i; struct userNode *target; @@ -1528,32 +1531,32 @@ nickserv_delignore(struct userNode *user, struct handle_info *hi, char *del_mask if (!strcmp(pmask, hi->ignores->list[i]) || !strcmp(del_mask, hi->ignores->list[i])) { char *old_mask = hi->ignores->list[i]; hi->ignores->list[i] = hi->ignores->list[--hi->ignores->used]; - send_message(user, nickserv, "NSMSG_DELMASK_SUCCESS", old_mask); + reply("NSMSG_DELMASK_SUCCESS", old_mask); for (target = hi->users; target; target = target->next_authed) { - irc_silence(user, old_mask, 0); + irc_silence(target, old_mask, 0); } free(old_mask); free(pmask); return 1; } } - send_message(user, nickserv, "NSMSG_DELMASK_NOT_FOUND"); + reply("NSMSG_DELMASK_NOT_FOUND"); return 0; } static NICKSERV_FUNC(cmd_delignore) { NICKSERV_MIN_PARMS(2); - return nickserv_delignore(user, user->handle_info, argv[1]); + return nickserv_delignore(cmd, user, user->handle_info, argv[1]); } static NICKSERV_FUNC(cmd_odelignore) { struct handle_info *hi; NICKSERV_MIN_PARMS(3); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; - return nickserv_delignore(user, hi, argv[2]); + return nickserv_delignore(cmd, user, hi, argv[2]); } static NICKSERV_FUNC(cmd_handleinfo) @@ -1596,7 +1599,7 @@ static NICKSERV_FUNC(cmd_handleinfo) struct do_not_register *dnr; if ((dnr = chanserv_is_dnr(NULL, hi))) reply("NSMSG_HANDLEINFO_DNR", dnr->setter, dnr->reason); - if (!oper_outranks(user, hi)) + if (!oper_outranks(cmd, user, hi)) return 1; } else if (hi != user->handle_info) { reply("NSMSG_HANDLEINFO_END"); @@ -1805,7 +1808,7 @@ static NICKSERV_FUNC(cmd_rename_handle) unsigned int nn; NICKSERV_MIN_PARMS(3); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; if (!is_valid_handle(argv[2])) { reply("NSMSG_FAIL_RENAME", argv[1], argv[2]); @@ -2179,7 +2182,7 @@ static NICKSERV_FUNC(cmd_odelcookie) NICKSERV_MIN_PARMS(2); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; if (!hi->cookie) { @@ -2387,19 +2390,19 @@ static NICKSERV_FUNC(cmd_pass) } static int -nickserv_addmask(struct userNode *user, struct handle_info *hi, const char *mask) +nickserv_addmask(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, const char *mask) { unsigned int i; char *new_mask = canonicalize_hostmask(strdup(mask)); for (i=0; imasks->used; i++) { if (!irccasecmp(new_mask, hi->masks->list[i])) { - send_message(user, nickserv, "NSMSG_ADDMASK_ALREADY", new_mask); + reply("NSMSG_ADDMASK_ALREADY", new_mask); free(new_mask); return 0; } } string_list_append(hi->masks, new_mask); - send_message(user, nickserv, "NSMSG_ADDMASK_SUCCESS", new_mask); + reply("NSMSG_ADDMASK_SUCCESS", new_mask); return 1; } @@ -2407,7 +2410,7 @@ static NICKSERV_FUNC(cmd_addmask) { if (argc < 2) { char *mask = generate_hostmask(user, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT); - int res = nickserv_addmask(user, user->handle_info, mask); + int res = nickserv_addmask(cmd, user, user->handle_info, mask); free(mask); return res; } else { @@ -2415,7 +2418,7 @@ static NICKSERV_FUNC(cmd_addmask) reply("NSMSG_MASK_INVALID", argv[1]); return 0; } - return nickserv_addmask(user, user->handle_info, argv[1]); + return nickserv_addmask(cmd, user, user->handle_info, argv[1]); } } @@ -2424,45 +2427,45 @@ static NICKSERV_FUNC(cmd_oaddmask) struct handle_info *hi; NICKSERV_MIN_PARMS(3); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; - return nickserv_addmask(user, hi, argv[2]); + return nickserv_addmask(cmd, user, hi, argv[2]); } static int -nickserv_delmask(struct userNode *user, struct handle_info *hi, const char *del_mask) +nickserv_delmask(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, const char *del_mask) { unsigned int i; for (i=0; imasks->used; i++) { if (!strcmp(del_mask, hi->masks->list[i])) { char *old_mask = hi->masks->list[i]; if (hi->masks->used == 1) { - send_message(user, nickserv, "NSMSG_DELMASK_NOTLAST"); + reply("NSMSG_DELMASK_NOTLAST"); return 0; } hi->masks->list[i] = hi->masks->list[--hi->masks->used]; - send_message(user, nickserv, "NSMSG_DELMASK_SUCCESS", old_mask); + reply("NSMSG_DELMASK_SUCCESS", old_mask); free(old_mask); return 1; } } - send_message(user, nickserv, "NSMSG_DELMASK_NOT_FOUND"); + reply("NSMSG_DELMASK_NOT_FOUND"); return 0; } static NICKSERV_FUNC(cmd_delmask) { NICKSERV_MIN_PARMS(2); - return nickserv_delmask(user, user->handle_info, argv[1]); + return nickserv_delmask(cmd, user, user->handle_info, argv[1]); } static NICKSERV_FUNC(cmd_odelmask) { struct handle_info *hi; NICKSERV_MIN_PARMS(3); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; - return nickserv_delmask(user, hi, argv[2]); + return nickserv_delmask(cmd, user, hi, argv[2]); } int @@ -2540,7 +2543,7 @@ nickserv_apply_flags(struct userNode *user, struct handle_info *hi, const char * } static void -set_list(struct userNode *user, struct handle_info *hi, int override) +set_list(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, int override) { option_func_t *opt; unsigned int i; @@ -2550,14 +2553,14 @@ set_list(struct userNode *user, struct handle_info *hi, int override) "FAKEHOST", "TITLE", "EPITHET", "ADVANCED" }; - send_message(user, nickserv, "NSMSG_SETTING_LIST"); - send_message(user, nickserv, "NSMSG_SETTING_LIST_HEADER"); + reply("NSMSG_SETTING_LIST"); + reply("NSMSG_SETTING_LIST_HEADER"); /* Do this so options are presented in a consistent order. */ for (i = 0; i < ArrayLength(set_display); ++i) if ((opt = dict_find(nickserv_opt_dict, set_display[i], NULL))) - opt(user, hi, override, 0, NULL); - send_message(user, nickserv, "NSMSG_SETTING_LIST_END"); + opt(cmd, user, hi, override, 0, NULL); + reply("NSMSG_SETTING_LIST_END"); } static NICKSERV_FUNC(cmd_set) @@ -2567,14 +2570,14 @@ static NICKSERV_FUNC(cmd_set) hi = user->handle_info; if (argc < 2) { - set_list(user, hi, 0); + set_list(cmd, user, hi, 0); return 1; } if (!(opt = dict_find(nickserv_opt_dict, argv[1], NULL))) { reply("NSMSG_INVALID_OPTION", argv[1]); return 0; } - return opt(user, hi, 0, argc-1, argv+1); + return opt(cmd, user, hi, 0, argc-1, argv+1); } static NICKSERV_FUNC(cmd_oset) @@ -2584,11 +2587,11 @@ static NICKSERV_FUNC(cmd_oset) NICKSERV_MIN_PARMS(2); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; if (argc < 3) { - set_list(user, hi, 0); + set_list(cmd, user, hi, 0); return 1; } @@ -2597,7 +2600,7 @@ static NICKSERV_FUNC(cmd_oset) return 0; } - return opt(user, hi, 1, argc-2, argv+2); + return opt(cmd, user, hi, 1, argc-2, argv+2); } static OPTION_FUNC(opt_info) @@ -2613,7 +2616,7 @@ static OPTION_FUNC(opt_info) } info = hi->infoline ? hi->infoline : user_find_message(user, "MSG_NONE"); - send_message(user, nickserv, "NSMSG_SET_INFO", info); + reply("NSMSG_SET_INFO", info); return 1; } @@ -2627,7 +2630,7 @@ static OPTION_FUNC(opt_width) else if (hi->screen_width > MAX_LINE_SIZE) hi->screen_width = MAX_LINE_SIZE; - send_message(user, nickserv, "NSMSG_SET_WIDTH", hi->screen_width); + reply("NSMSG_SET_WIDTH", hi->screen_width); return 1; } @@ -2641,7 +2644,7 @@ static OPTION_FUNC(opt_tablewidth) else if (hi->screen_width > MAX_LINE_SIZE) hi->table_width = MAX_LINE_SIZE; - send_message(user, nickserv, "NSMSG_SET_TABLEWIDTH", hi->table_width); + reply("NSMSG_SET_TABLEWIDTH", hi->table_width); return 1; } @@ -2653,12 +2656,12 @@ static OPTION_FUNC(opt_color) else if (disabled_string(argv[1])) HANDLE_CLEAR_FLAG(hi, MIRC_COLOR); else { - send_message(user, nickserv, "MSG_INVALID_BINARY", argv[1]); + reply("MSG_INVALID_BINARY", argv[1]); return 0; } } - send_message(user, nickserv, "NSMSG_SET_COLOR", user_find_message(user, HANDLE_FLAGGED(hi, MIRC_COLOR) ? "MSG_ON" : "MSG_OFF")); + reply("NSMSG_SET_COLOR", user_find_message(user, HANDLE_FLAGGED(hi, MIRC_COLOR) ? "MSG_ON" : "MSG_OFF")); return 1; } @@ -2670,12 +2673,12 @@ static OPTION_FUNC(opt_privmsg) else if (disabled_string(argv[1])) HANDLE_CLEAR_FLAG(hi, USE_PRIVMSG); else { - send_message(user, nickserv, "MSG_INVALID_BINARY", argv[1]); + reply("MSG_INVALID_BINARY", argv[1]); return 0; } } - send_message(user, nickserv, "NSMSG_SET_PRIVMSG", user_find_message(user, HANDLE_FLAGGED(hi, USE_PRIVMSG) ? "MSG_ON" : "MSG_OFF")); + reply("NSMSG_SET_PRIVMSG", user_find_message(user, HANDLE_FLAGGED(hi, USE_PRIVMSG) ? "MSG_ON" : "MSG_OFF")); return 1; } @@ -2687,12 +2690,12 @@ static OPTION_FUNC(opt_autohide) else if (disabled_string(argv[1])) HANDLE_CLEAR_FLAG(hi, AUTOHIDE); else { - send_message(user, nickserv, "MSG_INVALID_BINARY", argv[1]); + reply("MSG_INVALID_BINARY", argv[1]); return 0; } } - send_message(user, nickserv, "NSMSG_SET_AUTOHIDE", user_find_message(user, HANDLE_FLAGGED(hi, AUTOHIDE) ? "MSG_ON" : "MSG_OFF")); + reply("NSMSG_SET_AUTOHIDE", user_find_message(user, HANDLE_FLAGGED(hi, AUTOHIDE) ? "MSG_ON" : "MSG_OFF")); return 1; } @@ -2726,7 +2729,7 @@ static OPTION_FUNC(opt_style) style = "Normal"; } - send_message(user, nickserv, "NSMSG_SET_STYLE", style); + reply("NSMSG_SET_STYLE", style); return 1; } @@ -2742,7 +2745,7 @@ static OPTION_FUNC(opt_announcements) else if (!strcmp(argv[1], "?") || !irccasecmp(argv[1], "default")) hi->announcements = '?'; else { - send_message(user, nickserv, "NSMSG_INVALID_ANNOUNCE", argv[1]); + reply("NSMSG_INVALID_ANNOUNCE", argv[1]); return 0; } } @@ -2753,14 +2756,14 @@ static OPTION_FUNC(opt_announcements) case '?': choice = "default"; break; default: choice = "unknown"; break; } - send_message(user, nickserv, "NSMSG_SET_ANNOUNCEMENTS", choice); + reply("NSMSG_SET_ANNOUNCEMENTS", choice); return 1; } static OPTION_FUNC(opt_password) { if (!override) { - send_message(user, nickserv, "NSMSG_USE_CMD_PASS"); + reply("NSMSG_USE_CMD_PASS"); return 0; } @@ -2770,7 +2773,7 @@ static OPTION_FUNC(opt_password) if (nickserv_conf.sync_log) SyncLog("PASSCHANGE %s %s", hi->handle, hi->passwd); - send_message(user, nickserv, "NSMSG_SET_PASSWORD", "***"); + reply("NSMSG_SET_PASSWORD", "***"); return 1; } @@ -2780,7 +2783,7 @@ static OPTION_FUNC(opt_flags) unsigned int ii, flen; if (!override) { - send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]); + reply("MSG_SETTING_PRIVILEGED", argv[0]); return 0; } @@ -2792,9 +2795,9 @@ static OPTION_FUNC(opt_flags) flags[flen++] = handle_flags[ii]; flags[flen] = '\0'; if (hi->flags) - send_message(user, nickserv, "NSMSG_SET_FLAGS", flags); + reply("NSMSG_SET_FLAGS", flags); else - send_message(user, nickserv, "NSMSG_SET_FLAGS", user_find_message(user, "MSG_NONE")); + reply("NSMSG_SET_FLAGS", user_find_message(user, "MSG_NONE")); return 1; } @@ -2803,25 +2806,25 @@ static OPTION_FUNC(opt_email) if (argc > 1) { const char *str; if (!valid_email(argv[1])) { - send_message(user, nickserv, "NSMSG_BAD_EMAIL_ADDR"); + reply("NSMSG_BAD_EMAIL_ADDR"); return 0; } if ((str = sendmail_prohibited_address(argv[1]))) { - send_message(user, nickserv, "NSMSG_EMAIL_PROHIBITED", argv[1], str); + reply("NSMSG_EMAIL_PROHIBITED", argv[1], str); return 0; } if (hi->email_addr && !irccasecmp(hi->email_addr, argv[1])) - send_message(user, nickserv, "NSMSG_EMAIL_SAME"); + reply("NSMSG_EMAIL_SAME"); else if (!override) nickserv_make_cookie(user, hi, EMAIL_CHANGE, argv[1], 0); else { nickserv_set_email_addr(hi, argv[1]); if (hi->cookie) nickserv_eat_cookie(hi->cookie); - send_message(user, nickserv, "NSMSG_SET_EMAIL", visible_email_addr(user, hi)); + reply("NSMSG_SET_EMAIL", visible_email_addr(user, hi)); } } else - send_message(user, nickserv, "NSMSG_SET_EMAIL", visible_email_addr(user, hi)); + reply("NSMSG_SET_EMAIL", visible_email_addr(user, hi)); return 1; } @@ -2831,13 +2834,13 @@ static OPTION_FUNC(opt_maxlogins) if (argc > 1) { maxlogins = strtoul(argv[1], NULL, 0); if ((maxlogins > nickserv_conf.hard_maxlogins) && !override) { - send_message(user, nickserv, "NSMSG_BAD_MAX_LOGINS", nickserv_conf.hard_maxlogins); + reply("NSMSG_BAD_MAX_LOGINS", nickserv_conf.hard_maxlogins); return 0; } hi->maxlogins = maxlogins; } maxlogins = hi->maxlogins ? hi->maxlogins : nickserv_conf.default_maxlogins; - send_message(user, nickserv, "NSMSG_SET_MAXLOGINS", maxlogins); + reply("NSMSG_SET_MAXLOGINS", maxlogins); return 1; } @@ -2849,12 +2852,12 @@ static OPTION_FUNC(opt_advanced) else if (disabled_string(argv[1])) HANDLE_CLEAR_FLAG(hi, ADVANCED); else { - send_message(user, nickserv, "MSG_INVALID_BINARY", argv[1]); + reply("MSG_INVALID_BINARY", argv[1]); return 0; } } - send_message(user, nickserv, "NSMSG_SET_ADVANCED", user_find_message(user, HANDLE_FLAGGED(hi, ADVANCED) ? "MSG_ON" : "MSG_OFF")); + reply("NSMSG_SET_ADVANCED", user_find_message(user, HANDLE_FLAGGED(hi, ADVANCED) ? "MSG_ON" : "MSG_OFF")); return 1; } @@ -2864,10 +2867,10 @@ static OPTION_FUNC(opt_language) if (argc > 1) { lang = language_find(argv[1]); if (irccasecmp(lang->name, argv[1])) - send_message(user, nickserv, "NSMSG_LANGUAGE_NOT_FOUND", argv[1], lang->name); + reply("NSMSG_LANGUAGE_NOT_FOUND", argv[1], lang->name); hi->language = lang; } - send_message(user, nickserv, "NSMSG_SET_LANGUAGE", hi->language->name); + reply("NSMSG_SET_LANGUAGE", hi->language->name); return 1; } @@ -2904,12 +2907,12 @@ static OPTION_FUNC(opt_level) int res; if (!override) { - send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]); + reply("MSG_SETTING_PRIVILEGED", argv[0]); return 0; } res = (argc > 1) ? oper_try_set_access(user, nickserv, hi, strtoul(argv[1], NULL, 0)) : 0; - send_message(user, nickserv, "NSMSG_SET_LEVEL", hi->opserv_level); + reply("NSMSG_SET_LEVEL", hi->opserv_level); return res; } @@ -2920,7 +2923,7 @@ static OPTION_FUNC(opt_epithet) struct userNode *target, *next_un; if (!override) { - send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]); + reply("MSG_SETTING_PRIVILEGED", argv[0]); return 0; } @@ -2941,37 +2944,47 @@ static OPTION_FUNC(opt_epithet) } if (hi->epithet) - send_message(user, nickserv, "NSMSG_SET_EPITHET", hi->epithet); + reply("NSMSG_SET_EPITHET", hi->epithet); else - send_message(user, nickserv, "NSMSG_SET_EPITHET", user_find_message(user, "MSG_NONE")); + reply("NSMSG_SET_EPITHET", user_find_message(user, "MSG_NONE")); return 1; } static OPTION_FUNC(opt_title) { - const char *title; + char *title; + const char *none; + char *sptr; if ((argc > 1) && oper_has_access(user, nickserv, nickserv_conf.set_title_level, 0)) { if (!override) { - send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]); + reply("MSG_SETTING_PRIVILEGED", argv[0]); return 0; } title = argv[1]; - if (strchr(title, '.')) { - send_message(user, nickserv, "NSMSG_TITLE_INVALID"); - return 0; - } - if ((strlen(user->handle_info->handle) + strlen(title) + - strlen(nickserv_conf.titlehost_suffix) + 2) > HOSTLEN) { - send_message(user, nickserv, "NSMSG_TITLE_TRUNCATED"); - return 0; - } - - free(hi->fakehost); - if (!strcmp(title, "*")) { + if(!strcmp(title, "*")) { + free(hi->fakehost); hi->fakehost = NULL; - } else { + } + else { + if (strchr(title, '.')) { + reply("NSMSG_TITLE_INVALID"); + return 0; + } + /* Alphanumeric titles only. */ + for(sptr = title; *sptr; sptr++) { + if(!isalnum(*sptr) && *sptr != '-') { + reply("NSMSG_TITLE_INVALID"); + return 0; + } + } + if ((strlen(user->handle_info->handle) + strlen(title) + + strlen(nickserv_conf.titlehost_suffix) + 2) > HOSTLEN) { + reply("NSMSG_TITLE_TRUNCATED"); + return 0; + } + free(hi->fakehost); hi->fakehost = malloc(strlen(title)+2); hi->fakehost[0] = '.'; strcpy(hi->fakehost+1, title); @@ -2982,43 +2995,43 @@ static OPTION_FUNC(opt_title) else title = NULL; if (!title) - title = user_find_message(user, "MSG_NONE"); - send_message(user, nickserv, "NSMSG_SET_TITLE", title); + none = user_find_message(user, "MSG_NONE"); + send_message(user, nickserv, "NSMSG_SET_TITLE", title ? title : none); return 1; } int -check_vhost(char *vhost, struct userNode *user) +check_vhost(char *vhost, struct userNode *user, struct svccmd *cmd) { - unsigned int y, depth; - char *hostname; + unsigned int y; // check for a dot in the vhost if(strchr(vhost, '.') == NULL) { - send_message(user, nickserv, "NSMSG_NOT_VALID_FAKEHOST_DOT", vhost); + reply("NSMSG_NOT_VALID_FAKEHOST_DOT", vhost); return 0; } // check for a @ in the vhost if(strchr(vhost, '@') != NULL) { - send_message(user, nickserv, "NSMSG_NOT_VALID_FAKEHOST_AT", vhost); + reply("NSMSG_NOT_VALID_FAKEHOST_AT", vhost); return 0; } // check for denied words, inspired by monk at paki.sex for(y = 0; y < nickserv_conf.denied_fakehost_words->used; y++) { if(strstr(vhost, nickserv_conf.denied_fakehost_words->list[y]) != NULL) { - send_message(user, nickserv, "NSMSG_DENIED_FAKEHOST_WORD", vhost, nickserv_conf.denied_fakehost_words->list[y]); + reply("NSMSG_DENIED_FAKEHOST_WORD", vhost, nickserv_conf.denied_fakehost_words->list[y]); return 0; } } // check for ircu's HOSTLEN length. if(strlen(vhost) >= HOSTLEN) { - send_message(user, nickserv, "NSMSG_NOT_VALID_FAKEHOST_LEN", vhost); + reply("NSMSG_NOT_VALID_FAKEHOST_LEN", vhost); return 0; } + /* This can be handled by the regex now if desired. if (vhost[strspn(vhost, "0123456789.")]) { hostname = vhost + strlen(vhost); for (depth = 1; depth && (hostname > vhost); depth--) { @@ -3026,12 +3039,27 @@ check_vhost(char *vhost, struct userNode *user) while ((hostname > vhost) && (*hostname != '.')) hostname--; } - if (*hostname == '.') hostname++; /* advance past last dot we saw */ + if (*hostname == '.') hostname++; * advance past last dot we saw * if(strlen(hostname) > 4) { - send_message(user, nickserv, "NSMSG_NOT_VALID_FAKEHOST_TLD_LEN", vhost); + reply("NSMSG_NOT_VALID_FAKEHOST_TLD_LEN", vhost); return 0; } } + */ + /* test either regex or as valid handle */ + if (nickserv_conf.valid_fakehost_regex_set) { + int err = regexec(&nickserv_conf.valid_fakehost_regex, vhost, 0, 0, 0); + if (err) { + char buff[256]; + buff[regerror(err, &nickserv_conf.valid_fakehost_regex, buff, sizeof(buff))] = 0; + log_module(NS_LOG, LOG_INFO, "regexec error: %s (%d)", buff, err); + } + if(err == REG_NOMATCH) { + reply("NSMSG_NOT_VALID_FAKEHOST_REGEX", vhost); + return 0; + } + } + return 1; } @@ -3042,39 +3070,48 @@ static OPTION_FUNC(opt_fakehost) if ((argc > 1) && oper_has_access(user, nickserv, nickserv_conf.set_fakehost_level, 0)) { if (!override) { - send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]); + reply("MSG_SETTING_PRIVILEGED", argv[0]); return 0; } fake = argv[1]; if ((strlen(fake) > HOSTLEN) || (fake[0] == '.')) { - send_message(user, nickserv, "NSMSG_FAKEHOST_INVALID", HOSTLEN); + reply("NSMSG_FAKEHOST_INVALID", HOSTLEN); return 0; } - free(hi->fakehost); if (!strcmp(fake, "*")) { - hi->fakehost = NULL; - } else { - if (!check_vhost(argv[1], user)) - return 0; - + if(hi->fakehost) { + free(hi->fakehost); + hi->fakehost = NULL; + } + } + else if (!check_vhost(argv[1], user, cmd)) { + /* check_vhost takes care of error reply */ + return 0; + } + else { + if(hi->fakehost) + free(hi->fakehost); hi->fakehost = strdup(fake); } - fake = hi->fakehost; apply_fakehost(hi); + fake = hi->fakehost; } else { - fake = generate_fakehost(hi); + /* no arg or no access, how did we even GET here? */ + reply("MSG_SETTING_PRIVILEGED", argv[0]); + return 0; } + /* Tell them we set the host */ if (!fake) fake = user_find_message(user, "MSG_NONE"); - send_message(user, nickserv, "NSMSG_SET_FAKEHOST", fake); + reply("NSMSG_SET_FAKEHOST", fake); return 1; } static OPTION_FUNC(opt_note) { if (!override) { - send_message(user, nickserv, "MSG_SETTING_PRIVILEGED", argv[0]); + reply("MSG_SETTING_PRIVILEGED", argv[0]); return 0; } @@ -3092,7 +3129,7 @@ static OPTION_FUNC(opt_note) } } - send_message(user, nickserv, "NSMSG_SET_NOTE", hi->note->note); + reply("NSMSG_SET_NOTE", hi->note->note); return 1; } @@ -3196,7 +3233,7 @@ static NICKSERV_FUNC(cmd_ounregister) struct handle_info *hi; NICKSERV_MIN_PARMS(2); - if (!(hi = get_victim_oper(user, argv[1]))) + if (!(hi = get_victim_oper(cmd, user, argv[1]))) return 0; nickserv_unregister_handle(hi, user, cmd->parent->bot); return 1; @@ -3386,9 +3423,9 @@ static NICKSERV_FUNC(cmd_merge) NICKSERV_MIN_PARMS(3); - if (!(hi_from = get_victim_oper(user, argv[1]))) + if (!(hi_from = get_victim_oper(cmd, user, argv[1]))) return 0; - if (!(hi_to = get_victim_oper(user, argv[2]))) + if (!(hi_to = get_victim_oper(cmd, user, argv[2]))) return 0; if (hi_to == hi_from) { reply("NSMSG_CANNOT_MERGE_SELF", hi_to->handle); @@ -3525,7 +3562,7 @@ struct discrim_apply_info { }; static struct nickserv_discrim * -nickserv_discrim_create(struct userNode *user, unsigned int argc, char *argv[]) +nickserv_discrim_create(struct svccmd *cmd, struct userNode *user, unsigned int argc, char *argv[]) { unsigned int i; struct nickserv_discrim *discrim; @@ -3541,7 +3578,7 @@ nickserv_discrim_create(struct userNode *user, unsigned int argc, char *argv[]) for (i=0; imax_registered = now - ParseInterval(cmp+1) - 1; } } else { - send_message(user, nickserv, "MSG_INVALID_CRITERIA", cmp); + reply("MSG_INVALID_CRITERIA", cmp); } } else if (!irccasecmp(argv[i], "seen")) { discrim->lastseen = now - ParseInterval(argv[++i]); @@ -3575,25 +3612,25 @@ nickserv_discrim_create(struct userNode *user, unsigned int argc, char *argv[]) i++; if (!irccasecmp(argv[i], "exact")) { if (i == argc - 1) { - send_message(user, nickserv, "MSG_MISSING_PARAMS", argv[i]); + reply("MSG_MISSING_PARAMS", argv[i]); goto fail; } discrim->hostmask_type = EXACT; } else if (!irccasecmp(argv[i], "subset")) { if (i == argc - 1) { - send_message(user, nickserv, "MSG_MISSING_PARAMS", argv[i]); + reply("MSG_MISSING_PARAMS", argv[i]); goto fail; } discrim->hostmask_type = SUBSET; } else if (!irccasecmp(argv[i], "superset")) { if (i == argc - 1) { - send_message(user, nickserv, "MSG_MISSING_PARAMS", argv[i]); + reply("MSG_MISSING_PARAMS", argv[i]); goto fail; } discrim->hostmask_type = SUPERSET; } else if (!irccasecmp(argv[i], "lastquit") || !irccasecmp(argv[i], "lastauth")) { if (i == argc - 1) { - send_message(user, nickserv, "MSG_MISSING_PARAMS", argv[i]); + reply("MSG_MISSING_PARAMS", argv[i]); goto fail; } discrim->hostmask_type = LASTQUIT; @@ -3610,7 +3647,7 @@ nickserv_discrim_create(struct userNode *user, unsigned int argc, char *argv[]) } } else if (!irccasecmp(argv[i], "email")) { if (user->handle_info->opserv_level < nickserv_conf.email_search_level) { - send_message(user, nickserv, "MSG_NO_SEARCH_ACCESS", "email"); + reply("MSG_NO_SEARCH_ACCESS", "email"); goto fail; } else if (!irccasecmp(argv[++i], "*")) { discrim->emailmask = 0; @@ -3635,10 +3672,10 @@ nickserv_discrim_create(struct userNode *user, unsigned int argc, char *argv[]) discrim->min_level = strtoul(cmp+1, NULL, 0) + 1; } } else { - send_message(user, nickserv, "MSG_INVALID_CRITERIA", cmp); + reply("MSG_INVALID_CRITERIA", cmp); } } else { - send_message(user, nickserv, "MSG_INVALID_CRITERIA", argv[i]); + reply("MSG_INVALID_CRITERIA", argv[i]); goto fail; } } @@ -3796,7 +3833,7 @@ static NICKSERV_FUNC(cmd_search) if (subcmd && !svccmd_can_invoke(user, nickserv, subcmd, NULL, SVCCMD_NOISY)) return 0; - discrim = nickserv_discrim_create(user, argc-2, argv+2); + discrim = nickserv_discrim_create(cmd, user, argc-2, argv+2); if (!discrim) return 0; @@ -4111,6 +4148,16 @@ nickserv_conf_read(void) } else { nickserv_conf.valid_nick_regex_set = 0; } + str = database_get_data(conf_node, KEY_VALID_FAKEHOST_REGEX, RECDB_QSTRING); + if (nickserv_conf.valid_fakehost_regex_set) + regfree(&nickserv_conf.valid_fakehost_regex); + if (str) { + int err = regcomp(&nickserv_conf.valid_fakehost_regex, str, REG_EXTENDED|REG_ICASE|REG_NOSUB); + nickserv_conf.valid_fakehost_regex_set = !err; + if (err) log_module(NS_LOG, LOG_ERROR, "Bad valid_fakehost_regex (error %d)", err); + } else { + nickserv_conf.valid_fakehost_regex_set = 0; + } str = database_get_data(conf_node, KEY_NICKS_PER_HANDLE, RECDB_QSTRING); if (!str) str = database_get_data(conf_node, KEY_NICKS_PER_ACCOUNT, RECDB_QSTRING);