mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-09 17:38:00 +00:00
cd8a7181fd
The system for handling seat_get_userpass_input has always been structured differently between GUI PuTTY and CLI tools like Plink. In the CLI tools, password input is read directly from the OS terminal/console device by console_get_userpass_input; this means that you need to ensure the same terminal input data _hasn't_ already been consumed by the main event loop and sent on to the backend. This is achieved by the backend_sendok() method, which tells the event loop when the backend has finished issuing password prompts, and hence, when it's safe to start passing standard input to backend_send(). But in the GUI tools, input generated by the terminal window has always been sent straight to backend_send(), regardless of whether backend_sendok() says it wants it. So the terminal-based implementation of username and password prompts has to work by consuming input data that had _already_ been passed to the backend - hence, any backend that needs to do that must keep its input on a bufchain, and pass that bufchain to seat_get_userpass_input. It's awkward that these two totally different systems coexist in the first place. And now that SSH proxying needs to present interactive prompts of its own, it's clear which one should win: the CLI style is the Right Thing. So this change reworks the GUI side of the mechanism to be more similar: terminal data now goes into a queue in the Ldisc, and is not sent on to the backend until the backend says it's ready for it via backend_sendok(). So terminal-based userpass prompts can now consume data directly from that queue during the connection setup stage. As a result, the 'bufchain *' parameter has vanished from all the userpass_input functions (both the official implementations of the Seat trait method, and term_get_userpass_input() to which some of those implementations delegate). The only function that actually used that bufchain, namely term_get_userpass_input(), now instead reads from the ldisc's input queue via a couple of new Ldisc functions. (Not _trivial_ functions, since input buffered by Ldisc can be a mixture of raw bytes and session specials like SS_EOL! The input queue inside Ldisc is a bufchain containing a fiddly binary encoding that can represent an arbitrary interleaving of those things.) This greatly simplifies the calls to seat_get_userpass_input in backends, which now don't have to mess about with passing their own user_input bufchain around, or toggling their want_user_input flag back and forth to request data to put on to that bufchain. But the flip side is that now there has to be some _other_ method for notifying the terminal when there's more input to be consumed during an interactive prompt, and for notifying the backend when prompt input has finished so that it can proceed to the next stage of the protocol. This is done by a pair of extra callbacks: when more data is put on to Ldisc's input queue, it triggers a call to term_get_userpass_input, and when term_get_userpass_input finishes, it calls a callback function provided in the prompts_t. Therefore, any use of a prompts_t which *might* be asynchronous must fill in the latter callback when setting up the prompts_t. In SSH, the callback is centralised into a common PPL helper function, which reinvokes the same PPL's process_queue coroutine; in rlogin we have to set it up ourselves. I'm sorry for this large and sprawling patch: I tried fairly hard to break it up into individually comprehensible sub-patches, but I just couldn't tease out any part of it that would stand sensibly alone. |
||
|---|---|---|
| .. | ||
| utils | ||
| agent-client.c | ||
| be_conpty.c | ||
| cliloop.c | ||
| CMakeLists.txt | ||
| config.c | ||
| conpty.c | ||
| console.c | ||
| controls.c | ||
| cryptoapi.h | ||
| dialog.c | ||
| gss.c | ||
| handle-io.c | ||
| handle-socket.c | ||
| handle-wait.c | ||
| help.c | ||
| help.h | ||
| help.rc2 | ||
| installer.wxs | ||
| jump-list.c | ||
| local-proxy.c | ||
| make_install_images.sh | ||
| msifixup.py | ||
| named-pipe-client.c | ||
| named-pipe-server.c | ||
| network.c | ||
| no-jump-list.c | ||
| nohelp.c | ||
| noise.c | ||
| pageant-rc.h | ||
| pageant.c | ||
| pageant.ico | ||
| pageant.mft | ||
| pageant.rc | ||
| pageants.ico | ||
| platform.h | ||
| plink.c | ||
| plink.rc | ||
| printing.c | ||
| pscp.ico | ||
| pscp.rc | ||
| psftp.rc | ||
| psocks.c | ||
| pterm.c | ||
| pterm.ico | ||
| pterm.rc | ||
| ptermcfg.ico | ||
| putty-common.rc2 | ||
| putty-rc.h | ||
| putty.c | ||
| putty.ico | ||
| putty.mft | ||
| putty.rc | ||
| puttycfg.ico | ||
| puttygen-rc.h | ||
| puttygen.c | ||
| puttygen.ico | ||
| puttygen.mft | ||
| puttygen.rc | ||
| puttyins.ico | ||
| puttytel.mft | ||
| puttytel.rc | ||
| rcstuff.h | ||
| README-msi.txt | ||
| security-api.h | ||
| select-cli.c | ||
| select-gui.c | ||
| serial.c | ||
| sftp.c | ||
| sharing.c | ||
| sizetip.c | ||
| storage.c | ||
| unicode.c | ||
| version.rc2 | ||
| website.url | ||
| win-gui-seat.h | ||
| window.c | ||
| x11.c | ||