Public/nushell
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 768142d329 into d618fd0527

Browse Source
This commit is contained in:
Andy Kittner 2024-07-28 11:33:20 +02:00 committed by GitHub
commit cbc5e787a4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crates/nu-utils/src/filesystem.rs
View File

@ -33,6 +33,24 @@ pub fn have_permission(dir: impl AsRef<Path>) -> PermissionResult<'static> {
#[cfg(unix)] #[cfg(unix)]
pub fn have_permission(dir: impl AsRef<Path>) -> PermissionResult<'static> { pub fn have_permission(dir: impl AsRef<Path>) -> PermissionResult<'static> {
match dir.as_ref().read_dir() {
Err(_) => {
// this might produce a friendlier error message
match have_permission_by_metadata(dir) {
PermissionResult::PermissionOk => {
// handle false positive, metadata said we should be able to read but we
// actually tried to do that and failed (could be SELinux or similar in effect)
PermissionResult::PermissionDenied("Folder is unable to be read")
}
result => result,
}
}
Ok(_) => PermissionResult::PermissionOk,
}
}
#[cfg(unix)]
fn have_permission_by_metadata(dir: impl AsRef<Path>) -> PermissionResult<'static> {
match dir.as_ref().metadata() { match dir.as_ref().metadata() {
Ok(metadata) => { Ok(metadata) => {
let mode = Mode::from_bits_truncate(metadata.mode() as mode_t); let mode = Mode::from_bits_truncate(metadata.mode() as mode_t);