X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/180e0971962fa45f6fae9e072d585620ae386d7f..5a1daaaba65bb61921c1274fd8672cb91bae4268:/src/nickserv.c diff --git a/src/nickserv.c b/src/nickserv.c index 35bb29d..e03e984 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -50,6 +50,8 @@ #define KEY_SET_TITLE_LEVEL "set_title_level" #define KEY_SET_FAKEHOST_LEVEL "set_fakehost_level" #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" @@ -157,7 +159,7 @@ static const struct message_entry msgtab[] = { { "NSMSG_HANDLE_ACTIVATED", "Your account is now activated (with the password you entered when you registered). You are now authenticated to your account." }, { "NSMSG_PASSWORD_CHANGED", "You have successfully changed your password to what you requested with the $bresetpass$b command." }, { "NSMSG_EMAIL_PROHIBITED", "%s may not be used as an email address: %s" }, - { "NSMSG_EMAIL_OVERUSED", "There are already the maximum number of accounts associated with that email address." }, + { "NSMSG_EMAIL_OVERUSED", "That email address already has an account. Use RESETPASS if you forgot your password." }, { "NSMSG_EMAIL_SAME", "That is the email address already there; no need to change it." }, { "NSMSG_EMAIL_CHANGED", "You have successfully changed your email address." }, { "NSMSG_BAD_COOKIE_TYPE", "Your account had bad cookie type %d; sorry. I am confused. Please report this bug." }, @@ -295,6 +297,10 @@ static const struct message_entry msgtab[] = { { "NSMSG_SET_EPITHET", "$bEPITHET: $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" @@ -392,6 +398,8 @@ static struct { unsigned long auto_reclaim_delay; unsigned char default_maxlogins; unsigned char hard_maxlogins; + const char *auto_oper; + const char *auto_admin; } nickserv_conf; /* We have 2^32 unique account IDs to use. */ @@ -1321,6 +1329,9 @@ static NICKSERV_FUNC(cmd_register) SyncLog("REGISTER %s %s %s %s", hi->handle, syncpass, email_addr ? email_addr : "0", user->info); } + /* this wont work if email is required .. */ + process_adduser_pending(user); + return 1; } @@ -1410,8 +1421,10 @@ static NICKSERV_FUNC(cmd_handleinfo) reply("NSMSG_HANDLEINFO_DNR", dnr->setter, dnr->reason); if (!oper_outranks(user, hi)) return 1; - } else if (hi != user->handle_info) + } else if (hi != user->handle_info) { + reply("NSMSG_HANDLEINFO_END"); return 1; + } if (nickserv_conf.email_enabled) reply("NSMSG_HANDLEINFO_EMAIL_ADDR", visible_email_addr(user, hi)); @@ -1721,7 +1734,7 @@ static NICKSERV_FUNC(cmd_auth) pw_arg = 1; } else { reply("MSG_MISSING_PARAMS", argv[0]); - svccmd_send_help(user, nickserv, cmd); + svccmd_send_help_brief(user, nickserv, cmd); return 0; } if (!hi) { @@ -1788,7 +1801,29 @@ static NICKSERV_FUNC(cmd_auth) reply("NSMSG_WEAK_PASSWORD"); if (hi->passwd[0] != '$') cryptpass(passwd, hi->passwd); + + /* If a channel was waiting for this user to auth, + * finish adding them */ + process_adduser_pending(user); + reply("NSMSG_AUTH_SUCCESS"); + + if(!IsOper(user)) + { + /* 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; } @@ -2052,6 +2087,8 @@ static NICKSERV_FUNC(cmd_cookie) nickserv_eat_cookie(hi->cookie); + process_adduser_pending(user); + return 1; } @@ -3427,6 +3464,7 @@ nickserv_db_read_handle(const char *handle, dict_t obj) struct string_list *masks, *slist; struct handle_info *hi; struct userNode *authed_users; + struct userData *channels; unsigned long int id; unsigned int ii; dict_t subdb; @@ -3440,10 +3478,13 @@ nickserv_db_read_handle(const char *handle, dict_t obj) } if ((hi = get_handle_info(handle))) { authed_users = hi->users; + channels = hi->channels; hi->users = NULL; + hi->channels = NULL; dict_remove(nickserv_handle_dict, hi->handle); } else { authed_users = NULL; + channels = NULL; } hi = register_handle(handle, str, id); if (authed_users) { @@ -3453,6 +3494,7 @@ nickserv_db_read_handle(const char *handle, dict_t obj) authed_users = authed_users->next_authed; } } + hi->channels = channels; masks = database_get_data(obj, KEY_MASKS, RECDB_STRING_LIST); hi->masks = masks ? string_list_copy(masks) : alloc_string_list(1); str = database_get_data(obj, KEY_MAXLOGINS, RECDB_QSTRING); @@ -3778,6 +3820,13 @@ 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"; + + 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) {