quine-global-labs/mirror-cockpit-project-cockpit
1
0
Fork 0
mirror of https://github.com/cockpit-project/cockpit.git synced 2026-11-03 21:49:50 -09:00
Code Issues Projects Releases Packages Wiki Activity

ws: be more explicit when handling hostnames on cli

Browse source 
`cockpit-ws` has never protected hostnames from being interpreted as cli
options when passing them to the auth commands (`cockpit-session`,
`cockpit-ssh`, `cockpit.beiboot`).  There have been a couple of relevant
changes over the years:

  - our move to using cockpit-session via unix socket has removed
    exposure to this problem for `cockpit-session`

  - our move from `cockpit-ssh` (glib argument parser) to
    `cockpit.beiboot` (Python argparse) has unfortunately exposed us to
    https://github.com/python/cpython/issues/66623 which means (due to a
    strange heuristic) that arguments starting with '-' can be
    interpreted as positionals if they also have spaces in them

This gives a way to get a hostname starting with a `-` to ssh (where it
*will* be interpreted as an option) and the following argument (the
python invocation on the remote) will be interpreted as the hostname.
Fortunately, new versions of ssh will reject this hostname.  In any
case, we should firm up the code here and add `--` to ensure that it's
definitely interpreted as a hostname by ssh.

For a similar reason add a `--` to the ssh command in `cockpit-ws`.

CVE-2026-4631
This commit is contained in:
Allison Karlitskaya 2026-03-24 15:44:15 +01:00 committed by Jelle van der Waa
parent 99deafc66f
commit 9d0695647c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cockpit/beiboot.py
View file

@ -250,9 +250,9 @@ def via_ssh(cmd: Sequence[str], dest: str, ssh_askpass: Path, *ssh_opts: str) ->
# strip off [] IPv6 brackets # strip off [] IPv6 brackets
if host.startswith('[') and host.endswith(']'): if host.startswith('[') and host.endswith(']'):
host = host[1:-1] host = host[1:-1]
destination = ['-p', port, host] destination = ['-p', port, '--', host]
else: else:
destination = [dest] destination = ['--', dest]
return ( return (
'ssh', *ssh_opts, *destination, shlex.join(cmd) 'ssh', *ssh_opts, *destination, shlex.join(cmd)

2
src/ws/cockpitauth.c
View file

@ -36,7 +36,7 @@
/* we only support beibooting machines with a known/vetted OS, as it's impossible to guarantee /* we only support beibooting machines with a known/vetted OS, as it's impossible to guarantee
* forward compatibility for all pages */ * forward compatibility for all pages */
const gchar *cockpit_ws_ssh_program = "/usr/bin/env python3 -m cockpit.beiboot --remote-bridge=supported"; const gchar *cockpit_ws_ssh_program = "/usr/bin/env python3 -m cockpit.beiboot --remote-bridge=supported --";
/* Some tunables that can be set from tests */ /* Some tunables that can be set from tests */
const gchar *cockpit_ws_session_program = NULL; const gchar *cockpit_ws_session_program = NULL;

2
vendor/ferny vendored

@ -1 +1 @@
Subproject commit c8713c4d3ba74a9d8db1ce8e0a15296e6a333257 Subproject commit 73dd163349bf048d3d0a36f43228a9d052104e30