mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 01:18:00 +00:00
f4519b6533
This allows you to set a flag in conio_setup() which causes the returned ConsoleIO object to interpret all its output as UTF-8, by translating it to UTF-16 and using WriteConsoleW to write it in Unicode. Similarly, input is read using ReadConsoleW and decoded from UTF-16 to UTF-8. This flag is set to false in most places, to avoid making sudden breaking changes. But when we're about to present a prompts_t to the user, it's set from the new 'utf8' flag in that prompt, which in turn is set by the userauth layer in any case where the prompts are going to the server. The idea is that this should be the start of a fix for the long- standing character-set handling bug that strings transmitted during SSH userauth (usernames, passwords, k-i prompts and responses) are all supposed to be in UTF-8, but we've always encoded them in whatever our input system happens to be using, and not done any tidying up on them. We get occasional complaints about this from users whose passwords contain characters that are encoded differently between UTF-8 and their local encoding, but I've never got round to fixing it because it's a large piece of engineering. Indeed, this isn't nearly the end of it. The next step is to add UTF-8 support to all the _other_ ways of presenting a prompts_t, as best we can. Like the previous change to console handling, it seems very likely that this will break someone's workflow. So there's a fallback command-line option '-legacy-charset-handling' to revert to PuTTY's previous behaviour.
71 lines
1.5 KiB
C
71 lines
1.5 KiB
C
/*
|
|
* Functions for making, destroying, and manipulating prompts_t
|
|
* structures.
|
|
*/
|
|
|
|
#include "putty.h"
|
|
|
|
prompts_t *new_prompts(void)
|
|
{
|
|
prompts_t *p = snew(prompts_t);
|
|
p->prompts = NULL;
|
|
p->n_prompts = p->prompts_size = 0;
|
|
p->data = NULL;
|
|
p->spr = SPR_INCOMPLETE;
|
|
p->to_server = true; /* to be on the safe side */
|
|
p->name = p->instruction = NULL;
|
|
p->name_reqd = p->instr_reqd = false;
|
|
p->callback = NULL;
|
|
p->callback_ctx = NULL;
|
|
p->ldisc_ptr_to_us = NULL;
|
|
p->utf8 = false;
|
|
return p;
|
|
}
|
|
|
|
void add_prompt(prompts_t *p, char *promptstr, bool echo)
|
|
{
|
|
prompt_t *pr = snew(prompt_t);
|
|
pr->prompt = promptstr;
|
|
pr->echo = echo;
|
|
pr->result = strbuf_new_nm();
|
|
sgrowarray(p->prompts, p->prompts_size, p->n_prompts);
|
|
p->prompts[p->n_prompts++] = pr;
|
|
}
|
|
|
|
void prompt_set_result(prompt_t *pr, const char *newstr)
|
|
{
|
|
strbuf_clear(pr->result);
|
|
put_dataz(pr->result, newstr);
|
|
}
|
|
|
|
const char *prompt_get_result_ref(prompt_t *pr)
|
|
{
|
|
return pr->result->s;
|
|
}
|
|
|
|
char *prompt_get_result(prompt_t *pr)
|
|
{
|
|
return dupstr(pr->result->s);
|
|
}
|
|
|
|
void free_prompts(prompts_t *p)
|
|
{
|
|
size_t i;
|
|
|
|
/* If an Ldisc currently knows about us, tell it to forget us, so
|
|
* it won't dereference a stale pointer later. */
|
|
if (p->ldisc_ptr_to_us)
|
|
*p->ldisc_ptr_to_us = NULL;
|
|
|
|
for (i=0; i < p->n_prompts; i++) {
|
|
prompt_t *pr = p->prompts[i];
|
|
strbuf_free(pr->result);
|
|
sfree(pr->prompt);
|
|
sfree(pr);
|
|
}
|
|
sfree(p->prompts);
|
|
sfree(p->name);
|
|
sfree(p->instruction);
|
|
sfree(p);
|
|
}
|