nixos/filesystems: ensure keys gid on /run/keys mountpoint #79248
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
boot.specialFileSystems is used to describe mount points to be set up in stage 1 and 2. We use it to create /run/keys already there, so sshd-in-initrd scenarios can consume keys sent over through nixops send-keys. However, it seems the kernel only supports the gid=… option for tmpfs, not ramfs, causing /run/keys to be owned by the root group, not keys group. This was/is worked around in nixops by running a chown root:keys /run/keys whenever pushing keys [1], and as machines had to have pushed keys to be usable, this was pretty much always the case. This is causing regressions in setups not provisioned via nixops, that still use /run/keys for secrets (through cloud provider startup scripts for example), as suddenly being an owner of the "keys" group isn't enough to access the folder. This PR removes the defunct gid=… option in the mount script called in stage 1 and 2, and introduces a tmpfiles rule which takes care of fixing up permissions as part of sysinit.target (very early in systemd bootup, so before regular services are started). In case of nixops deployments, this doesn't change anything. nixops-based deployments receiving secrets from nixops send-keys in initrd will simply have the permissions already set once tmpfiles is started. Fixes NixOS#42344 [1]: https://github.com/NixOS/nixops/blob/884d6c3994b227eb09c307e5d25d6885c9af8220/nixops/backends/__init__.py#L267-L269
|
self pinging @NixOS/nixos-release-managers (I don't know why you can request review to this team) |
fpletz
approved these changes
Feb 8, 2020
dtzWill
pushed a commit
to dtzWill/nixpkgs
that referenced
this pull request
Feb 8, 2020
nixos/filesystems: ensure keys gid on /run/keys mountpoint (cherry picked from commit 64ece8c)
|
This now chown all files to be owned by root. This was not the case before. |
|
This was already followed up in #79862 (merged), and backported into 20.03. |
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.
boot.specialFileSystems is used to describe mount points to be set up in
stage 1 and 2.
We use it to create /run/keys already there, so sshd-in-initrd scenarios
can consume keys sent over through nixops send-keys.
However, it seems the kernel only supports the gid=… option for tmpfs,
not ramfs, causing /run/keys to be owned by the root group, not keys
group.
This was/is worked around in nixops by running a chown root:keys
/run/keys whenever pushing keys 1, and as machines had to have pushed keys
to be usable, this was pretty much always the case.
This is causing regressions in setups not provisioned via nixops, that
still use /run/keys for secrets (through cloud provider startup scripts
for example), as suddenly being an owner of the "keys" group isn't
enough to access the folder.
This PR removes the defunct gid=… option in the mount script called in
stage 1 and 2, and introduces a tmpfiles rule which takes care of fixing
up permissions as part of sysinit.target (very early in systemd bootup,
so before regular services are started).
In case of nixops deployments, this doesn't change anything.
nixops-based deployments receiving secrets from nixops send-keys in
initrd will simply have the permissions already set once tmpfiles is
started.
Fixes #42344
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)