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

userauth: ensure banner output is printed when connection closes.

Browse Source 
This should fix the bug mentioned three commits ago: if an SSH server
sends a userauth banner and then immediately slams the connection
shut (with or without SSH_MSG_DISCONNECT), the banner message should
now be reliably printed to the user, which is important if that's
where the server put its explanation for the disconnection (e.g. "Your
account has expired").

(cherry picked from commit e8becb45b5)
This commit is contained in:
Simon Tatham 2023-04-29 11:37:17 +01:00
parent 0dee089252
commit d51b30ef49
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ssh/userauth2-client.c
View File

@ -132,6 +132,7 @@ static bool ssh2_userauth_ki_setup_prompts(
static bool ssh2_userauth_ki_run_prompts(struct ssh2_userauth_state *s);
static void ssh2_userauth_ki_write_responses(
struct ssh2_userauth_state *s, BinarySink *bs);
static void ssh2_userauth_final_output(PacketProtocolLayer *ppl);
static void ssh2_userauth_print_banner(struct ssh2_userauth_state *s);
@ -142,7 +143,7 @@ static const PacketProtocolLayerVtable ssh2_userauth_vtable = {
.special_cmd = ssh2_userauth_special_cmd,
.reconfigure = ssh2_userauth_reconfigure,
.queued_data_size = ssh_ppl_default_queued_data_size,
.final_output = ssh_ppl_default_final_output,
.final_output = ssh2_userauth_final_output,
.name = "ssh-userauth",
};
@ -2551,3 +2552,23 @@ static void ssh2_userauth_reconfigure(PacketProtocolLayer *ppl, Conf *conf)
container_of(ppl, struct ssh2_userauth_state, ppl);
ssh_ppl_reconfigure(s->successor_layer, conf);
}
static void ssh2_userauth_final_output(PacketProtocolLayer *ppl)
{
struct ssh2_userauth_state *s =
container_of(ppl, struct ssh2_userauth_state, ppl);
/*
* Check for any unconsumed banner packets that might have landed
* in our queue just before the server closed the connection, and
* add them to our banner buffer.
*/
for (PktIn *pktin = pq_first(s->ppl.in_pq); pktin != NULL;
pktin = pq_next(s->ppl.in_pq, pktin)) {
if (pktin->type == SSH2_MSG_USERAUTH_BANNER)
ssh2_userauth_handle_banner_packet(s, pktin);
}
/* And now make sure we've shown the banner, before exiting */
ssh2_userauth_print_banner(s);
}