Skip to content

Commit

Permalink
fix(open): move open flag tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@saidsay-so
saidsay-so committed May 24, 2024
1 parent 02bf524 commit f3e10b3
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 79 deletions.
34 changes: 1 addition & 33 deletions rust/src/tests/errors/eperm/flag.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ pub(crate) fn assert_flags_named_file<T: Debug, F, C>(
f: F,
check: C,
) where
F: Fn(&Path) -> nix::Result<T>,
F: FnMut(&Path) -> nix::Result<T>,
C: Fn(&Path) -> bool,
{
assert_flags(ctx, flags, valid_flags, false, created_type, f, check)
Expand Down Expand Up @@ -246,38 +246,6 @@ fn immutable_append_file(ctx: &mut TestContext) {
},
|src| metadata(src).map_or(false, |m| m.nlink() == 2),
);

// open/10.t
assert_flags_named_file(
ctx,
&flags,
&valid_flags,
Some(FileType::Regular),
|path| {
open(path, OFlag::O_WRONLY, Mode::empty())
.and_then(|fd| nix::unistd::write(fd, "data".as_bytes()).map(|_| fd))
.and_then(close)
},
|path| {
let size = metadata(path).unwrap().len();
size > 0
},
);
assert_flags_named_file(
ctx,
&flags,
&valid_flags,
Some(FileType::Regular),
|path| {
open(path, OFlag::O_RDWR, Mode::empty())
.and_then(|fd| nix::unistd::write(fd, "data".as_bytes()).map(|_| fd))
.and_then(close)
},
|path| {
let size = metadata(path).unwrap().len();
size > 0
},
);
}

crate::test_case! {
Expand Down
152 changes: 106 additions & 46 deletions rust/src/tests/open.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,17 @@ fn open_flag_wrapper_ctx(flags: OFlag) -> impl Fn(&mut TestContext, &Path) -> ni
target_os = "watchos",
))]
mod flags {
use std::{fs::metadata, os::unix::fs::MetadataExt as _, sync::atomic::AtomicBool};
use std::{
fs::metadata,
os::{freebsd::fs::MetadataExt as _, unix::fs::MetadataExt as _},
sync::atomic::AtomicBool,
};

use nix::{
fcntl::{open, OFlag},
sys::stat::Mode,
unistd::close,
errno::Errno,
fcntl::{self, fcntl, open, FcntlArg, OFlag},
sys::stat::{FileFlag, Mode},
unistd::{chflags, close},
};

use crate::{
Expand All @@ -250,13 +255,10 @@ mod flags {
immutable_file, root, FileSystemFeature::Chflags; supports_any_flag!(FileFlags::IMMUTABLE_FLAGS)
}
fn immutable_file(ctx: &mut TestContext) {
let flags = FileFlags::IMMUTABLE_FLAGS.iter().copied().collect();
let flags: Vec<_> = ctx
.features_config()
.file_flags
.intersection(&flags)
.copied()
.collect();
let (flags, _) = get_flags_intersection(
&ctx.features_config().file_flags,
FileFlags::APPEND_ONLY_FLAGS,
);
let valid_flags = FileFlags::UNDELETABLE_FLAGS.iter().copied().collect();
let valid_flags: Vec<_> = ctx
.features_config()
Expand All @@ -265,26 +267,51 @@ mod flags {
.copied()
.collect();

// TODO: Improve check function
let state = AtomicBool::new(false);
let created_type = Some(FileType::Regular);
let f = |path: &_| {
let oflags = [
OFlag::O_WRONLY,
OFlag::O_RDWR,
OFlag::O_RDONLY | OFlag::O_TRUNC,
];
let res = oflags
.into_iter()
.map(|flag| open(path, flag, Mode::empty()).and_then(close))
.reduce(Result::and)
.unwrap();
state.store(res.is_ok(), std::sync::atomic::Ordering::Relaxed);
res
};
let check = |_: &_| state.load(std::sync::atomic::Ordering::Relaxed);

assert_flags(ctx, &flags, &valid_flags, false, created_type, f, check)
let oflags = [
OFlag::O_WRONLY,
OFlag::O_RDWR,
OFlag::O_RDONLY | OFlag::O_TRUNC,
];

{
let flags: &[FileFlags] = &flags;
let valid_flags: &[FileFlags] = &valid_flags;
{
for &flag in flags {
let raw_flag: FileFlag = flag.into();
let file = ctx.create(FileType::Regular).unwrap();

chflags(&file, raw_flag).unwrap();

let set_flags = metadata(&file).unwrap().st_flags();
assert!(
set_flags as u64 & raw_flag.bits() > 0,
"File should have {flag} set but only have {set_flags}"
);

for oflag in oflags {
assert!(
matches!(open(&file, oflag, Mode::empty()), Err(Errno::EPERM)),
"opening with {oflag:?} for {flag} does not trigger EPERM"
);
}
}

for &flag in valid_flags {
let raw_flag: FileFlag = flag.into();
let file = ctx.create(FileType::Regular).unwrap();

chflags(&file, raw_flag).unwrap();

for oflag in oflags {
assert!(
open(&file, oflag, Mode::empty()).is_ok(),
"Failure when checking if open with {oflag:?} is working for valid flag {flag}"
);
}
}
}
}
}

crate::test_case! {
Expand All @@ -299,21 +326,54 @@ mod flags {
FileFlags::APPEND_ONLY_FLAGS,
);

assert_flags_named_file(
ctx,
&flags,
&[],
Some(FileType::Regular),
|path| {
open(path, OFlag::O_WRONLY, Mode::empty())
.and_then(|fd| nix::unistd::write(fd, "data".as_bytes()).map(|_| fd))
.and_then(close)
},
|path| {
let actual_size = metadata(path).unwrap().size();
actual_size > 0
},
);
let invalid_oflags = [
OFlag::O_WRONLY,
OFlag::O_RDWR,
OFlag::O_RDONLY | OFlag::O_TRUNC,
OFlag::O_RDONLY | OFlag::O_APPEND | OFlag::O_TRUNC,
OFlag::O_WRONLY | OFlag::O_APPEND | OFlag::O_TRUNC,
OFlag::O_RDWR | OFlag::O_APPEND | OFlag::O_TRUNC,
];
let valid_oflags = [
OFlag::O_WRONLY | OFlag::O_APPEND,
OFlag::O_RDWR | OFlag::O_APPEND,
];

let flags: &[FileFlags] = &flags;

for &flag in flags {
let file = ctx.create(FileType::Regular).unwrap();
let raw_flag: FileFlag = flag.into();

chflags(&file, raw_flag).unwrap();

let set_flags = metadata(&file).unwrap().st_flags();
assert!(
set_flags as u64 & raw_flag.bits() > 0,
"File should have {flag} set but only have {set_flags}"
);

for oflag in invalid_oflags {
let res = open(&file, oflag, Mode::empty());
assert!(
matches!(res, Err(Errno::EPERM)),
"Opening file with {oflag:?} for flag {flag} does not trigger EPERM"
);
}

for oflag in valid_oflags {
let res = open(&file, oflag, Mode::empty());
assert!(
res.is_ok(),
"Opening file with {oflag:?} for flag {flag} does not work"
);
let fd = res.unwrap();
assert!(
fcntl(fd, FcntlArg::F_GETFD).is_ok(),
"Opened file descriptor check failed for {flag}"
);
}
}
}
}

Expand Down

0 comments on commit f3e10b3

Please sign in to comment.