nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

SSH proxying: use CONF_proxy_password if available.

Browse Source 
I was just writing the documentation for the new proxy type, which
caused me to realise that the thing I obviously wanted to write in the
documentation was not actually true. Let's make it true, and then I
can document it!
This commit is contained in:
Simon Tatham 2021-12-30 11:47:58 +00:00
parent b94bdac931
commit 4d1b125885
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
proxy/sshproxy.c
View File

@ -22,6 +22,9 @@ typedef struct SshProxy {
Seat *clientseat; Seat *clientseat;
Interactor *clientitr; Interactor *clientitr;
bool got_proxy_password, tried_proxy_password;
char *proxy_password;
ProxyStderrBuf psb; ProxyStderrBuf psb;
Plug *plug; Plug *plug;
@ -61,6 +64,8 @@ static void sshproxy_close(Socket *s)
backend_free(sp->backend); backend_free(sp->backend);
if (sp->logctx) if (sp->logctx)
log_free(sp->logctx); log_free(sp->logctx);
if (sp->proxy_password)
burnstr(sp->proxy_password);
bufchain_clear(&sp->ssh_to_socket); bufchain_clear(&sp->ssh_to_socket);
delete_callbacks_for_context(sp); delete_callbacks_for_context(sp);
@ -334,6 +339,21 @@ static SeatPromptResult sshproxy_get_userpass_input(Seat *seat, prompts_t *p)
{ {
SshProxy *sp = container_of(seat, SshProxy, seat); SshProxy *sp = container_of(seat, SshProxy, seat);
/*
* If we have a stored proxy_password, use that, via logic similar
* to cmdline_get_passwd_input: we only try it if we're given a
* prompts_t containing exactly one prompt, and that prompt is set
* to non-echoing.
*/
if (sp->got_proxy_password && !sp->tried_proxy_password &&
p->n_prompts == 1 && !p->prompts[0]->echo) {
prompt_set_result(p->prompts[0], sp->proxy_password);
burnstr(sp->proxy_password);
sp->proxy_password = NULL;
sp->tried_proxy_password = true;
return SPR_OK;
}
if (sp->clientseat) { if (sp->clientseat) {
/* /*
* If we have access to the outer Seat, pass this prompt * If we have access to the outer Seat, pass this prompt
@ -556,6 +576,12 @@ Socket *sshproxy_new_connection(SockAddr *addr, const char *hostname,
if (*proxy_username) if (*proxy_username)
conf_set_str(sp->conf, CONF_username, proxy_username); conf_set_str(sp->conf, CONF_username, proxy_username);
const char *proxy_password = conf_get_str(clientconf, CONF_proxy_password);
if (*proxy_password) {
sp->proxy_password = dupstr(proxy_password);
sp->got_proxy_password = true;
}
const struct BackendVtable *backvt = backend_vt_from_proto( const struct BackendVtable *backvt = backend_vt_from_proto(
conf_get_int(sp->conf, CONF_protocol)); conf_get_int(sp->conf, CONF_protocol));