Skip to content

Commit

Permalink
ssh: Drop cockpit-ssh
Browse files Browse the repository at this point in the history
Nothing uses this any more, superseded by cockpit-beiboot. This gets rid
of the libssh build dependency.

Drop the `Provides: cockpit-ssh` from Debian. No package ever related to
that virtual package name, and it's meaningless these days.
  • Loading branch information
martinpitt committed Sep 24, 2024
1 parent df794c1 commit 848a894
Show file tree
Hide file tree
Showing 37 changed files with 5 additions and 5,592 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Makefile.in
/cockpit-certificate-ensure
/cockpit-pcp
/cockpit-session
/cockpit-ssh
/cockpit-tls
/cockpit-ws
/cockpit-wsinstance-factory
Expand Down
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ include src/client/Makefile.am
include src/common/Makefile-common.am
include src/pam-ssh-add/Makefile.am
include src/session/Makefile-session.am
include src/ssh/Makefile-ssh.am
include src/systemd/Makefile.am
include src/tls/Makefile-tls.am
include src/websocket/Makefile-websocket.am
Expand Down
15 changes: 0 additions & 15 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,6 @@ if test "$enable_polkit" != 'no'; then
fi
AC_MSG_RESULT(${enable_polkit:=yes})

# --disable-ssh
AC_MSG_CHECKING([whether to build cockpit-ssh])
AC_ARG_ENABLE(ssh, AS_HELP_STRING([--disable-ssh], [Disable cockpit-ssh build and libssh dependency]))
AM_CONDITIONAL(WITH_COCKPIT_SSH, test "$enable_ssh" != "no")
AC_MSG_RESULT(${enable_ssh:=yes})

# TODO: remove this and clean up the old bridge in src/bridge/
AM_CONDITIONAL(WITH_OLD_BRIDGE, false)

Expand Down Expand Up @@ -108,14 +102,6 @@ PKG_CHECK_MODULES(krb5, [krb5-gssapi >= 1.11 krb5 >= 1.11])
if test "$enable_polkit" != "no"; then
PKG_CHECK_MODULES(polkit, [polkit-agent-1 >= 0.105])
fi
if test "$enable_ssh" != "no"; then
PKG_CHECK_MODULES(libssh, [libssh >= 0.8.5])
old_CFLAGS=$CFLAGS; CFLAGS=$libssh_CFLAGS
old_LIBS=$LIBS; LIBS=$libssh_LIBS
AC_CHECK_FUNCS(ssh_userauth_publickey_auto_get_current_identity)
CFLAGS=$old_CFLAGS
LIBS=$old_LIBS
fi

# pam
AC_CHECK_HEADER([security/pam_appl.h], ,
Expand Down Expand Up @@ -442,7 +428,6 @@ echo "
SELinux Policy: ${enable_selinux_policy}

cockpit-client: ${enable_cockpit_client}
cockpit-ssh: ${enable_ssh}

ssh-add: ${SSH_ADD}
ssh-agent: ${SSH_AGENT}
Expand Down
1 change: 0 additions & 1 deletion containers/flatpak/prepare
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ def create_manifest(
'config-opts': [
'--enable-cockpit-client',
'--disable-polkit',
'--disable-ssh',
'--disable-pcp',
'--with-systemdunitdir=/invalid',
'CPPFLAGS=-Itools/mock-build-env',
Expand Down
2 changes: 1 addition & 1 deletion doc/authentication.md
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ The following environment variables are set by cockpit-ws when spawning an auth

* **COCKPIT_REMOTE_PEER** Set to the ip address of the connecting user.

The following environment variables are used to set options for the `cockpit-ssh` process:
The following environment variables are used to set options for SSH connections:

* **COCKPIT_SSH_CONNECT_TO_UNKNOWN_HOSTS** Set to `1` to allow connecting to
hosts that are not present in the current `known_hosts` files. If not set,
Expand Down
2 changes: 1 addition & 1 deletion doc/protocol.md
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ Example authorize challenge and response messages:
```

Authorize messages are used during authentication by authentication
commands (ei: cockpit-session, cockpit-ssh) to obtain the users credentials
commands like `cockpit-session` to obtain the users credentials
from cockpit-ws. An authentication command can send a authorize message
with a response but no cookie. For example

Expand Down
1 change: 0 additions & 1 deletion selinux/cockpit.fc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
/usr/libexec/cockpit-wsinstance-factory -- gen_context(system_u:object_r:cockpit_ws_exec_t,s0)

/usr/libexec/cockpit-session -- gen_context(system_u:object_r:cockpit_session_exec_t,s0)
/usr/libexec/cockpit-ssh -- gen_context(system_u:object_r:cockpit_session_exec_t,s0)

/usr/share/cockpit/motd/update-motd -- gen_context(system_u:object_r:cockpit_ws_exec_t,s0)

Expand Down
7 changes: 3 additions & 4 deletions selinux/cockpit_session_selinux.8cockpit
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ For example:

The cockpit_session_t SELinux type can be entered via the \fBcockpit_session_exec_t\fP file type.

The default entrypoint paths for the cockpit_session_t domain are the following:
The default entrypoint paths for the cockpit_session_t domain is \fB/usr/libexec/cockpit-session\fP.

/usr/libexec/cockpit-ssh, /usr/libexec/cockpit-session
.SH PROCESS TYPES
SELinux defines process types (domains) for each process running on the system
.PP
Expand Down Expand Up @@ -221,7 +220,7 @@ SELinux cockpit_session policy is very flexible allowing users to setup their co
.br
.TP 5
Paths:
/usr/libexec/cockpit-ssh, /usr/libexec/cockpit-session
/usr/libexec/cockpit-session

.PP
Note: File context can be temporarily modified with the chcon command. If you want to permanently change the file context you need to use the
Expand Down Expand Up @@ -252,4 +251,4 @@ This manual page was auto-generated using
.B "sepolicy manpage".

.SH "SEE ALSO"
selinux(8), cockpit_session(8), semanage(8), restorecon(8), chcon(1), sepolicy(8), setsebool(8)
selinux(8), cockpit_session(8), semanage(8), restorecon(8), chcon(1), sepolicy(8), setsebool(8)
1 change: 0 additions & 1 deletion src/bridge/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ endif
# -----------------------------------------------------------------------------
# polkit

# make sure this ends up in the tarball, even with --disable-ssh
polkit_in_files = src/bridge/org.cockpit-project.cockpit-bridge.policy.in
EXTRA_DIST += $(polkit_in_files)

Expand Down
78 changes: 0 additions & 78 deletions src/ssh/Makefile-ssh.am

This file was deleted.

127 changes: 0 additions & 127 deletions src/ssh/cockpitsshoptions.c

This file was deleted.

41 changes: 0 additions & 41 deletions src/ssh/cockpitsshoptions.h

This file was deleted.

Loading

0 comments on commit 848a894

Please sign in to comment.