nixos/cryptpad: fix service with nodejs 22.11 (for real)#372342
Merged
fricklerhandwerk merged 1 commit intoNixOS:masterfrom Mar 25, 2025
Merged
nixos/cryptpad: fix service with nodejs 22.11 (for real)#372342fricklerhandwerk merged 1 commit intoNixOS:masterfrom
fricklerhandwerk merged 1 commit intoNixOS:masterfrom
Conversation
The previous fix had only been tested locally through a runtime edit of the service, and the order in which @chown had been re-added was different so commit cf498c1 ("nixos/cryptpad: fix service with nodejs 22.11") did not actually fix the issue. This properly orders @chown after @PRIVILEGED so the rule is respected, and also properly denies with EPERM instead of allowing the chown family of syscalls: this will properly prevent seccomp from killing nodejs while still disallowing fchown() Fixes NixOS#370717
Member
Author
|
ofborg barfed on x86-64 linux:
Not sure this will be of much help, but retrying... |
Member
Author
sounds better! Thanks for waiting, this is good for me. |
Erethon
approved these changes
Feb 13, 2025
Contributor
Erethon
left a comment
There was a problem hiding this comment.
Change makes sense and LGTM. The test now passes when I run it.
Merged
2 tasks
eljamm
approved these changes
Mar 25, 2025
Contributor
eljamm
left a comment
There was a problem hiding this comment.
Can confirm that this fixes the NixOS test, thanks!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
The previous fix had only been tested locally through a runtime edit of the service, and the order in which @chown had been re-added was different so commit cf498c1 ("nixos/cryptpad: fix service with nodejs 22.11") did not actually fix the issue.
This properly orders @chown after @PRIVILEGED so the rule is respected, and also properly denies with EPERM instead of allowing the chown family of syscalls: this will properly prevent seccomp from killing nodejs while still disallowing fchown()
Fixes #370717
Things done
I properly ran the nixosTests.cryptpad this time, but let's wait for ofborg to run it as well just to make sure...
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.