nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

Rlogin: handle user abort at the username prompt.

Browse Source 
While re-testing this backend I realised that we were completely
ignoring the actual return status from seat_get_userpass_input, once
it stops being -1 ("prompt still in progress"). So if the user hits ^C
or ^D at the prompt, e.g. after realising they've started PuTTY in the
wrong mode by mistake, then we press ahead anyway and send a nonsense
username.

Now we interpret that as a request to close the connection.
This commit is contained in:
Simon Tatham 2021-09-14 08:49:08 +01:00
parent 612b293c1e
commit 8e35e6eeae
1 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
otherbackends/rlogin.c
View File

@ -32,7 +32,8 @@ struct Rlogin {
Backend backend; Backend backend;
}; };
static void rlogin_startup(Rlogin *rlogin, const char *ruser); static void rlogin_startup(Rlogin *rlogin, int prompt_result,
const char *ruser);
static void c_write(Rlogin *rlogin, const void *buf, size_t len) static void c_write(Rlogin *rlogin, const void *buf, size_t len)
{ {
@ -66,7 +67,7 @@ static void rlogin_log(Plug *plug, PlugLogType type, SockAddr *addr, int port,
*/ */
/* Next terminal output will come from server */ /* Next terminal output will come from server */
seat_set_trust_status(rlogin->seat, false); seat_set_trust_status(rlogin->seat, false);
rlogin_startup(rlogin, ruser); rlogin_startup(rlogin, 1, ruser);
sfree(ruser); sfree(ruser);
} else { } else {
/* /*
@ -85,7 +86,7 @@ static void rlogin_log(Plug *plug, PlugLogType type, SockAddr *addr, int port,
if (ret >= 0) { if (ret >= 0) {
/* Next terminal output will come from server */ /* Next terminal output will come from server */
seat_set_trust_status(rlogin->seat, false); seat_set_trust_status(rlogin->seat, false);
rlogin_startup(rlogin, prompt_get_result_ref( rlogin_startup(rlogin, ret, prompt_get_result_ref(
rlogin->prompt->prompts[0])); rlogin->prompt->prompts[0]));
} }
} }
@ -166,23 +167,31 @@ static void rlogin_sent(Plug *plug, size_t bufsize)
seat_sent(rlogin->seat, rlogin->bufsize); seat_sent(rlogin->seat, rlogin->bufsize);
} }
static void rlogin_startup(Rlogin *rlogin, const char *ruser) static void rlogin_startup(Rlogin *rlogin, int prompt_result,
const char *ruser)
{ {
char z = 0; char z = 0;
char *p; char *p;
sk_write(rlogin->s, &z, 1); if (prompt_result == 0) {
p = conf_get_str(rlogin->conf, CONF_localusername); /* User aborted at the username prompt. */
sk_write(rlogin->s, p, strlen(p)); sk_close(rlogin->s);
sk_write(rlogin->s, &z, 1); rlogin->s = NULL;
sk_write(rlogin->s, ruser, strlen(ruser)); seat_notify_remote_exit(rlogin->seat);
sk_write(rlogin->s, &z, 1); } else {
p = conf_get_str(rlogin->conf, CONF_termtype); sk_write(rlogin->s, &z, 1);
sk_write(rlogin->s, p, strlen(p)); p = conf_get_str(rlogin->conf, CONF_localusername);
sk_write(rlogin->s, "/", 1); sk_write(rlogin->s, p, strlen(p));
p = conf_get_str(rlogin->conf, CONF_termspeed); sk_write(rlogin->s, &z, 1);
sk_write(rlogin->s, p, strspn(p, "0123456789")); sk_write(rlogin->s, ruser, strlen(ruser));
rlogin->bufsize = sk_write(rlogin->s, &z, 1); sk_write(rlogin->s, &z, 1);
p = conf_get_str(rlogin->conf, CONF_termtype);
sk_write(rlogin->s, p, strlen(p));
sk_write(rlogin->s, "/", 1);
p = conf_get_str(rlogin->conf, CONF_termspeed);
sk_write(rlogin->s, p, strspn(p, "0123456789"));
rlogin->bufsize = sk_write(rlogin->s, &z, 1);
}
rlogin->prompt = NULL; rlogin->prompt = NULL;
} }
@ -311,7 +320,7 @@ static void rlogin_send(Backend *be, const char *buf, size_t len)
if (ret >= 0) { if (ret >= 0) {
/* Next terminal output will come from server */ /* Next terminal output will come from server */
seat_set_trust_status(rlogin->seat, false); seat_set_trust_status(rlogin->seat, false);
rlogin_startup(rlogin, prompt_get_result_ref( rlogin_startup(rlogin, ret, prompt_get_result_ref(
rlogin->prompt->prompts[0])); rlogin->prompt->prompts[0]));
/* that nulls out rlogin->prompt, so then we'll start sending /* that nulls out rlogin->prompt, so then we'll start sending
* data down the wire in the obvious way */ * data down the wire in the obvious way */