Simplify apivfs_cmd() and chroot_cmd() #2255
Merged
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
DaanDeMeyer
force-pushed
the
simplify
branch
5 times, most recently
from
61d7b23 to
478f870
Compare
behrmann
reviewed
Jan 9, 2024
There was a problem hiding this comment.
since if /etc/resolv.conf is a symlink it'll always be to /run/systemd/resolve/stub-resolv.conf
I'm not entirely sure this reasoning is correct. I've found these docs saying that having /etc/resolv.conf be a symlink is also a way to opt out of networkmanager configuring it. Though I don't think it should functionally change anything compared to before.
We move the setpgid logic to run(), avoiding the need to pass a tools argument to chroot_cmd() and apivfs_cmd(). We also try to remove as much logic from these functions as possible. Since we can't really assume that any logic we execute during the function will still hold true in the sandbox, so it's best to delay any logic execution until we're already in the sandbox (using the --ro-bind-try options of bubblewrap). We also rework the /etc/resolv.conf handling to simply make sure that /run/systemd/resolve exists in the chroot since if /etc/resolv.conf points to /run it'll almost certainly be to /run/systemd/resolv/stub-resolv.conf.
Otherwise we run into virtiofsd errors when operating on non relabeled directories with --security-label enabled.
Otherwise tests in the sandbox will think they have access to IPC stuff when they actually don't. Fixes systemd#2256
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.
We move the setpgid logic to run(), avoiding the need to pass a tools argument to chroot_cmd() and apivfs_cmd().
We also try to remove as much logic from these functions as possible. Since we can't really assume that any logic we execute during the function will still hold true in the sandbox, so it's best to delay any logic execution until we're already in the sandbox (using the --ro-bind-try options of bubblewrap).
We also rework the /etc/resolv.conf handling to simply make sure that /run/systemd/resolve exists in the chroot since if /etc/resolv.conf is a symlink it'll always be to /run/systemd/resolve/stub-resolv.conf.