Repository navigation
fix(rg): gate explicit symlink dereference behind --follow - #1688
Merged
Merged
Conversation
Deploying with
|
| Status | Name | Latest Commit | Preview URL | Updated (UTC) |
|---|---|---|---|---|
| ✅ Deployment successful! View logs |
bashkit | 86f41ec | Commit Preview URL | May 22 2026, 10:21 PM |
chaliy
added a commit
that referenced
this pull request
May 30, 2026
### Motivation - `rg` previously dereferenced explicit symlink targets at the builtin layer regardless of follow settings, bypassing the VFS no-follow contract and enabling reads outside the intended search root or across mounts. ### Description - Threaded `follow_symlinks` into explicit-path resolution by adding a `follow_symlinks` parameter to `resolve_rg_explicit_path` and updating its callers so explicit user paths are only dereferenced when `-L/--follow` is enabled. - Updated directory-detection and helper call sites (`has_directory_path`, `collect_rg_inputs`, `collect_rg_file_list`, `meta_is_file_and_matches`) to use the new `follow_symlinks` flag for consistent behavior. - Preserved existing recursive `-L` traversal behavior while restoring default no-follow semantics for explicit paths to re-establish the VFS containment guarantee. - Adjusted symlink differential tests so the explicit-file and explicit-directory symlink cases are exercised under `-L`. ### Testing - Ran `cargo test -p bashkit --lib builtins::rg::tests::diff_rg_matches_real_rg_symlink_cases -- --nocapture`, and the test passed. - The changes are validated by the repository's symlink differential cases that cover both recursive `-L` and explicit-path scenarios and now succeed under the updated contract. ------ [Codex Task](https://chatgpt.com/codex/cloud/tasks/task_e_6a105c02a8f0832b8cd57510ed01dc69)
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.
Motivation
rgpreviously dereferenced explicit symlink targets at the builtin layer regardless of follow settings, bypassing the VFS no-follow contract and enabling reads outside the intended search root or across mounts.Description
follow_symlinksinto explicit-path resolution by adding afollow_symlinksparameter toresolve_rg_explicit_pathand updating its callers so explicit user paths are only dereferenced when-L/--followis enabled.has_directory_path,collect_rg_inputs,collect_rg_file_list,meta_is_file_and_matches) to use the newfollow_symlinksflag for consistent behavior.-Ltraversal behavior while restoring default no-follow semantics for explicit paths to re-establish the VFS containment guarantee.-L.Testing
cargo test -p bashkit --lib builtins::rg::tests::diff_rg_matches_real_rg_symlink_cases -- --nocapture, and the test passed.-Land explicit-path scenarios and now succeed under the updated contract.Codex Task