X-Git-Url: https://jfr.im/git/irc/evilnet/x3.git/blobdiff_plain/4ae3fc8b27c4079fd907efa2b3198e2467a708db..cc5d8f7fd0dd5ef035eb4288f8a1f4045172c8d1:/src/nickserv.c?ds=sidebyside diff --git a/src/nickserv.c b/src/nickserv.c index d1f94cb..c7214e4 100644 --- a/src/nickserv.c +++ b/src/nickserv.c @@ -72,6 +72,7 @@ #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" @@ -100,6 +101,10 @@ #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-_" @@ -203,6 +208,7 @@ 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" }, @@ -296,6 +302,7 @@ static const struct message_entry msgtab[] = { { "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" }, @@ -401,6 +408,7 @@ static struct { unsigned char hard_maxlogins; const char *auto_oper; const char *auto_admin; + char default_style; } nickserv_conf; /* We have 2^32 unique account IDs to use. */ @@ -418,6 +426,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)) { @@ -548,6 +567,7 @@ free_handle_info(void *vhi) 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); @@ -700,6 +720,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) @@ -707,6 +728,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) { @@ -1277,7 +1300,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; } @@ -1368,19 +1391,26 @@ static NICKSERV_FUNC(cmd_oregister) struct userNode *settee; struct handle_info *hi; - NICKSERV_MIN_PARMS(4); + NICKSERV_MIN_PARMS(nickserv_conf.email_required ? 5 : 4); if (!is_valid_handle(argv[1])) { reply("NSMSG_BAD_HANDLE", argv[1]); return 0; } + if (nickserv_conf.email_required) { + if (!valid_email(argv[4])) { + reply("NSMSG_BAD_EMAIL_ADDR"); + return 0; + } + } + if (strchr(argv[3], '@')) { mask = canonicalize_hostmask(strdup(argv[3])); if (argc > 4) { - settee = GetUserH(argv[4]); + settee = GetUserH(nickserv_conf.email_required ? argv[5] : argv[4]); if (!settee) { - reply("MSG_NICK_UNKNOWN", argv[4]); + reply("MSG_NICK_UNKNOWN", nickserv_conf.email_required ? argv[5] : argv[4]); free(mask); return 0; } @@ -1399,6 +1429,11 @@ static NICKSERV_FUNC(cmd_oregister) 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); + } free(mask); return 0; } @@ -1487,6 +1522,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"))); @@ -2110,7 +2155,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"); @@ -2364,7 +2410,7 @@ set_list(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", */ + "INFO", "WIDTH", "TABLEWIDTH", "COLOR", "PRIVMSG", "STYLE", "EMAIL", "ANNOUNCEMENTS", "AUTOHIDE", "MAXLOGINS", "LANGUAGE", "FAKEHOST", "TITLE", "EPITHET" }; @@ -2515,31 +2561,34 @@ static OPTION_FUNC(opt_autohide) 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 /* 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"; + case HI_STYLE_ADVANCED: + style = "Advanced"; + break; + case HI_STYLE_CLEAN: + style = "Clean"; + break; + case HI_STYLE_NORMAL: + default: + style = "Normal"; } send_message(user, nickserv, "NSMSG_SET_STYLE", style); return 1; } -*/ static OPTION_FUNC(opt_announcements) { @@ -2613,7 +2662,7 @@ static OPTION_FUNC(opt_email) { if (argc > 1) { const char *str; - if (!is_valid_email_addr(argv[1])) { + if (!valid_email(argv[1])) { send_message(user, nickserv, "NSMSG_BAD_EMAIL_ADDR"); return 0; } @@ -2803,6 +2852,31 @@ static OPTION_FUNC(opt_fakehost) return 1; } +static OPTION_FUNC(opt_note) +{ + if (!override) { + send_message(user, nickserv, "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; + } + } + + send_message(user, nickserv, "NSMSG_SET_NOTE", hi->note->note); + return 1; +} + static NICKSERV_FUNC(cmd_reclaim) { struct handle_info *hi; @@ -3003,6 +3077,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) { @@ -3530,6 +3612,8 @@ nickserv_db_read_handle(const char *handle, dict_t obj) 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; @@ -3585,7 +3669,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); @@ -3603,6 +3687,19 @@ 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); @@ -3883,6 +3980,9 @@ nickserv_conf_read(void) 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_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 : ""; @@ -4149,13 +4249,14 @@ init_nickserv(const char *nick) dict_insert(nickserv_opt_dict, "COLOR", opt_color); dict_insert(nickserv_opt_dict, "PRIVMSG", opt_privmsg); dict_insert(nickserv_opt_dict, "AUTOHIDE", opt_autohide); -/* dict_insert(nickserv_opt_dict, "STYLE", opt_style); */ + 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);