use DynamicUser=yes for all cockpit components #16811
Draft
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
|
I filed systemd/systemd#23067 to start the discussion. |
This was referenced Jan 3, 2023
Unless it's otherwise specified in the configuration file, we now spawn cockpit-session by connecting to /run/cockpit/session. We leave the cockpit_ws_session_program variable in place to allow the tests to override things. Update the unit files for cockpit-ws to ensure that the socket is available when cockpit-ws is running.
systemd spawns this for us now, so we don't need the setuid bit anymore.
Unfortunately, socket units can't set DynamicUser=yes, so add a dependency on a separate .service created just for this purpose. /run/cockpit/session is now owned by group cockpit-session-socket which also gets added as a supplementary group to the cockpit-ws units.
Similar to the last commit, we create a dynamic group for the sockets in /run/cockpit/wsinstance and add a supplementary group to cockpit-tls.
We only dynamically generate a single .socket file now. The rest of them are in version control and installed verbatim.
|
Rebased after the rebasing of #16808 and the recent heavy changes to sysuser management. Locally this at least works for a simple local session, let's see if there's any fallout beyond what's already in #16808.
I didn't port this bit yet, let's do that step separately. We have much more freedom to change this once everything is a DynamicUser. |
martinpitt
added
the
no-test
|
Cool -- the test failures are by and large the same as in #16808. Just the unit lifecycle test fails in addition, but that'll be straightforward to fix -- and indeed we should adjust this some more to check proper cleanup after stopping. |
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.
Switch over to systemd allocating user IDs for us dynamically, dropping our static users.
We create these users dynamically:
cockpit-session-socketis the group owner of/run/cockpit/sessioncockpit-wsinstance-socketis the group owner of all sockets in/run/cockpit/wsinstance/cockpit-tlsgets its own usercockpit-wsinstance-http{,s@}.serviceeach get a user. In this case, I think the separate https instances even each get a separate user.Right now it's not working. There seem to be quite some edge cases, particularly involving the use of
DynamicUserin combination withSupplementaryGroup. Also, the approach to using virtual services to create the dynamic user is really strange.I feel like we maybe shouldn't proceed here until we get better support for this from systemd.