60 Commits (64c446d9c0efd472298ac6a51a56d7869b17c404)

Author	SHA1	Message	Date
Toshio Kuratomi	03127dcfae	remove the stdin return value from connection plugin exec_command() methods ... The value was useless -- unused by the callers and always hardcoded to the empty string.	10 years ago
Abhijit Menon-Sen	40f608a377	A bit more debugging output ... We used to display input chunks earlier anyway, so this isn't making things more verbose.	10 years ago
Abhijit Menon-Sen	9700d9c04f	Fix typo in checking select results ... It's possible for more than one fd to be set, so 'elif' is obviously not the right thing to use.	10 years ago
James Cammarata	9e734df0ec	Conditionally poll longer if we're still waiting for an auth prompt	10 years ago
James Cammarata	2898e000a0	Don't use the connection timeout for the select poll timeout	10 years ago
Abhijit Menon-Sen	587054db2a	Send initial data before calling select whenever possible ... Without this, we could execute «ssh -q ...» and call select(), which would timeout after the default 10s, and only then send initial data. (This is a relic of the earlier change where we always ran ssh with -vvv, so the situation where it would sit quietly never happened in practice; but this would have been the right thing to do even then.)	10 years ago
Abhijit Menon-Sen	ac98fe9e89	Implement ssh connection handling as a state machine ... The event loop (even after it was brought into one place in _run in the previous commit) was hard to follow. The states and transitions weren't clear or documented, and the privilege escalation code was non-blocking while the rest was blocking. Now we have a state machine with four states: awaiting_prompt, awaiting_escalation, ready_to_send (initial data), and awaiting_exit. The actions in each state and the transitions between then are clearly documented. The check_incorrect_password() method no longer checks for empty strings (since they will always match), and check_become_success() uses equality rather than a substring match to avoid thinking an echoed command is an indication of successful escalation. Also adds a check_missing_password connection method to detect the error from sudo -n/doas -n.	10 years ago
Abhijit Menon-Sen	840a32bc08	Reorganise ssh.py to cleanly separate responsibilities ... The main exec_command/put_file/fetch_file methods now _build_command and call _run to handle input from/output to the ssh process. The purpose is to bring connection handling together in one place so that the locking doesn't have to be split across functions. Note that this doesn't change the privilege escalation and connection IO code at all—just puts it all into one function. Most of the changes are just moving code from one place to another (e.g. from _connect to _build_command, from _exec_command and _communicate to _run), but there are some other notable changes: 1. We test for the existence of sshpass the first time we need to use password authentication, and remember the result. 2. We set _persistent in _build_command if we're using ControlPersist, for later use in close(). (The detection could be smarter.) 3. Some apparently inadvertent inconsistencies between put_file and fetch_file (e.g. argument quoting, sftp -b use) have been removed. Also reorders functions into a logical sequence, removes unused imports and functions, etc. Aside: the high-level EXEC/PUT/FETCH description should really be logged from ConnectionBase, while individual subclasses log transport-specific details.	10 years ago
Brian Coca	b6d6c2e4db	corrected all missing paths changes	10 years ago
Brian Coca	4aea1f6568	normalized plugin paths and names and configs	10 years ago