mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
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
119 lines
2.9 KiB
C
119 lines
2.9 KiB
C
#ifndef __CAPSICUM_RIGHTS_H__
|
|
#define __CAPSICUM_RIGHTS_H__
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#ifdef __FreeBSD__
|
|
#include <sys/param.h>
|
|
#if __FreeBSD_version >= 1100014 || \
|
|
(__FreeBSD_version >= 1001511 && __FreeBSD_version < 1100000)
|
|
#include <sys/capsicum.h>
|
|
#else
|
|
#include <sys/capability.h>
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef __linux__
|
|
#include <linux/capsicum.h>
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#ifndef CAP_RIGHTS_VERSION
|
|
/************************************************************
|
|
* Capsicum compatibility layer: implement new (FreeBSD10.x)
|
|
* rights manipulation API in terms of original (FreeBSD9.x)
|
|
* functionality.
|
|
************************************************************/
|
|
#include <stdarg.h>
|
|
#include <stdbool.h>
|
|
|
|
/* Rights manipulation macros/functions.
|
|
* Note that these use variadic macros, available in C99 / C++11 (and
|
|
* also in earlier gcc versions).
|
|
*/
|
|
#define cap_rights_init(rights, ...) _cap_rights_init((rights), __VA_ARGS__, 0ULL)
|
|
#define cap_rights_set(rights, ...) _cap_rights_set((rights), __VA_ARGS__, 0ULL)
|
|
#define cap_rights_clear(rights, ...) _cap_rights_clear((rights), __VA_ARGS__, 0ULL)
|
|
#define cap_rights_is_set(rights, ...) _cap_rights_is_set((rights), __VA_ARGS__, 0ULL)
|
|
|
|
inline cap_rights_t* _cap_rights_init(cap_rights_t *rights, ...) {
|
|
va_list ap;
|
|
cap_rights_t right;
|
|
*rights = 0;
|
|
va_start(ap, rights);
|
|
while (true) {
|
|
right = va_arg(ap, cap_rights_t);
|
|
*rights |= right;
|
|
if (right == 0) break;
|
|
}
|
|
va_end(ap);
|
|
return rights;
|
|
}
|
|
|
|
inline cap_rights_t* _cap_rights_set(cap_rights_t *rights, ...) {
|
|
va_list ap;
|
|
cap_rights_t right;
|
|
va_start(ap, rights);
|
|
while (true) {
|
|
right = va_arg(ap, cap_rights_t);
|
|
*rights |= right;
|
|
if (right == 0) break;
|
|
}
|
|
va_end(ap);
|
|
return rights;
|
|
}
|
|
|
|
inline cap_rights_t* _cap_rights_clear(cap_rights_t *rights, ...) {
|
|
va_list ap;
|
|
cap_rights_t right;
|
|
va_start(ap, rights);
|
|
while (true) {
|
|
right = va_arg(ap, cap_rights_t);
|
|
*rights &= ~right;
|
|
if (right == 0) break;
|
|
}
|
|
va_end(ap);
|
|
return rights;
|
|
}
|
|
|
|
inline bool _cap_rights_is_set(const cap_rights_t *rights, ...) {
|
|
va_list ap;
|
|
cap_rights_t right;
|
|
cap_rights_t accumulated = 0;
|
|
va_start(ap, rights);
|
|
while (true) {
|
|
right = va_arg(ap, cap_rights_t);
|
|
accumulated |= right;
|
|
if (right == 0) break;
|
|
}
|
|
va_end(ap);
|
|
return (accumulated & *rights) == accumulated;
|
|
}
|
|
|
|
inline bool _cap_rights_is_valid(const cap_rights_t *rights) {
|
|
return true;
|
|
}
|
|
|
|
inline cap_rights_t* cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src) {
|
|
*dst |= *src;
|
|
return dst;
|
|
}
|
|
|
|
inline cap_rights_t* cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src) {
|
|
*dst &= ~(*src);
|
|
return dst;
|
|
}
|
|
|
|
inline bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little) {
|
|
return ((*big) & (*little)) == (*little);
|
|
}
|
|
|
|
#endif /* old/new style rights manipulation */
|
|
|
|
#endif /*__CAPSICUM_RIGHTS_H__*/
|