X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/b1bf690d5e16c7f79d3ec308ffdc705e007ce6e5..574bfc14685e7a08572ff03e1547f62a370777d6:/src/nickserv.c diff --git a/src/nickserv.c b/src/nickserv.c index 4794e95..d63a35a 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -3,7 +3,7 @@ * * This file is part of x3. * - * srvx is free software; you can redistribute it and/or modify + * x3 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. @@ -27,9 +27,7 @@ #include "sendmail.h" #include "timeq.h" -#ifdef HAVE_REGEX_H #include -#endif #define NICKSERV_CONF_NAME "services/nickserv" @@ -44,12 +42,16 @@ #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" #define KEY_SET_TITLE_LEVEL "set_title_level" #define KEY_SET_FAKEHOST_LEVEL "set_fakehost_level" +#define KEY_DENIED_FAKEHOST_WORDS "denied_fakehost_words" #define KEY_TITLEHOST_SUFFIX "titlehost_suffix" +#define KEY_AUTO_OPER "auto_oper" +#define KEY_AUTO_ADMIN "auto_admin" #define KEY_FLAG_LEVELS "flag_levels" #define KEY_HANDLE_EXPIRE_FREQ "handle_expire_freq" #define KEY_ACCOUNT_EXPIRE_FREQ "account_expire_freq" @@ -70,11 +72,13 @@ #define KEY_COOKIE_TIMEOUT "cookie_timeout" #define KEY_ACCOUNTS_PER_EMAIL "accounts_per_email" #define KEY_EMAIL_SEARCH_LEVEL "email_search_level" +#define KEY_DEFAULT_STYLE "default_style" #define KEY_ID "id" #define KEY_PASSWD "passwd" #define KEY_NICKS "nicks" #define KEY_MASKS "masks" +#define KEY_IGNORES "ignores" #define KEY_OPSERV_LEVEL "opserv_level" #define KEY_FLAGS "flags" #define KEY_REGISTER_ON "register" @@ -98,11 +102,15 @@ #define KEY_ANNOUNCEMENTS "announcements" #define KEY_MAXLOGINS "maxlogins" #define KEY_FAKEHOST "fakehost" +#define KEY_NOTE_NOTE "note" +#define KEY_NOTE_SETTER "setter" +#define KEY_NOTE_DATE "date" + #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*); @@ -118,6 +126,7 @@ struct userNode *nickserv; struct userList curr_helpers; const char *handle_flags = HANDLE_FLAGS; +extern struct string_list *autojoin_channels; static struct module *nickserv_module; static struct service *nickserv_service; static struct log_type *NS_LOG; @@ -166,7 +175,7 @@ static const struct message_entry msgtab[] = { { "NSMSG_ATE_FOREIGN_COOKIE", "I ate the cookie for account $b%s$b. It may now have another." }, { "NSMSG_USE_RENAME", "You are already authenticated to account $b%s$b -- contact the support staff to rename your account." }, { "NSMSG_ALREADY_REGISTERING", "You have already used $bREGISTER$b once this session; you may not use it again." }, - { "NSMSG_REGISTER_BAD_NICKMASK", "Could not recognize $b%s$b as either a current nick or a hostmask." }, + { "NSMSG_REGISTER_BAD_NICKMASK", "You must provide a hostmask, or online nick to generate one automatically. (or set a default hostmask in the config such as *@*)." }, { "NSMSG_NICK_NOT_REGISTERED", "Nick $b%s$b has not been registered to any account." }, { "NSMSG_HANDLE_NOT_FOUND", "Could not find your account -- did you register yet?" }, { "NSMSG_ALREADY_AUTHED", "You are already authed to account $b%s$b; you must reconnect to auth to a different account." }, @@ -176,13 +185,14 @@ static const struct message_entry msgtab[] = { { "NSMSG_USER_PREV_AUTH", "$b%s$b is already authenticated." }, { "NSMSG_USER_PREV_STAMP", "$b%s$b has authenticated to an account once and cannot authenticate again." }, { "NSMSG_BAD_MAX_LOGINS", "MaxLogins must be at most %d." }, + { "NSMSG_BAD_ADVANCED", "Advanced must be either 1 to enable it or 0 to disable it." }, { "NSMSG_LANGUAGE_NOT_FOUND", "Language $b%s$b is not supported; $b%s$b was the closest available match." }, { "NSMSG_MAX_LOGINS", "Your account already has its limit of %d user(s) logged in." }, { "NSMSG_STAMPED_REGISTER", "You have already authenticated to an account once this session; you may not register a new account." }, { "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" }, @@ -201,11 +211,13 @@ static const struct message_entry msgtab[] = { { "NSMSG_HANDLEINFO_INFOLINE", "Infoline: %s" }, { "NSMSG_HANDLEINFO_FLAGS", "Flags: %s" }, { "NSMSG_HANDLEINFO_EPITHET", "Epithet: %s" }, + { "NSMSG_HANDLEINFO_NOTE", "Note (by %s on %s): %s " }, { "NSMSG_HANDLEINFO_FAKEHOST", "Fake host: %s" }, { "NSMSG_HANDLEINFO_LAST_HOST", "Last quit hostmask: %s" }, { "NSMSG_HANDLEINFO_LAST_HOST_UNKNOWN", "Last quit hostmask: Unknown" }, { "NSMSG_HANDLEINFO_NICKS", "Nickname(s): %s" }, { "NSMSG_HANDLEINFO_MASKS", "Hostmask(s): %s" }, + { "NSMSG_HANDLEINFO_IGNORES", "Ignore(s): %s" }, { "NSMSG_HANDLEINFO_CHANNELS", "Channel(s): %s" }, { "NSMSG_HANDLEINFO_CURRENT", "Current nickname(s): %s" }, { "NSMSG_HANDLEINFO_DNR", "Do-not-register (by %s): %s" }, @@ -232,6 +244,8 @@ static const struct message_entry msgtab[] = { { "NSMSG_MASK_INVALID", "$b%s$b is an invalid hostmask." }, { "NSMSG_ADDMASK_ALREADY", "$b%s$b is already a hostmask in your account." }, { "NSMSG_ADDMASK_SUCCESS", "Hostmask %s added." }, + { "NSMSG_ADDIGNORE_ALREADY", "$b%s$b is already an ignored hostmask in your account." }, + { "NSMSG_ADDIGNORE_SUCCESS", "Hostmask %s added." }, { "NSMSG_DELMASK_NOTLAST", "You may not delete your last hostmask." }, { "NSMSG_DELMASK_SUCCESS", "Hostmask %s deleted." }, { "NSMSG_DELMASK_NOT_FOUND", "Unable to find mask to be deleted." }, @@ -286,15 +300,22 @@ static const struct message_entry msgtab[] = { { "NSMSG_SET_PRIVMSG", "$bPRIVMSG: $b%s" }, { "NSMSG_SET_STYLE", "$bSTYLE: $b%s" }, { "NSMSG_SET_ANNOUNCEMENTS", "$bANNOUNCEMENTS: $b%s" }, + { "NSMSG_SET_AUTOHIDE", "$bAUTOHIDE: $b%s" }, { "NSMSG_SET_PASSWORD", "$bPASSWORD: $b%s" }, { "NSMSG_SET_FLAGS", "$bFLAGS: $b%s" }, { "NSMSG_SET_EMAIL", "$bEMAIL: $b%s" }, { "NSMSG_SET_MAXLOGINS", "$bMAXLOGINS: $b%d" }, + { "NSMSG_SET_ADVANCED", "$bADVANCED: $b%s" }, { "NSMSG_SET_LANGUAGE", "$bLANGUAGE: $b%s" }, { "NSMSG_SET_LEVEL", "$bLEVEL: $b%d" }, { "NSMSG_SET_EPITHET", "$bEPITHET: $b%s" }, + { "NSMSG_SET_NOTE", "$bNOTE: $b%s"}, { "NSMSG_SET_TITLE", "$bTITLE: $b%s" }, { "NSMSG_SET_FAKEHOST", "$bFAKEHOST: $b%s" }, + + { "NSMSG_AUTO_OPER", "You have been auto-opered" }, + { "NSMSG_AUTO_OPER_ADMIN", "You have been auto-admined" }, + { "NSEMAIL_ACTIVATION_SUBJECT", "Account verification for %s" }, { "NSEMAIL_ACTIVATION_BODY", "This email has been sent to verify that this email address belongs to the person who tried to register an account on %1$s. Your cookie is:\n" @@ -338,6 +359,12 @@ static const struct message_entry msgtab[] = { { "NSEMAIL_EMAIL_VERIFY_BODY", "This email has been sent to verify that this address belongs to the same person as %5$s on %1$s. Your cookie is %2$s.\nTo verify your address as associated with this account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nIf you did NOT request this email address to be associated with this account, you do not need to do anything. Please contact the %1$s staff if you have questions." }, { "NSEMAIL_ALLOWAUTH_SUBJECT", "Authentication allowed for %s" }, { "NSEMAIL_ALLOWAUTH_BODY", "This email has been sent to let you authenticate (auth) to account %5$s on %1$s. Your cookie is %2$s.\nTo auth to that account, log on to %1$s and type the following command:\n /msg %3$s@%4$s COOKIE %5$s %2$s\nIf you did NOT request this authorization, you do not need to do anything. Please contact the %1$s staff if you have questions." }, + { "NSMSG_NOT_VALID_FAKEHOST_DOT", "$b%s$b is not a valid vhost. (needs at least one dot)" }, + { "NSMSG_NOT_VALID_FAKEHOST_AT", "$b%s$b is not a valid vhost. (it can not have a '@')" }, + { "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 } @@ -356,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; @@ -385,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; @@ -392,6 +421,10 @@ static struct { unsigned long auto_reclaim_delay; unsigned char default_maxlogins; unsigned char hard_maxlogins; + const char *auto_oper; + const char *auto_admin; + char default_style; + struct string_list *denied_fakehost_words; } nickserv_conf; /* We have 2^32 unique account IDs to use. */ @@ -409,6 +442,17 @@ canonicalize_hostmask(char *mask) return mask; } +static struct handle_note * +nickserv_add_note(const char *setter, time_t date, const char *text) +{ + struct handle_note *note = calloc(1, sizeof(*note) + strlen(text)); + + strncpy(note->setter, setter, sizeof(note->setter)-1); + note->date = date; + memcpy(note->note, text, strlen(text)); + return note; +} + static struct handle_info * register_handle(const char *handle, const char *passwd, UNUSED_ARG(unsigned long id)) { @@ -533,12 +577,14 @@ free_handle_info(void *vhi) #endif free_string_list(hi->masks); + free_string_list(hi->ignores); assert(!hi->users); while (hi->nicks) delete_nick(hi->nicks); free(hi->infoline); free(hi->epithet); + free(hi->note); free(hi->fakehost); if (hi->cookie) { timeq_del(hi->cookie->expires, nickserv_free_cookie, hi->cookie, 0); @@ -556,23 +602,30 @@ free_handle_info(void *vhi) static void set_user_handle_info(struct userNode *user, struct handle_info *hi, int stamp); static void -nickserv_unregister_handle(struct handle_info *hi, struct userNode *notify) +nickserv_unregister_handle(struct handle_info *hi, struct userNode *notify, struct userNode *bot) { unsigned int n; + struct userNode *uNode; for (n=0; nusers) + while (hi->users) { + if (nickserv_conf.sync_log) { + uNode = GetUserH(hi->users->nick); + if (uNode) + irc_delete(uNode); + } set_user_handle_info(hi->users, NULL, 0); + } if (notify) { if (nickserv_conf.disable_nicks) - send_message(notify, nickserv, "NSMSG_UNREGISTER_SUCCESS", hi->handle); + send_message(notify, bot, "NSMSG_UNREGISTER_SUCCESS", hi->handle); else - send_message(notify, nickserv, "NSMSG_UNREGISTER_NICKS_SUCCESS", hi->handle); + send_message(notify, bot, "NSMSG_UNREGISTER_NICKS_SUCCESS", hi->handle); } if (nickserv_conf.sync_log) - SyncLog("UNREGISTER %s", hi->handle); + SyncLog("UNREGISTER %s", hi->handle); dict_remove(nickserv_handle_dict, hi->handle); } @@ -684,6 +737,7 @@ is_registerable_nick(const char *nick) } return 1; } +/* this has been replaced with one in tools.c static int is_valid_email_addr(const char *email) @@ -691,6 +745,8 @@ is_valid_email_addr(const char *email) return strchr(email, '@') != NULL; } +*/ + static const char * visible_email_addr(struct userNode *user, struct handle_info *hi) { @@ -739,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) { @@ -751,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; } -static struct handle_info * -get_victim_oper(struct userNode *user, const char *target) +struct handle_info * +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))) @@ -765,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 @@ -794,6 +850,8 @@ is_secure_password(const char *handle, const char *pass, struct userNode *user) { unsigned int i, len; unsigned int cnt_digits = 0, cnt_upper = 0, cnt_lower = 0; + int p; + len = strlen(pass); if (len < nickserv_conf.password_min_length) { if (user) @@ -805,8 +863,8 @@ is_secure_password(const char *handle, const char *pass, struct userNode *user) send_message(user, nickserv, "NSMSG_PASSWORD_ACCOUNT"); return 0; } - dict_find(nickserv_conf.weak_password_dict, pass, &i); - if (i) { + dict_find(nickserv_conf.weak_password_dict, pass, &p); + if (p) { if (user) send_message(user, nickserv, "NSMSG_PASSWORD_DICTIONARY"); return 0; @@ -895,6 +953,17 @@ apply_fakehost(struct handle_info *handle) assign_fakehost(target, fake, 1); } +void send_func_list(struct userNode *user) +{ + unsigned int n; + struct handle_info *old_info; + + old_info = user->handle_info; + + for (n=0; nhandle_info = hi; if (hi && !hi->users && !hi->opserv_level) HANDLE_CLEAR_FLAG(hi, HELPING); - for (n=0; nnick)) { + for (n=0; nloc = 1; + if (hi) { struct nick_info *ni; @@ -945,6 +1019,7 @@ set_user_handle_info(struct userNode *user, struct handle_info *hi, int stamp) for (other = hi->users; other; other = other->next_authed) send_message(other, nickserv, "NSMSG_CLONE_AUTH", user->nick, user->ident, user->hostname); } + user->next_authed = hi->users; hi->users = user; hi->lastseen = now; @@ -1009,6 +1084,7 @@ nickserv_register(struct userNode *user, struct userNode *settee, const char *ha cryptpass(passwd, crypted); hi = register_handle(handle, crypted, 0); hi->masks = alloc_string_list(1); + hi->ignores = alloc_string_list(1); hi->users = NULL; hi->language = lang_C; hi->registered = now; @@ -1197,6 +1273,7 @@ nickserv_set_email_addr(struct handle_info *hi, const char *new_email_addr) static NICKSERV_FUNC(cmd_register) { + irc_in_addr_t ip; struct handle_info *hi; const char *email_addr, *password; char syncpass[MD5_CRYPT_LENGTH]; @@ -1242,7 +1319,7 @@ static NICKSERV_FUNC(cmd_register) email_addr = argv[3]; /* Check that the email address looks valid.. */ - if (!is_valid_email_addr(email_addr)) { + if (!valid_email(email_addr)) { reply("NSMSG_BAD_EMAIL_ADDR"); return 0; } @@ -1290,7 +1367,7 @@ static NICKSERV_FUNC(cmd_register) string_list_append(hi->masks, strdup("*@*")); } else { string_list_append(hi->masks, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT)); - if (user->ip.s_addr && user->hostname[strspn(user->hostname, "0123456789.")]) + if (irc_in_addr_is_valid(user->ip) && !irc_pton(&ip, NULL, user->hostname)) string_list_append(hi->masks, generate_hostmask(user, GENMASK_OMITNICK|GENMASK_BYIP|GENMASK_NO_HIDING|GENMASK_ANY_IDENT)); } @@ -1314,7 +1391,7 @@ static NICKSERV_FUNC(cmd_register) if (nickserv_conf.sync_log) { cryptpass(password, syncpass); /* - * An 0 is only sent if theres no email address. Thios should only happen if email functions are + * An 0 is only sent if theres no email address. Thios should only happen if email functions are * disabled which they wont be for us. Email Required MUST be set on if you are using this. * -SiRVulcaN */ @@ -1329,48 +1406,159 @@ static NICKSERV_FUNC(cmd_register) static NICKSERV_FUNC(cmd_oregister) { - char *mask; - struct userNode *settee; + struct userNode *settee = NULL; struct handle_info *hi; + char* account = NULL; + char* pass = NULL; + char* email = NULL; + char* mask = NULL; + char* nick = NULL; - NICKSERV_MIN_PARMS(4); - - if (!is_valid_handle(argv[1])) { - reply("NSMSG_BAD_HANDLE", argv[1]); - return 0; + NICKSERV_MIN_PARMS(3); + + account = argv[1]; + pass = argv[2]; + if (nickserv_conf.email_required) { + NICKSERV_MIN_PARMS(4); + email = argv[3]; + if (argc >= 5) {/* take: "acct pass email mask nick" or "acct pass email mask" or "acct pass email nick" */ + if (strchr(argv[4], '@') || argc >= 6) /* If @, its mask not nick */ + mask = argv[4]; + else + nick = argv[4]; + } + if (argc >= 6) { + nick = argv[5]; + } } - - if (strchr(argv[3], '@')) { - mask = canonicalize_hostmask(strdup(argv[3])); - if (argc > 4) { - settee = GetUserH(argv[4]); - if (!settee) { - reply("MSG_NICK_UNKNOWN", argv[4]); - free(mask); - return 0; - } - } else { - settee = NULL; - } - } else if ((settee = GetUserH(argv[3]))) { - mask = generate_hostmask(settee, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT); - } else { - reply("NSMSG_REGISTER_BAD_NICKMASK", argv[3]); - return 0; + else { + if (argc >= 4) {/* take: "account pass mask nick" or "account pass mask" or "account pass nick" */ + if (strchr(argv[3], '@') || argc >= 5) /* If @, its mask not nick */ + mask = argv[3]; + else + nick = argv[3]; + } + if (argc >= 5) { + nick = argv[4]; + } + } + /* If they passed a nick, look for that user.. */ + if (nick && !(settee = GetUserH(nick))) { + reply("MSG_NICK_UNKNOWN", argv[4]); + return 0; } + /* If the setee is already authed, we cant add a 2nd account for them.. */ if (settee && settee->handle_info) { reply("NSMSG_USER_PREV_AUTH", settee->nick); - free(mask); return 0; } - if (!(hi = nickserv_register(user, settee, argv[1], argv[2], 0))) { - free(mask); - return 0; + /* If there is no default mask in the conf, and they didn't pass a mask, + * but we did find a user by nick, generate the mask */ + if (!mask) { + if (nickserv_conf.default_hostmask) + mask = "*@*"; + else if (settee) + mask = generate_hostmask(settee, GENMASK_OMITNICK|GENMASK_NO_HIDING|GENMASK_ANY_IDENT); + else { + reply("NSMSG_REGISTER_BAD_NICKMASK"); + return 0; + } + } + + if (!(hi = nickserv_register(user, settee, account, pass, 0))) { + return 0; /* error reply handled by above */ + } + if (email) { + nickserv_set_email_addr(hi, email); + } + if (mask) { + char* mask_canonicalized = canonicalize_hostmask(strdup(mask)); + string_list_append(hi->masks, mask_canonicalized); } - string_list_append(hi->masks, mask); + + if (nickserv_conf.sync_log) + SyncLog("REGISTER %s %s %s %s", hi->handle, hi->passwd, email ? email : "@", user->info); /* Send just @ for email if none */ return 1; } +static int +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])) { + reply("NSMSG_ADDIGNORE_ALREADY", new_mask); + free(new_mask); + return 0; + } + } + string_list_append(hi->ignores, new_mask); + reply("NSMSG_ADDIGNORE_SUCCESS", new_mask); + + for (target = hi->users; target; target = target->next_authed) { + irc_silence(target, new_mask, 1); + } + return 1; +} + +static NICKSERV_FUNC(cmd_addignore) +{ + NICKSERV_MIN_PARMS(2); + + return nickserv_ignore(cmd, user, user->handle_info, argv[1]); +} + +static NICKSERV_FUNC(cmd_oaddignore) +{ + struct handle_info *hi; + + NICKSERV_MIN_PARMS(3); + if (!(hi = get_victim_oper(cmd, user, argv[1]))) + return 0; + + return nickserv_ignore(cmd, user, hi, argv[2]); +} + +static int +nickserv_delignore(struct svccmd *cmd, struct userNode *user, struct handle_info *hi, char *del_mask) +{ + unsigned int i; + struct userNode *target; + char *pmask = strdup(pretty_mask(del_mask)); + for (i=0; iignores->used; i++) { + 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]; + reply("NSMSG_DELMASK_SUCCESS", old_mask); + for (target = hi->users; target; target = target->next_authed) { + irc_silence(target, old_mask, 0); + } + free(old_mask); + free(pmask); + return 1; + } + } + reply("NSMSG_DELMASK_NOT_FOUND"); + return 0; +} + +static NICKSERV_FUNC(cmd_delignore) +{ + NICKSERV_MIN_PARMS(2); + 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(cmd, user, argv[1]))) + return 0; + return nickserv_delignore(cmd, user, hi, argv[2]); +} + static NICKSERV_FUNC(cmd_handleinfo) { char buff[400]; @@ -1411,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"); @@ -1452,6 +1640,16 @@ static NICKSERV_FUNC(cmd_handleinfo) reply("NSMSG_HANDLEINFO_EPITHET", (hi->epithet ? hi->epithet : nsmsg_none)); } + if (IsHelping(user) || IsOper(user)) + { + if (hi->note) + { + char date[64]; + strftime(date, 64, "%b %d %Y", localtime(&hi->note->date)); + reply("NSMSG_HANDLEINFO_NOTE", hi->note->setter, date, hi->note->note); + } + } + if (hi->fakehost) reply("NSMSG_HANDLEINFO_FAKEHOST", (hi->fakehost ? hi->fakehost : handle_find_message(hi, "MSG_NONE"))); @@ -1505,6 +1703,26 @@ static NICKSERV_FUNC(cmd_handleinfo) reply("NSMSG_HANDLEINFO_MASKS", nsmsg_none); } + if (hi->ignores->used) { + for (i=0; i < hi->ignores->used; i++) { + herelen = strlen(hi->ignores->list[i]); + if (pos + herelen + 1 > ArrayLength(buff)) { + i--; + goto print_ignore_buff; + } + memcpy(buff+pos, hi->ignores->list[i], herelen); + pos += herelen; buff[pos++] = ' '; + if (i+1 == hi->ignores->used) { + print_ignore_buff: + buff[pos-1] = 0; + reply("NSMSG_HANDLEINFO_IGNORES", buff); + pos = 0; + } + } + } else { + reply("NSMSG_HANDLEINFO_IGNORES", nsmsg_none); + } + if (hi->channels) { struct userData *channel, *next; char *name; @@ -1585,11 +1803,12 @@ static NICKSERV_FUNC(cmd_nickinfo) static NICKSERV_FUNC(cmd_rename_handle) { struct handle_info *hi; + struct userNode *uNode; char msgbuf[MAXLEN], *old_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]); @@ -1611,6 +1830,15 @@ static NICKSERV_FUNC(cmd_rename_handle) for (nn=0; nnhandle_info->handle, old_handle, hi->handle); + + + if (nickserv_conf.sync_log) { + for (uNode = hi->users; uNode; uNode = uNode->next_authed) + irc_rename(uNode, hi->handle); + + SyncLog("RENAME %s %s", old_handle, hi->handle); + } + reply("NSMSG_HANDLE_CHANGED", old_handle, hi->handle); global_message(MESSAGE_RECIPIENT_STAFF, msgbuf); free(old_handle); @@ -1793,9 +2021,34 @@ static NICKSERV_FUNC(cmd_auth) reply("NSMSG_WEAK_PASSWORD"); if (hi->passwd[0] != '$') cryptpass(passwd, hi->passwd); - reply("NSMSG_AUTH_SUCCESS"); + /* If a channel was waiting for this user to auth, + * finish adding them */ process_adduser_pending(user); + + reply("NSMSG_AUTH_SUCCESS"); + + + /* Set +x if autohide is on */ + if(HANDLE_FLAGGED(hi, AUTOHIDE)) + irc_umode(user, "+x"); + + if(!IsOper(user)) /* If they arnt already opered.. */ + { + /* Auto Oper users with Opserv access -Life4Christ 8-10-2005 */ + if( nickserv_conf.auto_admin[0] && hi->opserv_level >= opserv_conf_admin_level()) + { + irc_umode(user,nickserv_conf.auto_admin); + reply("NSMSG_AUTO_OPER_ADMIN"); + } + else if (nickserv_conf.auto_oper[0] && hi->opserv_level > 0) + { + irc_umode(user,nickserv_conf.auto_oper); + reply("NSMSG_AUTO_OPER"); + } + } + + /* Wipe out the pass for the logs */ argv[pw_arg] = "****"; return 1; } @@ -1929,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) { @@ -2040,7 +2293,8 @@ static NICKSERV_FUNC(cmd_cookie) * This should only happen if an OREGISTER was sent. Require * email must be enabled! - SiRVulcaN */ - SyncLog("REGISTER %s %s %s %s", hi->handle, hi->passwd, hi->cookie->data, user->info); + if (nickserv_conf.sync_log) + SyncLog("REGISTER %s %s %s %s", hi->handle, hi->passwd, hi->cookie->data, user->info); } nickserv_set_email_addr(hi, hi->cookie->data); reply("NSMSG_EMAIL_CHANGED"); @@ -2136,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; } @@ -2156,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 { @@ -2164,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]); } } @@ -2173,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 @@ -2289,24 +2543,24 @@ 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; char *set_display[] = { - "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", /* "STYLE", */ - "EMAIL", "ANNOUNCEMENTS", "MAXLOGINS", "LANGUAGE", - "FAKEHOST", "TITLE", "EPITHET" + "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", "STYLE", + "EMAIL", "ANNOUNCEMENTS", "AUTOHIDE", "MAXLOGINS", "LANGUAGE", + "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) @@ -2316,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) @@ -2333,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; } @@ -2346,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) @@ -2362,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; } @@ -2376,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; } @@ -2390,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; } @@ -2402,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; } @@ -2419,40 +2673,65 @@ 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; +} + +static OPTION_FUNC(opt_autohide) +{ + if (argc > 1) { + if (enabled_string(argv[1])) + HANDLE_SET_FLAG(hi, AUTOHIDE); + else if (disabled_string(argv[1])) + HANDLE_CLEAR_FLAG(hi, AUTOHIDE); + else { + reply("MSG_INVALID_BINARY", argv[1]); + return 0; + } + } + + reply("NSMSG_SET_AUTOHIDE", user_find_message(user, HANDLE_FLAGGED(hi, AUTOHIDE) ? "MSG_ON" : "MSG_OFF")); return 1; } -/* static OPTION_FUNC(opt_style) { char *style; if (argc > 1) { - if (!irccasecmp(argv[1], "Zoot")) - hi->userlist_style = HI_STYLE_ZOOT; - else if (!irccasecmp(argv[1], "def")) - hi->userlist_style = HI_STYLE_DEF; - } + if (!irccasecmp(argv[1], "Clean")) + hi->userlist_style = HI_STYLE_CLEAN; + else if (!irccasecmp(argv[1], "Advanced")) + hi->userlist_style = HI_STYLE_ADVANCED; + else if (!irccasecmp(argv[1], "Classic")) + hi->userlist_style = HI_STYLE_CLASSIC; + else /* Default to normal */ + hi->userlist_style = HI_STYLE_NORMAL; + } /* TODO: give error if unknow style is chosen */ switch (hi->userlist_style) { - case HI_STYLE_DEF: - style = "def"; - break; - case HI_STYLE_ZOOT: - default: - style = "Zoot"; - } - - send_message(user, nickserv, "NSMSG_SET_STYLE", style); + case HI_STYLE_ADVANCED: + style = "Advanced"; + break; + case HI_STYLE_CLASSIC: + style = "Classic"; + break; + case HI_STYLE_CLEAN: + style = "Clean"; + break; + case HI_STYLE_NORMAL: + default: + style = "Normal"; + } + + reply("NSMSG_SET_STYLE", style); return 1; } -*/ static OPTION_FUNC(opt_announcements) { @@ -2466,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; } } @@ -2477,21 +2756,24 @@ 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; } if (argc > 1) cryptpass(argv[1], hi->passwd); - send_message(user, nickserv, "NSMSG_SET_PASSWORD", "***"); + if (nickserv_conf.sync_log) + SyncLog("PASSCHANGE %s %s", hi->handle, hi->passwd); + + reply("NSMSG_SET_PASSWORD", "***"); return 1; } @@ -2501,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; } @@ -2513,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; } @@ -2523,26 +2805,26 @@ static OPTION_FUNC(opt_email) { if (argc > 1) { const char *str; - if (!is_valid_email_addr(argv[1])) { - send_message(user, nickserv, "NSMSG_BAD_EMAIL_ADDR"); + if (!valid_email(argv[1])) { + 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; } @@ -2552,13 +2834,30 @@ 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; +} + +static OPTION_FUNC(opt_advanced) +{ + if (argc > 1) { + if (enabled_string(argv[1])) + HANDLE_SET_FLAG(hi, ADVANCED); + else if (disabled_string(argv[1])) + HANDLE_CLEAR_FLAG(hi, ADVANCED); + else { + reply("MSG_INVALID_BINARY", argv[1]); + return 0; + } + } + + reply("NSMSG_SET_ADVANCED", user_find_message(user, HANDLE_FLAGGED(hi, ADVANCED) ? "MSG_ON" : "MSG_OFF")); return 1; } @@ -2568,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; } @@ -2608,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; } @@ -2621,8 +2920,10 @@ static OPTION_FUNC(opt_epithet) { if ((argc > 1) && oper_has_access(user, nickserv, nickserv_conf.set_epithet_level, 0)) { char *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; } @@ -2634,40 +2935,56 @@ static OPTION_FUNC(opt_epithet) hi->epithet = NULL; else hi->epithet = strdup(epithet); + + for (target = hi->users; target; target = next_un) { + irc_swhois(nickserv, target, hi->epithet); + + next_un = target->next_authed; + } } 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); @@ -2678,38 +2995,141 @@ 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, struct svccmd *cmd) +{ + unsigned int y; + + // check for a dot in the vhost + if(strchr(vhost, '.') == NULL) { + reply("NSMSG_NOT_VALID_FAKEHOST_DOT", vhost); + return 0; + } + + // check for a @ in the vhost + if(strchr(vhost, '@') != NULL) { + 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) { + 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) { + 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--) { + hostname--; + while ((hostname > vhost) && (*hostname != '.')) hostname--; + } + + if (*hostname == '.') hostname++; * advance past last dot we saw * + if(strlen(hostname) > 4) { + 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; +} + static OPTION_FUNC(opt_fakehost) { const char *fake; 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 (!strcmp(fake, "*")) { + 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); - } else - fake = generate_fakehost(hi); + fake = hi->fakehost; + } else { + /* 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) { + reply("MSG_SETTING_PRIVILEGED", argv[0]); + return 0; + } + + if (argc > 1) { + char *text = unsplit_string(argv + 1, argc - 1, NULL); + + if (hi->note) + free(hi->note); + + if ((text[0] == '*') && !text[1]) + hi->note = NULL; + else { + if (!(hi->note = nickserv_add_note(user->handle_info->handle, now, text))) + hi->note = NULL; + } + } + + reply("NSMSG_SET_NOTE", hi->note->note); return 1; } @@ -2799,7 +3219,7 @@ static NICKSERV_FUNC(cmd_unregister) passwd = argv[1]; argv[1] = "****"; if (checkpass(passwd, hi->passwd)) { - nickserv_unregister_handle(hi, user); + nickserv_unregister_handle(hi, user, cmd->parent->bot); return 1; } else { log_module(NS_LOG, LOG_INFO, "Account '%s' tried to unregister with the wrong password.", hi->handle); @@ -2813,9 +3233,9 @@ 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); + nickserv_unregister_handle(hi, user, cmd->parent->bot); return 1; } @@ -2913,6 +3333,14 @@ nickserv_saxdb_write(struct saxdb_context *ctx) { saxdb_write_string(ctx, KEY_EMAIL_ADDR, hi->email_addr); if (hi->epithet) saxdb_write_string(ctx, KEY_EPITHET, hi->epithet); + if (hi->note) { + saxdb_start_record(ctx, KEY_NOTE_NOTE, 0); + saxdb_write_string(ctx, KEY_NOTE_SETTER, hi->note->setter); + saxdb_write_int(ctx, KEY_NOTE_DATE, hi->note->date); + saxdb_write_string(ctx, KEY_NOTE_NOTE, hi->note->note); + saxdb_end_record(ctx); + } + if (hi->fakehost) saxdb_write_string(ctx, KEY_FAKEHOST, hi->fakehost); if (hi->flags) { @@ -2934,6 +3362,8 @@ nickserv_saxdb_write(struct saxdb_context *ctx) { saxdb_write_int(ctx, KEY_LAST_SEEN, hi->lastseen); if (hi->masks->used) saxdb_write_string_list(ctx, KEY_MASKS, hi->masks); + if (hi->ignores->used) + saxdb_write_string_list(ctx, KEY_IGNORES, hi->ignores); if (hi->maxlogins) saxdb_write_int(ctx, KEY_MAXLOGINS, hi->maxlogins); if (hi->nicks) { @@ -2961,6 +3391,7 @@ nickserv_saxdb_write(struct saxdb_context *ctx) { saxdb_write_string(ctx, KEY_USERLIST_STYLE, flags); saxdb_end_record(ctx); } + return 0; } @@ -2992,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); @@ -3025,6 +3456,16 @@ static NICKSERV_FUNC(cmd_merge) string_list_append(hi_to->masks, strdup(mask)); } + /* Merge the ignores. */ + for (ii=0; iiignores->used; ii++) { + char *ignore = hi_from->ignores->list[ii]; + for (jj=0; jjignores->used; jj++) + if (match_ircglobs(hi_to->ignores->list[jj], ignore)) + break; + if (jj==hi_to->ignores->used) /* Nothing from the "to" handle covered this mask, so add it. */ + string_list_append(hi_to->ignores, strdup(ignore)); + } + /* Merge the lists of authed users. */ if (hi_to->users) { for (last_user=hi_to->users; last_user->next_authed; last_user=last_user->next_authed) ; @@ -3094,7 +3535,7 @@ static NICKSERV_FUNC(cmd_merge) global_message(MESSAGE_RECIPIENT_STAFF, buffer); /* Unregister the "from" handle. */ - nickserv_unregister_handle(hi_from, NULL); + nickserv_unregister_handle(hi_from, NULL, cmd->parent->bot); return 1; } @@ -3121,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; @@ -3137,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]); @@ -3171,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; @@ -3206,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; @@ -3231,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; } } @@ -3317,7 +3758,7 @@ static void search_unregister_func (struct userNode *source, struct handle_info *match) { if (oper_has_access(source, nickserv, match->opserv_level, 0)) - nickserv_unregister_handle(match, source); + nickserv_unregister_handle(match, source, nickserv); // XXX nickserv hard coded } static int @@ -3348,7 +3789,7 @@ nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd) qsort(hil.list, hil.used, sizeof(hil.list[0]), nickserv_sort_accounts_by_access); tbl.length = hil.used + 1; tbl.width = 2; - tbl.flags = TABLE_NO_FREE; + tbl.flags = TABLE_NO_FREE | TABLE_REPEAT_ROWS | TABLE_REPEAT_HEADERS; tbl.contents = malloc(tbl.length * sizeof(tbl.contents[0])); tbl.contents[0] = ary = malloc(tbl.width * sizeof(ary[0])); ary[0] = "Account"; @@ -3360,7 +3801,7 @@ nickserv_show_oper_accounts(struct userNode *user, struct svccmd *cmd) tbl.contents[++ii] = ary; } table_send(cmd->parent->bot, user->nick, 0, NULL, tbl); - reply("MSG_MATCH_COUNT", hil.used); + /*reply("MSG_MATCH_COUNT", hil.used); */ for (ii = 0; ii < hil.used; ii++) free(tbl.contents[ii]); free(tbl.contents); @@ -3392,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; @@ -3433,13 +3874,15 @@ static void nickserv_db_read_handle(const char *handle, dict_t obj) { const char *str; - struct string_list *masks, *slist; + struct string_list *masks, *slist, *ignores; struct handle_info *hi; struct userNode *authed_users; struct userData *channels; unsigned long int id; unsigned int ii; dict_t subdb; + char *setter, *note; + time_t date; str = database_get_data(obj, KEY_ID, RECDB_QSTRING); id = str ? strtoul(str, NULL, 0) : 0; @@ -3469,6 +3912,8 @@ nickserv_db_read_handle(const char *handle, dict_t obj) hi->channels = channels; masks = database_get_data(obj, KEY_MASKS, RECDB_STRING_LIST); hi->masks = masks ? string_list_copy(masks) : alloc_string_list(1); + ignores = database_get_data(obj, KEY_IGNORES, RECDB_STRING_LIST); + hi->ignores = ignores ? string_list_copy(ignores) : alloc_string_list(1); str = database_get_data(obj, KEY_MAXLOGINS, RECDB_QSTRING); hi->maxlogins = str ? strtoul(str, NULL, 0) : 0; str = database_get_data(obj, KEY_LANGUAGE, RECDB_QSTRING); @@ -3495,7 +3940,7 @@ nickserv_db_read_handle(const char *handle, dict_t obj) hi->flags |= 1 << (handle_inverse_flags[(unsigned char)str[ii]] - 1); } str = database_get_data(obj, KEY_USERLIST_STYLE, RECDB_QSTRING); - hi->userlist_style = str ? str[0] : HI_STYLE_ZOOT; + hi->userlist_style = str ? str[0] : HI_DEFAULT_STYLE; str = database_get_data(obj, KEY_ANNOUNCEMENTS, RECDB_QSTRING); hi->announcements = str ? str[0] : '?'; str = database_get_data(obj, KEY_SCREEN_WIDTH, RECDB_QSTRING); @@ -3513,9 +3958,23 @@ nickserv_db_read_handle(const char *handle, dict_t obj) str = database_get_data(obj, KEY_EPITHET, RECDB_QSTRING); if (str) hi->epithet = strdup(str); + subdb = database_get_data(obj, KEY_NOTE_NOTE, RECDB_OBJECT); + if (subdb) { + setter = database_get_data(subdb, KEY_NOTE_SETTER, RECDB_QSTRING); + str = database_get_data(subdb, KEY_NOTE_DATE, RECDB_QSTRING); + date = str ? (time_t)strtoul(str, NULL, 0) : now; + note = database_get_data(subdb, KEY_NOTE_NOTE, RECDB_QSTRING); + if (setter && date && note) + { + if (!(hi->note = nickserv_add_note(setter, date, note))) + hi->note = NULL; + } + } + str = database_get_data(obj, KEY_FAKEHOST, RECDB_QSTRING); if (str) hi->fakehost = strdup(str); + subdb = database_get_data(obj, KEY_COOKIE, RECDB_OBJECT); if (subdb) { const char *data, *type, *expires, *cookie_str; @@ -3612,7 +4071,7 @@ expire_handles(UNUSED_ARG(void *data)) expiry = hi->channels ? nickserv_conf.handle_expire_delay : nickserv_conf.nochan_handle_expire_delay; if ((now - hi->lastseen) > expiry) { log_module(NS_LOG, LOG_INFO, "Expiring account %s for inactivity.", hi->handle); - nickserv_unregister_handle(hi, NULL); + nickserv_unregister_handle(hi, NULL, NULL); } } @@ -3661,6 +4120,7 @@ nickserv_conf_read(void) dict_t conf_node, child; const char *str; dict_iterator_t it; + struct string_list *strlist; if (!(conf_node = conf_get_data(NICKSERV_CONF_NAME, RECDB_OBJECT))) { log_module(NS_LOG, LOG_ERROR, "config node `%s' is missing or has wrong type.", NICKSERV_CONF_NAME); @@ -3688,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); @@ -3792,6 +4262,27 @@ nickserv_conf_read(void) nickserv_conf.email_search_level = str ? strtoul(str, NULL, 0) : 600; str = database_get_data(conf_node, KEY_TITLEHOST_SUFFIX, RECDB_QSTRING); nickserv_conf.titlehost_suffix = str ? str : "example.net"; + + free_string_list(nickserv_conf.denied_fakehost_words); + strlist = database_get_data(conf_node, KEY_DENIED_FAKEHOST_WORDS, RECDB_STRING_LIST); + if(strlist) + strlist = string_list_copy(strlist); + else { + strlist = alloc_string_list(4); + string_list_append(strlist, strdup("sex")); + string_list_append(strlist, strdup("fuck")); + } + nickserv_conf.denied_fakehost_words = strlist; + + str = database_get_data(conf_node, KEY_DEFAULT_STYLE, RECDB_QSTRING); + nickserv_conf.default_style = str ? str[0] : HI_DEFAULT_STYLE; + + str = database_get_data(conf_node, KEY_AUTO_OPER, RECDB_QSTRING); + nickserv_conf.auto_oper = str ? str : ""; + + str = database_get_data(conf_node, KEY_AUTO_ADMIN, RECDB_QSTRING); + nickserv_conf.auto_admin = str ? str : ""; + str = conf_get_data("server/network", RECDB_QSTRING); nickserv_conf.network_name = str ? str : "some IRC network"; if (!nickserv_conf.auth_policer_params) { @@ -3978,6 +4469,7 @@ nickserv_db_cleanup(void) void init_nickserv(const char *nick) { + struct chanNode *chan; unsigned int i; NS_LOG = log_register_type("NickServ", "file:nickserv.log"); reg_new_user_func(handle_new_user); @@ -3995,6 +4487,7 @@ init_nickserv(const char *nick) conf_register_reload(nickserv_conf_read); nickserv_opt_dict = dict_new(); nickserv_email_dict = dict_new(); + dict_set_free_keys(nickserv_email_dict, free); dict_set_free_data(nickserv_email_dict, nickserv_free_email_addr); @@ -4039,6 +4532,11 @@ init_nickserv(const char *nick) dict_insert(nickserv_opt_dict, "EMAIL", opt_email); } nickserv_define_func("GHOST", cmd_ghost, -1, 1, 0); + /* ignore commands */ + nickserv_define_func("ADDIGNORE", cmd_addignore, -1, 1, 0); + nickserv_define_func("OADDIGNORE", cmd_oaddignore, 0, 1, 0); + nickserv_define_func("DELIGNORE", cmd_delignore, -1, 1, 0); + nickserv_define_func("ODELIGNORE", cmd_odelignore, 0, 1, 0); /* miscellaneous commands */ nickserv_define_func("STATUS", cmd_status, -1, 0, 0); nickserv_define_func("SEARCH", cmd_search, 100, 1, 0); @@ -4051,19 +4549,22 @@ init_nickserv(const char *nick) dict_insert(nickserv_opt_dict, "TABLEWIDTH", opt_tablewidth); dict_insert(nickserv_opt_dict, "COLOR", opt_color); dict_insert(nickserv_opt_dict, "PRIVMSG", opt_privmsg); -/* dict_insert(nickserv_opt_dict, "STYLE", opt_style); */ + dict_insert(nickserv_opt_dict, "AUTOHIDE", opt_autohide); + dict_insert(nickserv_opt_dict, "STYLE", opt_style); dict_insert(nickserv_opt_dict, "PASS", opt_password); dict_insert(nickserv_opt_dict, "PASSWORD", opt_password); dict_insert(nickserv_opt_dict, "FLAGS", opt_flags); dict_insert(nickserv_opt_dict, "ACCESS", opt_level); dict_insert(nickserv_opt_dict, "LEVEL", opt_level); dict_insert(nickserv_opt_dict, "EPITHET", opt_epithet); + dict_insert(nickserv_opt_dict, "NOTE", opt_note); if (nickserv_conf.titlehost_suffix) { dict_insert(nickserv_opt_dict, "TITLE", opt_title); dict_insert(nickserv_opt_dict, "FAKEHOST", opt_fakehost); } dict_insert(nickserv_opt_dict, "ANNOUNCEMENTS", opt_announcements); dict_insert(nickserv_opt_dict, "MAXLOGINS", opt_maxlogins); + dict_insert(nickserv_opt_dict, "ADVANCED", opt_advanced); dict_insert(nickserv_opt_dict, "LANGUAGE", opt_language); nickserv_handle_dict = dict_new(); @@ -4089,5 +4590,13 @@ init_nickserv(const char *nick) reg_exit_func(nickserv_db_cleanup); if(nickserv_conf.handle_expire_frequency) timeq_add(now + nickserv_conf.handle_expire_frequency, expire_handles, NULL); + + if(autojoin_channels && nickserv) { + for (i = 0; i < autojoin_channels->used; i++) { + chan = AddChannel(autojoin_channels->list[i], now, "+nt", NULL, NULL); + AddChannelUser(nickserv, chan)->modes |= MODE_CHANOP; + } + } + message_register_table(msgtab); }