X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/0f3e9cfc4b5d0f13085c975e10c0e6c4c8e5fbc3..512d7958d12cef042c7324ad086cced98dc720bf:/src/nickserv.c diff --git a/src/nickserv.c b/src/nickserv.c index f9db488..9137435 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. @@ -49,6 +49,7 @@ #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" @@ -78,6 +79,7 @@ #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" @@ -125,6 +127,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; @@ -173,7 +176,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." }, @@ -183,6 +186,7 @@ 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." }, @@ -214,6 +218,7 @@ static const struct message_entry msgtab[] = { { "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" }, @@ -240,6 +245,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." }, @@ -294,11 +301,12 @@ 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_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" }, @@ -352,6 +360,11 @@ 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)" }, { "CHECKPASS_YES", "Yes." }, { "CHECKPASS_NO", "No." }, { NULL, NULL } @@ -409,6 +422,7 @@ static struct { 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. */ @@ -561,6 +575,7 @@ free_handle_info(void *vhi) #endif free_string_list(hi->masks); + free_string_list(hi->ignores); assert(!hi->users); while (hi->nicks) @@ -794,7 +809,7 @@ oper_outranks(struct userNode *user, struct handle_info *hi) { return 0; } -static struct handle_info * +struct handle_info * get_victim_oper(struct userNode *user, const char *target) { struct handle_info *hi; @@ -1067,6 +1082,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; @@ -1255,6 +1271,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]; @@ -1348,7 +1365,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)); } @@ -1387,60 +1404,158 @@ 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(nickserv_conf.email_required ? 4 : 3); - - 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) { - if (!valid_email(argv[4])) { - reply("NSMSG_BAD_EMAIL_ADDR"); - return 0; + 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(nickserv_conf.email_required ? argv[5] : argv[4]); - if (!settee) { - reply("MSG_NICK_UNKNOWN", nickserv_conf.email_required ? argv[5] : 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))) { - if (nickserv_conf.email_required) { - nickserv_set_email_addr(hi, argv[4]); - if (nickserv_conf.sync_log) - SyncLog("REGISTER %s %s %s %s", hi->handle, hi->passwd, argv[4], user->info); + /* 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; } - free(mask); - return 0; } - string_list_append(hi->masks, mask); + + 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); + } + + 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 userNode *user, struct handle_info *hi, const char *mask) +{ + unsigned int i; + struct userNode *target; + char *new_mask = pretty_mask(strdup(mask)); + for (i=0; iignores->used; i++) { + if (!irccasecmp(new_mask, hi->ignores->list[i])) { + send_message(user, nickserv, "NSMSG_ADDIGNORE_ALREADY", new_mask); +/* free(new_mask); i hate glibc */ + return 0; + } + } + string_list_append(hi->ignores, new_mask); + send_message(user, nickserv, "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(user, user->handle_info, argv[1]); +} + +static NICKSERV_FUNC(cmd_oaddignore) +{ + struct handle_info *hi; + + NICKSERV_MIN_PARMS(3); + if (!(hi = get_victim_oper(user, argv[1]))) + return 0; + + return nickserv_ignore(user, hi, argv[2]); +} + +static int +nickserv_delignore(struct userNode *user, struct handle_info *hi, const char *del_mask) +{ + unsigned int i; + struct userNode *target; + char *dmask = pretty_mask(strdup(del_mask)); + for (i=0; iignores->used; i++) { + if (!strcmp(dmask, 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); + for (target = hi->users; target; target = target->next_authed) { + irc_silence(user, old_mask, 0); + } +/* free(old_mask); i hate glibc */ + return 1; + } + } + send_message(user, nickserv, "NSMSG_DELMASK_NOT_FOUND"); + return 0; +} + +static NICKSERV_FUNC(cmd_delignore) +{ + NICKSERV_MIN_PARMS(2); + return nickserv_delignore(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]))) + return 0; + return nickserv_delignore(user, hi, argv[2]); +} + static NICKSERV_FUNC(cmd_handleinfo) { char buff[400]; @@ -1585,6 +1700,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; @@ -2412,7 +2547,7 @@ set_list(struct userNode *user, struct handle_info *hi, int override) char *set_display[] = { "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", "STYLE", "EMAIL", "ANNOUNCEMENTS", "AUTOHIDE", "MAXLOGINS", "LANGUAGE", - "FAKEHOST", "TITLE", "EPITHET" + "FAKEHOST", "TITLE", "EPITHET", "ADVANCED" }; send_message(user, nickserv, "NSMSG_SETTING_LIST"); @@ -2570,6 +2705,8 @@ static OPTION_FUNC(opt_style) 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 */ @@ -2578,6 +2715,9 @@ static OPTION_FUNC(opt_style) case HI_STYLE_ADVANCED: style = "Advanced"; break; + case HI_STYLE_CLASSIC: + style = "Classic"; + break; case HI_STYLE_CLEAN: style = "Clean"; break; @@ -2701,6 +2841,23 @@ static OPTION_FUNC(opt_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 { + send_message(user, nickserv, "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")); + return 1; +} + static OPTION_FUNC(opt_language) { struct language *lang; @@ -2760,6 +2917,8 @@ 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]); return 0; @@ -2773,6 +2932,12 @@ 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) @@ -2822,6 +2987,55 @@ static OPTION_FUNC(opt_title) return 1; } +int +check_vhost(char *vhost, struct userNode *user) +{ + unsigned int y, depth; + char *hostname; + + // check for a dot in the vhost + if(strchr(vhost, '.') == NULL) { + send_message(user, nickserv, "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); + 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]); + return 0; + } + } + + // check for ircu's HOSTLEN length. + if(strlen(vhost) >= HOSTLEN) { + send_message(user, nickserv, "NSMSG_NOT_VALID_FAKEHOST_LEN", vhost); + return 0; + } + + 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) { + send_message(user, nickserv, "NSMSG_NOT_VALID_FAKEHOST_TLD_LEN", vhost); + return 0; + } + } + + return 1; +} + static OPTION_FUNC(opt_fakehost) { const char *fake; @@ -2838,14 +3052,19 @@ static OPTION_FUNC(opt_fakehost) return 0; } free(hi->fakehost); - if (!strcmp(fake, "*")) + if (!strcmp(fake, "*")) { hi->fakehost = NULL; - else + } else { + if (!check_vhost(argv[1], user)) + return 0; + hi->fakehost = strdup(fake); + } fake = hi->fakehost; apply_fakehost(hi); - } else + } else { fake = generate_fakehost(hi); + } if (!fake) fake = user_find_message(user, "MSG_NONE"); send_message(user, nickserv, "NSMSG_SET_FAKEHOST", fake); @@ -3106,6 +3325,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) { @@ -3133,6 +3354,7 @@ nickserv_saxdb_write(struct saxdb_context *ctx) { saxdb_write_string(ctx, KEY_USERLIST_STYLE, flags); saxdb_end_record(ctx); } + return 0; } @@ -3197,6 +3419,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) ; @@ -3605,7 +3837,7 @@ 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; @@ -3643,6 +3875,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); @@ -3703,6 +3937,7 @@ nickserv_db_read_handle(const char *handle, dict_t obj) 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; @@ -3848,6 +4083,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); @@ -3980,6 +4216,17 @@ nickserv_conf_read(void) 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; @@ -4175,6 +4422,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); @@ -4192,6 +4440,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); @@ -4236,6 +4485,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); @@ -4263,6 +4517,7 @@ init_nickserv(const char *nick) } 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(); @@ -4288,5 +4543,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); }