no-broken-symlinks: restrict checks to symlinks pointing inside the store#376261
Merged
ConnorBaker merged 2 commits intoNixOS:stagingfrom Jan 25, 2025
Merged
Conversation
This was referenced Jan 24, 2025
emilazy
reviewed
Jan 24, 2025
Member
emilazy
left a comment
There was a problem hiding this comment.
LGTM modulo comments. Are there any fixes for this we should revert after?
Contributor
Author
No fixes that I'm aware of; nothing has been merged except the main PR introducing the hook, so no quick hacks to revert yet :) |
13 tasks
emilazy
approved these changes
Jan 24, 2025
Member
emilazy
left a comment
There was a problem hiding this comment.
Looks good to me.
One fix would have been to rename absolute to relative with no other changes 😂
13 tasks
13 tasks
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
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.
Followup for #370750.
Given some packages purposefully create symlinks which point out of the store, it makes sense to skip them in the check rather than error or warn because the hooks is limited to sandbox.
The two additional tests I've added succeed, and
systemdMinimalsucceeds without disabling the hook (like in #376218, which I have closed).This PR additionally fixes the flags passed to
lnwhen theabsoluteoption is provided in the tests -- previously, passing a value oftrueforabsolutewould create a relative symlink! Thank you @emilazy for spotting that!This issue wasn't caught by the tests because they would need to build with
NIX_DEBUGset to a high value and grep for a logging statement, since the hook canonicalizes relative symlinks to absolute paths when evaluating them, and the only difference in code-path is a single logging statement.Things done
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.