8ac5aef8f3
This change takes capsicum-test from upstream and applies some local changes to make the
tests work on FreeBSD when executed via Kyua.
The local modifications are as follows:
1. Make `OpenatTest.WithFlag` pass with the new dot-dot lookup behavior in FreeBSD 12.x+.
2. capsicum-test references a set of helper binaries: `mini-me`, `mini-me.noexec`, and
`mini-me.setuid`, as part of the execve/fexecve tests, via execve, fexecve, and open.
It achieves this upstream by assuming `mini-me*` is in the current directory, however,
in order for Kyua to execute `capsicum-test`, it needs to provide a full path to
`mini-me*`. In order to achieve this, I made `capsicum-test` cache the executable's
path from argv[0] in main(..) and use the cached value to compute the path to
`mini-me*` as part of the execve/fexecve testcases.
3. The capsicum-test test suite assumes that it's always being run on CAPABILITIES enabled
kernels. However, there's a chance that the test will be run on a host without a
CAPABILITIES enabled kernel, so we must check for the support before running the tests.
The way to achieve this is to add the relevant `feature_present("security_capabilities")`
check to SetupEnvironment::SetUp() and skip the tests when the support is not available.
While here, add a check for `kern.trap_enotcap` being enabled. As noted by markj@ in
https://github.com/google/capsicum-test/issues/23, this sysctl being enabled can trigger
non-deterministic failures. Therefore, the tests should be skipped if this sysctl is
enabled.
All local changes have been submitted to the capsicum-test project
(https://github.com/google/capsicum-test) and are in various stages of review.
Please see the following pull requests for more details:
1. https://github.com/google/capsicum-test/pull/35
2. https://github.com/google/capsicum-test/pull/41
3. https://github.com/google/capsicum-test/pull/42
Reviewed by: asomers
Discussed with: emaste, markj
Approved by: emaste (mentor)
MFC after: 2 months
Differential Revision: https://reviews.freebsd.org/D19758
50 lines
1.6 KiB
C++
50 lines
1.6 KiB
C++
#include <fcntl.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "./capsicum-test.h"
|
|
|
|
// There was a Capsicum-related regression in FreeBSD renameat,
|
|
// which affects certain cases independent of Capsicum or capability mode
|
|
//
|
|
// added to test the renameat syscall for the case that
|
|
// - the "to" file already exists
|
|
// - the "to" file is specified by an absolute path
|
|
// - the "to" file descriptor is used
|
|
// (this descriptor should be ignored if absolute path is provided)
|
|
//
|
|
// details at: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222258
|
|
|
|
|
|
const char * create_tmp_src(const char* filename) {
|
|
const char *src_path = TmpFile(filename);
|
|
int src_fd = open(src_path, O_CREAT|O_RDWR, 0644);
|
|
close(src_fd);
|
|
return src_path;
|
|
}
|
|
|
|
TEST(Rename, AbsDesignationSame) {
|
|
const char *src_path = create_tmp_src("rename_test");
|
|
EXPECT_OK(rename(src_path, src_path));
|
|
unlink(src_path);
|
|
}
|
|
|
|
TEST(RenameAt, AbsDesignationSame) {
|
|
const char *src_path = create_tmp_src("renameat_test");
|
|
const char *dir_path = TmpFile("renameat_test_dir");
|
|
|
|
EXPECT_OK(mkdir(dir_path, 0755));
|
|
// random temporary directory descriptor
|
|
int dfd = open(dir_path, O_DIRECTORY);
|
|
|
|
// Various rename from/to the same absolute path; in each case the source
|
|
// and dest directory FDs should be irrelevant.
|
|
EXPECT_OK(renameat(AT_FDCWD, src_path, AT_FDCWD, src_path));
|
|
EXPECT_OK(renameat(AT_FDCWD, src_path, dfd, src_path));
|
|
EXPECT_OK(renameat(dfd, src_path, AT_FDCWD, src_path));
|
|
EXPECT_OK(renameat(dfd, src_path, dfd, src_path));
|
|
|
|
close(dfd);
|
|
rmdir(dir_path);
|
|
unlink(src_path);
|
|
}
|