ENT-14418: Added --ask-pass, --password-file and --switch-user-command options - #199
ENT-14418: Added --ask-pass, --password-file and --switch-user-command options#199nickanderson wants to merge 10 commits into
Conversation
| Anything we send this way (a password for switching user) is small enough | ||
| to fit in the pipe buffer, so writing it up front cannot block. Standard | ||
| input is left alone (inherited) when there is nothing to send. |
There was a problem hiding this comment.
Warning Use communicate() rather than .stdin.write, .stdout.read or .stderr.read to avoid deadlocks due to any of the other OS pipe buffers filling up and blocking the child process.
Is this what you are referring to?
There was a problem hiding this comment.
Yes, that's the warning. The reasoning Claude wrote was that our payload (a password) is far smaller than the pipe buffer, so the write can't block — but that argument only holds as long as nobody sends anything bigger, so I've stopped making it. _popen() now only opens the pipe and communicate(input=...) does the writing, in cd4fa30.
The one wrinkle is that _Task.communicate() polls with a short timeout, and communicate() raises ValueError: Cannot send input after starting communication if a later call hands it the same input again. It remembers what the first call gave it and keeps writing from where it left off, so only the first call passes it (and a retried process gets a fresh one, so the flag resets). tests/test_aramid.py::test_input_is_only_handed_over_once covers that — it fails with that ValueError if the flag goes away.
| needs_password = ( | ||
| "a terminal is required" in output | ||
| or "a password is required" in output | ||
| or "no tty present" in output | ||
| ) |
There was a problem hiding this comment.
This doesn't feel very robust to me. What if instead cf-remote would by default run sudo non-interactively sudo -n ? This would collapse all these errors into a single one: sudo: a password is required. Then you can accurately print this hint.
However, I don't know how the rest of the code would react to this change
There was a problem hiding this comment.
Taken — the default is sudo -n bash -c now, in 8fc3d4f, so the case that matters collapses to sudo: a password is required the way you described, and that is the first thing checked. The other two wordings stay for a --switch-user-command we were given, which has no -n to ask with.
The part -n doesn't fix, and you were right to poke at it: sudo says that in the caller's language, and ssh forwards LANG/LC_* by default. On Fedora 41 the same failure reads sudo: Ein Passwort ist notwendig, so the hint just went quiet. 75fa7b2 pins LC_ALL=C on the command, which makes the wording we match the one that arrives, with a case in tests/shell/002_sudo_password.sh that fails if the pin goes away.
| def needs_password_on(self, connection): | ||
| """Check whether switching user on this host requires a password | ||
|
|
||
| Only interesting when we actually have a password to send. Sending it | ||
| when it isn't needed would leave it on the standard input of the | ||
| command we are running instead. | ||
|
|
||
| 'sudo -n' answers this without ever attempting to authenticate. Asking | ||
| by letting an attempt fail instead would count towards the failed | ||
| attempts that pam_faillock locks accounts out over, once per host and | ||
| run. | ||
| """ |
There was a problem hiding this comment.
Maybe this wouldn't be needed if by default we run sudo -n ? (see other comment)
There was a problem hiding this comment.
Taken the other two: the default is now sudo -n bash -c, and SwitchUser is built inside run_command_with_args instead of being passed in.
-n and -S can't be combined. -n means never prompt, so sudo -n -S refuses the password. When there is a password the command is still sudo -S -p '' bash -c.
needs_password_on() decides whether the password is written to the child's stdin at all. On a NOPASSWD host, sending it puts it on the stdin of the wrapped command instead of into sudo. (tests/shell/002_sudo_password.sh).
Ticket: ENT-14418 Changelog: title Signed-off-by: Nick Anderson <nick@cmdln.org> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Ticket: ENT-14418 Changelog: title Signed-off-by: Nick Anderson <nick@cmdln.org> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Ticket: ENT-14418 Changelog: none Signed-off-by: Nick Anderson <nick@cmdln.org> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Ticket: ENT-14418 Changelog: none Signed-off-by: Nick Anderson <nick@cmdln.org> Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
…bals Ticket: ENT-14418 Changelog: none Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Nick Anderson <nick@cmdln.org>
Ticket: ENT-14418 Changelog: none Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Nick Anderson <nick@cmdln.org>
Ticket: ENT-14418 Changelog: none Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Signed-off-by: Nick Anderson <nick@cmdln.org>
Ticket: ENT-14418 Changelog: none Signed-off-by: Nick Anderson <nick@cmdln.org>
Ticket: ENT-14418 Changelog: none Signed-off-by: Nick Anderson <nick@cmdln.org>
52be885 to
0fa5427
Compare
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #199 +/- ##
==========================================
+ Coverage 44.27% 47.53% +3.25%
==========================================
Files 18 18
Lines 3065 3158 +93
==========================================
+ Hits 1357 1501 +144
+ Misses 1708 1657 -51
🚀 New features to boost your workflow:
|
Ticket: ENT-14418 Changelog: none Signed-off-by: Nick Anderson <nick@cmdln.org>
cf-remote can now switch user on hosts where sudo asks for a password, prompting for it once with
--ask-passor reading it from a file with--password-file, so passwordless sudo is no longer a requirement.--switch-user-commandreplaces the hardcodedsudo bash -c.