jcs
/subtext
/amendments
/508
session: Allow guest/signup/new logins to be mixed-case
Also use GUEST_USERNAME everywhere instead of a hard-coded "guest"
string
jcs made amendment 508 4 months ago
--- logger.c Mon Apr 10 16:45:22 2023
+++ logger.c Thu May 4 17:29:46 2023
@@ -221,7 +221,7 @@ logger_update_title(void)
strlcat(logger_title, "Logged in: ", sizeof(logger_title));
strlcat(logger_title,
- sessions[n]->user ? sessions[n]->user->username : "guest",
+ sessions[n]->user ? sessions[n]->user->username : GUEST_USERNAME,
sizeof(logger_title));
}
--- session.c Thu Apr 27 09:08:50 2023
+++ session.c Thu May 4 17:31:27 2023
@@ -206,7 +206,7 @@ session_run(struct uthread *uthread, void *arg)
if (s->user && s->user->is_sysop &&
(waiting = session_first_waiting_for_sysop())) {
session_printf(s, "\r\n{{B}}%s{{/B}} paged sysop, answer? [Y/n] ",
- waiting->user ? waiting->user->username : "guest");
+ waiting->user ? waiting->user->username : GUEST_USERNAME);
session_flush(s);
sc = session_input_char(s);
@@ -527,7 +527,7 @@ session_log(struct session *session, const char *str)
{
return logger_printf("[%s] [%s] %s", session->node,
session->logged_in ?
- (session->user ? session->user->username : "guest") : "-",
+ (session->user ? session->user->username : GUEST_USERNAME) : "-",
str);
}
@@ -1156,14 +1156,14 @@ session_login(struct session *s)
}
}
- if (strcmp(username, GUEST_USERNAME) == 0) {
+ if (strcasecmp(username, GUEST_USERNAME) == 0) {
session_logf(s, "Successful guest login in as %s", username);
xfree(&username);
return AUTH_USER_GUEST;
}
- if ((strcmp(username, "signup") == 0 ||
- strcmp(username, "new") == 0) && db->config.open_signup) {
+ if ((strcasecmp(username, "signup") == 0 ||
+ strcasecmp(username, "new") == 0) && db->config.open_signup) {
session_logf(s, "Successful guest signup login in as %s",
username);
xfree(&username);
@@ -1527,8 +1527,8 @@ session_page_sysop(struct session *s)
session_logf(s, "Paging sysop: %s", message);
- progress("Page from %s: %s", s->user ? s->user->username : "guest",
- message);
+ progress("Page from %s: %s",
+ s->user ? s->user->username : GUEST_USERNAME, message);
SysBeep(30);
uthread_yield();
@@ -1573,7 +1573,7 @@ session_answer_page(struct session *s)
progress(NULL);
session_logf(s, "Answering page from %s on %s",
- waiting->user ? waiting->user->username : "guest",
+ waiting->user ? waiting->user->username : GUEST_USERNAME,
waiting->node);
/* point paging user's chatting_with_node to ours */