Skip to content

Fix validation #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Jun 20, 2026
Merged

Fix validation #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b36bc7d
Revert "Better store validation"
linyinfeng Jun 20, 2026
8f122c2
Suppress annoying logs in store path validation
linyinfeng Jun 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 10 additions & 22 deletions angrr/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,23 @@ pub fn validate_store_path<P1: AsRef<Path>, P2: AsRef<Path>>(
store: P1,
target: P2,
) -> Option<PathBuf> {
let store = store.as_ref();
let target = target.as_ref();
match canonicalize_to_store(store, target) {
Ok(path) => Some(path),
match fs::canonicalize(target) {
Ok(path) => {
if path.starts_with(store) {
Some(path)
} else {
None
}
}
Err(e) => {
log::warn!("failed to canonicalize {target:?} for validation: {e}");
log::debug!("failed to canonicalize {target:?} for validation: {e}");
None
}
}
}

pub fn canonicalize_to_store<P1: AsRef<Path>, P2: AsRef<Path>>(
store: P1,
path: P2,
) -> anyhow::Result<PathBuf> {
let store = store.as_ref();
let path = path.as_ref();
if path.starts_with(store) {
Ok(PathBuf::from(path))
} else {
let metadata = fs::symlink_metadata(path)?;
if metadata.is_symlink() {
let next = fs::read_link(path)?;
canonicalize_to_store(store, next)
} else {
anyhow::bail!("canonicalized to a non-store path")
}
}
}

pub fn discover_users(roots: &[Arc<GcRoot>]) -> anyhow::Result<Vec<uzers::User>> {
let uids: BTreeSet<_> = roots.iter().map(|root| root.path_metadata.uid()).collect();
let mut users = Vec::new();
Expand Down