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

Use StripCtrlChars to sanitise the SSH banner.

Browse Source 
Now the banner can contain printable Unicode while still having escape
characters removed, in a way that works in both console and GUI
applications.

In the case of SSH banners, ssh2userauth.c does the sanitisation
itself, so it has to use the new Seat method to get an appropriately
configured StripCtrlChars.

(This wasn't an issue for the prompts_t system, because sanitisation
of prompt text is devolved to the local implementation of the prompt
system, in case a local implementation wants to present prompts in a
way that doesn't need sanitisation in any case, e.g. a dialog box.)
This commit is contained in:
Simon Tatham 2019-03-05 21:13:48 +00:00
parent d60dcc2c82
commit b9c74e84dc
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ssh2userauth.c
View File

@ -77,6 +77,9 @@ struct ssh2_userauth_state {
agent_pending_query *auth_agent_query;
bufchain banner;
bufchain_sink banner_bs;
StripCtrlChars *banner_scc;
bool banner_scc_initialised;
PacketProtocolLayer ppl;
};
@ -139,6 +142,7 @@ PacketProtocolLayer *ssh2_userauth_new(
s->shgss = shgss;
s->last_methods_string = strbuf_new();
bufchain_init(&s->banner);
bufchain_sink_init(&s->banner_bs, &s->banner);
return &s->ppl;
}
@ -168,6 +172,8 @@ static void ssh2_userauth_free(PacketProtocolLayer *ppl)
sfree(s->hostname);
sfree(s->fullhostname);
strbuf_free(s->last_methods_string);
if (s->banner_scc)
stripctrl_free(s->banner_scc);
sfree(s);
}
@ -182,7 +188,15 @@ static void ssh2_userauth_filter_queue(struct ssh2_userauth_state *s)
string = get_string(pktin);
if (string.len > BANNER_LIMIT - bufchain_size(&s->banner))
string.len = BANNER_LIMIT - bufchain_size(&s->banner);
sanitise_term_data(&s->banner, string.ptr, string.len);
if (!s->banner_scc_initialised) {
s->banner_scc = seat_stripctrl_new(
s->ppl.seat, BinarySink_UPCAST(&s->banner_bs), false, 0);
s->banner_scc_initialised = true;
}
if (s->banner_scc)
put_datapl(s->banner_scc, string);
else
put_datapl(&s->banner_bs, string);
pq_pop(s->ppl.in_pq);
break;