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
79 lines
2.2 KiB
Makefile
79 lines
2.2 KiB
Makefile
OS:=$(shell uname)
|
|
|
|
# Set ARCH to 32 or x32 for i386/x32 ABIs
|
|
ARCH?=64
|
|
ARCHFLAG=-m$(ARCH)
|
|
|
|
ifeq ($(OS),Linux)
|
|
PROCESSOR:=$(shell uname -p)
|
|
|
|
ifneq ($(wildcard /usr/lib/$(PROCESSOR)-linux-gnu),)
|
|
# Can use standard Debian location for static libraries.
|
|
PLATFORM_LIBDIR=/usr/lib/$(PROCESSOR)-linux-gnu
|
|
else
|
|
# Attempt to determine library location from gcc configuration.
|
|
PLATFORM_LIBDIR=$(shell gcc -v 2>&1 | grep "Configured with:" | sed 's/.*--libdir=\(\/usr\/[^ ]*\).*/\1/g')
|
|
endif
|
|
|
|
# Override for explicitly specified ARCHFLAG.
|
|
# Use locally compiled libcaprights in this case, on the
|
|
# assumption that any installed version is 64-bit.
|
|
ifeq ($(ARCHFLAG),-m32)
|
|
PROCESSOR=i386
|
|
PLATFORM_LIBDIR=/usr/lib32
|
|
LIBCAPRIGHTS=./libcaprights.a
|
|
endif
|
|
ifeq ($(ARCHFLAG),-mx32)
|
|
PROCESSOR=x32
|
|
PLATFORM_LIBDIR=/usr/libx32
|
|
LIBCAPRIGHTS=./libcaprights.a
|
|
endif
|
|
|
|
# Detect presence of libsctp in normal Debian location
|
|
ifneq ($(wildcard $(PLATFORM_LIBDIR)/libsctp.a),)
|
|
LIBSCTP=-lsctp
|
|
CXXFLAGS=-DHAVE_SCTP
|
|
endif
|
|
|
|
ifneq ($(LIBCAPRIGHTS),)
|
|
# Build local libcaprights.a (assuming ./configure
|
|
# has already been done in libcaprights/)
|
|
LOCAL_LIBS=$(LIBCAPRIGHTS)
|
|
LIBCAPRIGHTS_OBJS=libcaprights/capsicum.o libcaprights/linux-bpf-capmode.o libcaprights/procdesc.o libcaprights/signal.o
|
|
LOCAL_CLEAN=$(LOCAL_LIBS) $(LIBCAPRIGHTS_OBJS)
|
|
else
|
|
# Detect installed libcaprights static library.
|
|
ifneq ($(wildcard $(PLATFORM_LIBDIR)/libcaprights.a),)
|
|
LIBCAPRIGHTS=$(PLATFORM_LIBDIR)/libcaprights.a
|
|
else
|
|
ifneq ($(wildcard /usr/lib/libcaprights.a),)
|
|
LIBCAPRIGHTS=/usr/lib/libcaprights.a
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
endif
|
|
|
|
# Extra test programs for arch-transition tests
|
|
EXTRA_PROGS = mini-me.32 mini-me.64
|
|
ifneq ($(wildcard /usr/include/gnu/stubs-x32.h),)
|
|
EXTRA_PROGS += mini-me.x32
|
|
endif
|
|
|
|
# Chain on to the master makefile
|
|
include makefile
|
|
|
|
./libcaprights.a: $(LIBCAPRIGHTS_OBJS)
|
|
ar cr $@ $^
|
|
|
|
# Small static programs of known architectures
|
|
# These may require additional packages to be installed; for example, for Debian:
|
|
# - libc6-dev-i386 provides 32-bit headers for a 64-bit system
|
|
# - libc6-dev-x32 provides headers for the x32 ABI.
|
|
mini-me.32: mini-me.c
|
|
$(CC) $(CFLAGS) -m32 -static -o $@ $<
|
|
mini-me.x32: mini-me.c
|
|
$(CC) $(CFLAGS) -mx32 -static -o $@ $<
|
|
mini-me.64: mini-me.c
|
|
$(CC) $(CFLAGS) -m64 -static -o $@ $<
|