matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Extract permissions getting into helper function

Browse source
This commit is contained in:
Matthias Beyer 2016-06-24 17:36:55 +02:00
parent 6a24fcb7e4
commit 72a125ab62
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libimagref/src/reference.rs
View file

@ -7,6 +7,7 @@ use std::ops::DerefMut;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::fs::File; use std::fs::File;
use std::io::Read; use std::io::Read;
use std::fs::Permissions;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::storeid::StoreId; use libimagstore::storeid::StoreId;
@ -216,6 +217,23 @@ impl<'a> Ref<'a> {
.map(|mut file| hash_file_contents(&mut file)) .map(|mut file| hash_file_contents(&mut file))
} }
/// Get the permissions of the file which are present
fn get_current_permissions(&self) -> Result<Permissions> {
self.fs_file()
.and_then(|pb| {
File::open(pb)
.map_err(Box::new)
.map_err(|e| REK::HeaderFieldReadError.into_error_with_cause(e))
})
.and_then(|file| {
file
.metadata()
.map(|md| md.permissions())
.map_err(Box::new)
.map_err(|e| REK::RefTargetCannotReadPermissions.into_error_with_cause(e))
})
}
/// check whether the pointer the Ref represents still points to a file which exists /// check whether the pointer the Ref represents still points to a file which exists
pub fn fs_link_exists(&self) -> Result<bool> { pub fn fs_link_exists(&self) -> Result<bool> {
self.fs_file().map(|pathbuf| pathbuf.exists()) self.fs_file().map(|pathbuf| pathbuf.exists())
@ -264,21 +282,7 @@ impl<'a> Ref<'a> {
None => Err(REK::HeaderFieldMissingError.into_error()), None => Err(REK::HeaderFieldMissingError.into_error()),
} }
}) })
.and_then(|ro| self.fs_file().map(|pb| (ro, pb))) .and_then(|ro| self.get_current_permissions().map(|perm| ro == perm.readonly()))
.and_then(|(ro, pb)| {
File::open(pb)
.map(|file| (ro, file))
.map_err(Box::new)
.map_err(|e| REK::HeaderFieldReadError.into_error_with_cause(e))
})
.and_then(|(ro, file)| {
file
.metadata()
.map(|md| md.permissions())
.map(|perm| perm.readonly() == ro)
.map_err(Box::new)
.map_err(|e| REK::RefTargetCannotReadPermissions.into_error_with_cause(e))
})
.map_err(Box::new) .map_err(Box::new)
.map_err(|e| REK::RefTargetCannotReadPermissions.into_error_with_cause(e)) .map_err(|e| REK::RefTargetCannotReadPermissions.into_error_with_cause(e))
} }