pybridge: Add initial authorize request to cockpit-beiboot, and handle host key prompts #19401
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
allisonkarlitskaya
requested changes
Sep 27, 2023
src/cockpit/beiboot.py
Outdated
|
|
||
| async def do_askpass(self, messages: str, prompt: str, hint: str) -> Optional[str]: | ||
| if self.basic_password and 'password:' in prompt.lower(): |
There was a problem hiding this comment.
yikes...
I guess this will work "for now" but we really need to do something more (airquotes) 'professional' here...
There was a problem hiding this comment.
Yep, see my comment above, that's why it's still draft. Of course we could also consider/mark this as # HACK and update ferny as a follow-up. I still do want to do that, but it's much nicer to iterate on something that actually works.
martinpitt
force-pushed
the
beiboot-authorize
branch
2 times, most recently
from
774f2ee
to
60c6729
Compare
martinpitt
commented
Sep 27, 2023
martinpitt
force-pushed
the
beiboot-authorize
branch
2 times, most recently
from
edae05b
to
ee489a1
Compare
This comment was marked as resolved.
This comment was marked as resolved.
martinpitt
force-pushed
the
beiboot-authorize
branch
2 times, most recently
from
fede982
to
1220a19
Compare
This comment was marked as outdated.
This comment was marked as outdated.
martinpitt
force-pushed
the
beiboot-authorize
branch
2 times, most recently
from
d7f3fa3
to
a10e8a8
Compare
This comment was marked as outdated.
This comment was marked as outdated.
martinpitt
force-pushed
the
beiboot-authorize
branch
from
a10e8a8
to
f3ee0e7
Compare
martinpitt
force-pushed
the
beiboot-authorize
branch
2 times, most recently
from
aeae62e
to
f21866b
Compare
This comment was marked as resolved.
This comment was marked as resolved.
martinpitt
force-pushed
the
beiboot-authorize
branch
from
f21866b
to
fb73cc7
Compare
martinpitt
changed the title
martinpitt
requested review from
allisonkarlitskaya
and removed request for
allisonkarlitskaya
7 tasks
martinpitt
force-pushed
the
beiboot-authorize
branch
from
fb73cc7
to
cfcd08f
Compare
martinpitt
changed the title
This comment was marked as outdated.
This comment was marked as outdated.
martinpitt
force-pushed
the
beiboot-authorize
branch
from
cfcd08f
to
4457911
Compare
2 tasks
This comment was marked as outdated.
This comment was marked as outdated.
| fp_match = re.search(r'\n(\w+) key fingerprint is ([^.]+)\.', prompt) | ||
| args = {} | ||
| if fp_match: | ||
| args['host-key'] = f'{fp_match.group(2)} {fp_match.group(1)}' |
There was a problem hiding this comment.
I guess this isn't quite right — this is the fingerprint, not the key...
There was a problem hiding this comment.
Hm yes, but we don't ever get the actual key via SSH_ASKPASS; I figure that's why you went through this whole business of KnownHostCommand? Do we need to use that after all?
There was a problem hiding this comment.
I.e. I just consider that as the "new key format" -- key fingerprints are just the "language" that ssh speaks, while for cockpit-ssh it was the full keys. But does that matter? Or what would you suggest?
martinpitt
force-pushed
the
beiboot-authorize
branch
from
4457911
to
79d426a
Compare
This comment was marked as outdated.
This comment was marked as outdated.
martinpitt
force-pushed
the
beiboot-authorize
branch
from
79d426a
to
6b8f3b6
Compare
In order to use cockpit.beiboot as cockpit-ssh replacement from the "normal" (not Client mode) login page, it needs to consider the given username and password. cockpit-ssh sends an initial `authorize` message for that and checks for "Basic" auth. If that fails, it aborts immediately with `authentication-failed`. Implement the same in cockpit.beiboot. Note: The UI does not currently get along with multiple password attempts. Once we drop cockpit-ssh, we should fix the UI and cockpit.beiboot to behave like the flatpak, keep the initial SSH running, and just answer the "try again" prompts. Cover this in a new `TestLogin.testLoginSshBeiboot`. Once we generally replace cockpit-ssh with cockpit.beiboot, this will get absorbed by TestLogin and TestMultiMachine* and can be dropped again.
Stop treating host key prompts as generic conversation messages. We want the UI to handle them properly, with some verbiage/buttons and the recipe for validating host keys, instead of letting the user type "yes". The login page recognizes these through the presence of the `host-key` authorize field (and irritatingly, an extra `default` field with the actual value). We can't use ferny's builtin `do_hostkey()` responder for this, as that requires `ferny.Session(handle_host_key=True)`, and that API is not flexible enough to handle our ssh command modifications and the extra beiboot_helper handler. This needs some bigger redesign. So just recognize and parse SSH's host key prompts, and rely on our integration tests to spot breakage in future distro releases. This enables the login page's host key localstorage mechanism, so adjust TestLogin.testLoginSshBeiboot to only expect the host key on the first login attempt.
martinpitt
force-pushed
the
beiboot-authorize
branch
from
6b8f3b6
to
03fb291
Compare
|
I have rebased this to get it back into working order. #19668 has been open for 4 months, and at some point I'd really like to unblock this and the follow-up work -- the string parsing hack is easy enough to revert/adjust if/once we land the FernyTransport rework. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In order to use cockpit-beiboot as cockpit-ssh replacement from the "normal" (not Client mode) login page, it needs to consider the given username and password. It also needs to properly handle "unknown host key" prompts.
This paves the way for completely replacing cockpit-ssh with cockpit.beiboot. See https://issues.redhat.com/browse/COCKPIT-954 and #19441.