fixup! Introduce exile_vows_from_str()

Makefile

@@ -1,27 +1,17 @@
 prefix = /usr/local
 bindir = $(prefix)/bin
 CFLAGS = -std=c99 -Wall -Wextra -pedantic
-CXXFLAGS = -std=c++20 -Wall -Wextra -pedantic
 
-.DEFAULT_GOAL := tests
+.DEFAULT_GOAL := test
 
 
 clean:
-	rm -f test exile.o testcpp
+	rm -f test
 
+test: test.c
+	$(CC) test.c -g $(CFLAGS) -o test
 
-exile.o: exile.c exile.h
+check: test
-	$(CC) -c exile.c -g $(CFLAGS) -o exile.o
-
-test: test.c exile.h exile.o
-	$(CC) test.c exile.o -g $(CFLAGS) -o test
-
-testcpp: test.cpp exile.h exile.hpp exile.o
-	$(CXX) test.cpp exile.o -g $(CXXFLAGS) -o testcpp
-
-tests: test testcpp
-
-check: tests
 	./test.sh
 
 .PHONY: check

README.md

@@ -1,168 +1,60 @@
 # exile.h
-`exile.h` provides an API for processes on Linux to easily isolate themselves in order
+`exile.h` is a header-only library, enabling processes to easily isolate themselves on Linux for exploit mitigation. exile.h wants to make existing technologies, such as Seccomp and Linux Namespaces, easier to use. Those generally
-to mitigate the effect of exploited vulnerabilities, i. e. when attacker has achieved
+require knowledge of details and are not trivial for developers to employ, which prevents a more widespread adoption.
-arbitrary code execution. exile.h makes it simpler for developers to use existing technologies such as Seccomp and Linux Namespaces. Those generally require knowledge of details and are not trivial for developers to employ, which prevents a more widespread adoption.
 
-The following section offers small examples. Then the motivation is explained in more detail. Proper API documentation will be maintained in other files.
+The following section gives small quick examples. Then the motivation is explained in more detail.
+Proper API documentation will be maintained in other files.
 
 ## Quick demo
-This section quickly demonstrates the simplicity of the API. It serves as an overview to get a first impression.
+TODO This section will demonstrate the simplicity of the API, but only serves as an overview.
-
-system() is used to keep the example C code short. It also demonstrates that subprocesses are also subject to restrictions imposed by exile.h.
-
-While the examples show different features separately, it is generally possible to combine those.
 
 ### Filesystem isolation
-```c
-#include "exile.h"
-#include <assert.h>
-int main(void)
-{
-	system("echo test > /home/user/testfile");
-	struct exile_policy *policy = exile_init_policy();
-	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ, "/home/user");
-	exile_append_path_policies(policy, EXILE_FS_ALLOW_ALL_READ | EXILE_FS_ALLOW_ALL_WRITE, "/tmp");
-	int ret = exile_enable_policy(policy);
-	if(ret != 0)
-	{
-		exit(EXIT_FAILURE);
-	}
-	int fd = open("/home/user/test", O_CREAT | O_WRONLY | O_TRUNC, 0600);
-	assert(fd == -1);
-	fd = open("/home/user/testfile", O_RDONLY);
-	//use fd
-	assert(fd != -1);
-	fd = open("/tmp/testfile", O_CREAT | O_WRONLY | O_TRUNC, 0600);
-	//use fd
-	assert(fd != -1);
-	return 0;
-}
-```
 
-The assert() calls won't be fired, consistent with the policy that allows only reading
-from /home/user. We can write to /tmp/ though as it was specified in the policy.
 
-### vows(): pledge()-like API / System call policies
-exile.h allows specifying which syscalls are permitted or denied. In the following example,
-'ls' is never executed, as the specified "vows" do not allow the execve() system call. The process will be killed.
 
-```c
+### System call policies / vows
-#include "exile.h"
 
-int main(void)
-{
-	struct exile_policy *policy = exile_init_policy();
-	policy->vow_promises = exile_vows_from_str("stdio rpath wpath cpath");
-	exile_enable_policy(policy);
-	printf("Trying to execute...");
-	execlp("/bin/ls", "ls", "/", NULL);
-}
-```
 
-### Isolation from network
+### Isolation of single functions
-exile offers a quick way to isolate a process from the default network namespace.
+exile_launch() demo
-
-```c
-#include "exile.h"
-
-int main(void)
-{
-	struct exile_policy *policy = exile_init_policy();
-	policy->namespace_options |= EXILE_UNSHARE_NETWORK;
-	int ret = exile_enable_policy(policy);
-	if(ret != 0)
-	{
-		exit(EXIT_FAILURE);
-	}
-	system("curl -I https://evil.tld");
-}
-```
-Produces ```curl: (6) Could not resolve host: evil.tld```. For example, this is useful for subprocesses which do not need
-network access, but perform tasks such as parsing user-supplied file formats.
-
-### Isolation of single functions (EXPERIMENTAL)
-Currently, work is being done that hopefully will allow isolation of individual function calls in a mostly pain-free manner.
-
-Consider the following C++ code:
-```cpp
-#include <iostream>
-#include <fstream>
-#include "exile.hpp"
-std::string cat(std::string path)
-{
-	std::fstream f1;
-	f1.open(path.c_str(), std::ios::in);
-	std::string content;
-	std::string line;
-	while(getline(f1, line)) {
-		content += line + "\n";
-	}
-	return content;
-}
-
-int main(void)
-{
-	struct exile_policy *policy = exile_init_policy();
-	policy->vow_promises = exile_vows_from_str("stdio rpath");
-
-	std::string content = exile_launch<std::string>(policy, cat, "/etc/hosts");
-	std::cout << content;
-
-	policy = exile_init_policy();
-	policy->vow_promises = exile_vows_from_str("stdio");
-
-	try
-	{
-	content = exile_launch<std::string>(policy, cat, "/etc/hosts");
-	std::cout << content;
-	}
-	catch(std::exception &e)
-	{
-		std::cout << "launch failure: " << e.what() << std::endl;
-	}
-}
-```
-
-We execute "cat()". The first call succeeds. In the second, we get an exception, because
-the subprocess "cat()" was launched in violated the policy (missing "rpath" vow). 
-
-Naturally, there is a performance overhead. Certain challenges remain, such as the fact
-that being executed in a subproces, we operate on copies, so handling references
-is not something that has been given much thought. There is also the fact
-that clone()ing from threads opens a can of worms, particularly with locks. Hence, exile_launch() is best avoided in multi-threaded contexts.
 
 ## Status
 No release yet, experimental, API is unstable, builds will break on updates of this library.
 
-Currently, it's mainly evolving from the needs of my other projects which use exile.h.
+Currently, it's mainly evolving from the needs of my other projects.
-
-
-### Real-world usage
-  - looqs: https://github.com/quitesimpleorg/looqs
-  - qswiki: https://gitea.quitesimple.org/crtxcr/qswiki
-
 
 ## Motivation and Background
-exile.h unlocks existing Linux mechanisms to facilitate isolation of processes from resources. Limiting the scope of what programs can do helps defending the rest of the system when a process gets under attacker's control (when classic mitigations such as ASLR etc. failed). To this end, OpenBSD has the pledge() and unveil() functions available. Those functions are helpful mitigation mechanisms, but such accessible ways are unfortunately not readily available on Linux. This is where exile.h steps in.
+exile.h unlocks existing Linux mechanisms to facilite isolation of processes from resources. Limiting the scope of what programs can do helps defending the rest of the system when a process gets under attacker's control (when classic mitigations such as ASLR etc. failed). To this end, OpenBSD has the pledge() and unveil() functions available. Those functions are helpful mitigation mechanisms, but such accessible ways are unfortunately not readily available on Linux. This is where exile.h steps in.
 
-Seccomp allows restricting the system calls available to a process and thus decrease the systems attack surface, but it generally is not easy to use. Requiring BPF filter instructions, you generally just can't make use of it right away without learning
+Seccomp allows to restrict system calls available to a process and thus decrease the systems attack surface, but it generally is not easy to use. Requiring BPF filter instructions, you generally just can't make use of it right away. exile.h provides an API inspired by pledge(), building on top of seccomp. It also provides an interface to manually restrict the system calls that can be issued.
-about BPF. exile.h provides an API inspired by pledge(), building on top of seccomp. It also provides an interface to manually restrict the system calls that can be issued.
 
-Traditional methods employed to restrict file system access, like different uids/gids, chroot, bind-mounts, namespaces etc. may require administrator intervention, are perhaps only suitable for daemons and not desktop applications, or are generally rather involved. As a positive example, Landlock since 5.13 is a vast improvement to limit file system access of processes. It also greatly simplifies exile.h' implementation of fs isolation.
+Traditional methods employed to restrict file system access, like different uids/gids, chroot, bind-mounts, namespaces etc. may require administrator intervention, are perhaps only suitable
+for daemons and not desktop applications, or are generally rather involved. As a positive example, Landlock since 5.13  is a vast improvement to limit file system access of processes. It also greatly simplifies exile.h' implementation of fs isolation.
 
 Abstracting those details may help developers bring sandboxing into their applications.
 
+## Example: Archive extraction
+A programming uncompressing archives does not need network access, but should a bug allow code execution, obviously the payload may also access the network. Once the target path is known, it doesn't need access to the whole file system, only write-permissions to the target directory and read on the archive file(s).
+
+TODO example with exile.h applied on "tar" or "unzip". Link to repo.
+
+## Example: Web apps
+Those generally don't need access to the whole filesystem hierarchy, nor do they necessarily require the ability to execute other processes.
+
+Way more examples can be given, but we can put it in simple words: A general purpose OS allow a process to do more things than it actually needs to do.
+
 ## Features
   - Restricting file system access (using Landlock or Namespaces/chroot as fallback)
-  - Systemcall filtering (using seccomp-bpf). An interface inspired by OpenBSD's pledge() is available
+  - Systemcall filtering (using seccomp-bpf). An interface inspired by OpenBSD's pledge() is available, removing the need to specifc rules for syscalls.
   - Dropping privileges in general, such as capabilities
   - Isolating the application from the network, etc. through Namespaces
   - Helpers to isolate single functions
 
 
 ## What it's not
-A way for end users/administrators to restrict processes. In the future, a wrapper binary may be available to achieve this, but it generally aims for developers to bring sandboxing/isolation into their software. This allows a more fine-grained approach, as the developers are more familiar with their software. Applying restrictions with solutions like AppArmor requires
+A way for end users/administrators to restrict processes. In the future, a wrapper binary may be available to achieve this, but it generally aims for developers to bring sandboxing/isolation into their software, like web browsers do. This allows a more fine-grained approach, as the developers
-them to be present and installed on the system and it's easy to break things this way.
+is more familiar with the software. Applying restrictions with solutions like AppArmor requires
+them to be present on the system and it's easy to break things this way.
 
 Therefore, software should ideally be written with sandboxing in mind from the beginning.
 
@@ -174,44 +66,40 @@ It's recommended to start with [README.usage.md] to get a feeling for exile.h.
 API-Documentation: [README.api.md]
 
 ## Limitations
-Built upon kernel technologies, exile.h naturally inherits their limitations:
-
-  - New syscalls can be introduced by new kernel versions. exile.h must keep in sync, and users must keep the library up to date.
-  - seccomp has no deep argument inspection (yet), particularly new syscalls
-  cannot be reasonably filtered, such as clone3(), or io_uring.
-  - You can't know what syscalls libraries will issue. An update to existing
-  libraries may cause them to use different syscalls not allowed by a policy. However, using vows and keeping up to date with exile.h should cover that. 
-  - Landlock, currently, does not apply to syscalls such as stat().
-  
 TODO:
+ - seccomp must be kept up to date syscalls kernel
  - ioctl does not know the fd, so checking values is kind of strange
  - redundancies: some things are handled by capabilties, other by seccomp or both
+ - seccomp no deep argument inspection
+ - landlock: stat() does not apply
  - no magic, be reasonable, devs should not  get sloppy, restrict IPC.
 
 ## Requirements
 Kernel >=3.17
 
-While mostly transparent to users of this API, kernel >= 5.13 is required to take advantage of Landlock. Furthermore, it depends on distro-provided kernels being reasonable and enabling it by default. In practise, Landlock maybe won't be used in some cases so exile.h will use a combination of namespaces, bind mounts and chroot as fallbacks.
+While mostly transparent to users of this API, kernel >= 5.13 is required to take advantage of Landlock and furthermore it depends on distro-provided kernels being reasonable and enabling it by default. In practise, this means that Landlock probably won't be used for now, and exile.h will use a combination of namespaces, bind mounts and chroot as fallbacks.
 
 
 ## FAQ
 
 
-### Does the process need to be privileged to utilize the library?
+### Does the process need to be priviliged to utilize the library?
 
 No.
 
-### It doesn't work on my Debian version!
+### It doesn't work on Debian!
-You can thank a Debian-specific kernel patch for that. Execute
+
+You can thank a Debian-specific kernel patch for that. In the future,
+the library may check against that. Execute
 `echo 1 > /proc/sys/kernel/unprivileged_userns_clone` to disable that patch for now.
 
-Note that newer releases should not cause this problem any longer, as [explained](https://www.debian.org/releases/bullseye/amd64/release-notes/ch-information.en.html#linux-user-namespaces) in the Debian release notes.
+### Examples
+  - looqs: https://gitea.quitesimple.org/crtxcr/looqs
+  - qswiki: https://gitea.quitesimple.org/crtxcr/qswiki
 
-### Why "vows"?
+Outdated:
-pledge() cannot be properly implemented using seccomp. The "vow" concept here may look similiar, and it is, but it's not pledge(). 
+  - cgit sandboxed: https://gitea.quitesimple.org/crtxcr/cgitsb
-
+  - qpdfviewsb sandboxed (quick and dirty): https://gitea.quitesimple.org/crtxcr/qpdfviewsb
-### Other projects
- - [sandbox2](https://developers.google.com/code-sandboxing/sandbox2/)
 
 
 ### Contributing

exile.hpp

@@ -1,201 +0,0 @@
-#include "exile.h"
-#include <functional>
-#include <iostream>
-#include <string>
-#include <tuple>
-#include <memory>
-#include <sys/wait.h>
-
-#ifndef EXILE_MMAP_SIZE
-#define EXILE_MMAP_SIZE 128 * 1024 * 1024 //128MB
-#endif
-
-
-template<typename T, typename U, typename ... Args>
-class launch_arg
-{
-	static_assert(std::is_trivially_copyable_v<T>);
-	static_assert(!std::is_pointer_v<T>);
-
-public:
-	struct exile_policy *policy;
-	T *result_shm;
-	U fn;
-	std::tuple<Args...> args;
-
-	launch_arg(struct exile_policy *policy, T *result_shm, U fn, Args && ... args) : policy(policy),
-	result_shm(result_shm), fn(fn), args(std::forward<Args>(args)...) {}
-
-};
-
-template<typename T, typename U, typename ... Args>
-class launch_arg_serializer
-{
-	static_assert(std::is_copy_constructible_v<T>);
-
-public:
-	struct exile_policy *policy;
-	char *serialize_buffer;
-	size_t n;
-	U fn;
-	std::tuple<Args...> args;
-
-	const std::function<size_t (const T &, char *, size_t n)> &serializer;
-	const std::function<T(const char * buf, size_t n)> &deserializer;
-
-	launch_arg_serializer(struct exile_policy *policy, char *serialize_buffer, size_t n, const std::function<size_t (const T &, char *, size_t)> &serializer, const std::function<T(const char *, size_t)> &deserializer, U fn, Args && ... args) : policy(policy), serialize_buffer(serialize_buffer), n(n), fn(fn), args(std::forward<Args>(args)...), serializer(serializer), deserializer(deserializer)  {}
-};
-
-template<typename T, typename U, typename ... Args>
-int exile_clone_handle_trivial(void * arg)
-{
-	static_assert(std::is_trivially_copyable_v<T>);
-	static_assert(!std::is_pointer_v<T>);
-
-	launch_arg<T, U, Args...> *launchargs = (launch_arg<T, U,  Args...> *) arg;
-	int ret = exile_enable_policy(launchargs->policy);
-	if(ret != 0)
-	{
-		EXILE_LOG_ERROR("exile_enable_policy() failed: %s\n", strerror(errno));
-		return 1;
-	}
-	T result = std::apply(launchargs->fn, launchargs->args);
-	std::cout << result;
-	memcpy(launchargs->result_shm, &result, sizeof(T));
-	return 0;
-}
-
-template<typename T, typename U, typename ... Args>
-int exile_clone_handle_serializer(void * arg)
-{
-	static_assert(std::is_copy_constructible_v<T>);
-
-	launch_arg_serializer<T, U, Args...> *launchargs = (launch_arg_serializer<T, U, Args...> *) arg;
-	int ret = exile_enable_policy(launchargs->policy);
-	if(ret != 0)
-	{
-		EXILE_LOG_ERROR("exile_enable_policy() failed: %s\n", strerror(errno));
-		return 1;
-	}
-	T result = std::apply(launchargs->fn, launchargs->args);
-	/* TODO: exception handling */
-	/* TODO: ugly :S */
-	char *target = launchargs->serialize_buffer + sizeof(size_t);
-	size_t n = launchargs->n - sizeof(size_t);
-
-	size_t size = launchargs->serializer(result, target, n);
-	memcpy(launchargs->serialize_buffer, &size, sizeof(size_t));
-
-	return 0;
-}
-
-inline int do_clone(int (*clonefn)(void *), void *launcharg)
-{
-	struct rlimit rlimit;
-	int ret = getrlimit(RLIMIT_STACK, &rlimit);
-	if(ret != 0)
-	{
-		EXILE_LOG_ERROR("Failed to get stack size: %s\n", strerror(errno));
-		return ret;
-	}
-	size_t size = rlimit.rlim_cur;
-	char *stack = (char *) calloc(1, size);
-	char *stackbegin = stack;
-	if(stack == NULL)
-	{
-		EXILE_LOG_ERROR("Failed to allocate stack memory for child\n");
-		return 1;
-	}
-	stack += size;
-
-	ret = clone(clonefn, stack, 17 /* SIGCHLD */, launcharg);
-	int status = 0;
-	waitpid(ret, &status, __WALL);
-	free(stackbegin);
-	if(WIFEXITED(status))
-	{
-		return WEXITSTATUS(status);
-	}
-	/* TODO: exception or what? */
-	return 23;
-}
-
-template<typename T, typename U, typename ... Args>
-typename std::enable_if_t<std::is_trivially_copyable_v<T> && !std::is_pointer_v<T>, T> exile_launch(struct exile_policy *policy, U fn, Args && ... args)
-{
-	size_t mapsize = sizeof(T);
-	T * sharedbuf =  (T *) mmap(NULL, mapsize , PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-	if(sharedbuf == NULL)
-	{
-		throw std::runtime_error(std::string("mmap failed: ") + strerror(errno));
-	}
-
-	std::shared_ptr<void> deleter(nullptr, [sharedbuf, mapsize](...){ munmap(sharedbuf, mapsize); });
-	launch_arg<T, U, Args...> launcharg(policy, sharedbuf, fn, std::forward<Args>(args)...);
-
-	int (*clonefn)(void *) = &exile_clone_handle_trivial<T, U, Args...>;
-	/* TODO: exception or what? */
-	int ret = do_clone(clonefn, &launcharg);
-	if(ret == 0)
-	{
-		return *sharedbuf;
-	}
-	throw std::runtime_error(std::string("clone() failed: " + std::to_string(ret)));
-	return T();
-}
-
-
-
-template<typename T, typename U, typename ... Args>
-typename std::enable_if_t<std::is_pointer_v<T> || (!std::is_trivially_copyable_v<T> && std::is_copy_constructible_v<T>), T>
-	exile_launch(struct exile_policy *policy, const std::function<size_t (const T &, char *, size_t)> &serializer, const std::function<T(const char *, size_t)> &deserializer, U fn, Args && ... args)
-{
-	size_t mapsize = EXILE_MMAP_SIZE;
-	char *sharedbuf =  (char *) mmap(NULL, mapsize , PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANON, -1, 0);
-	if(sharedbuf == NULL)
-	{
-		throw std::runtime_error(std::string("mmap failed: ") + strerror(errno));
-	}
-	std::shared_ptr<void> deleter(nullptr, [sharedbuf, mapsize](...){ munmap(sharedbuf, mapsize); });
-
-
-	launch_arg_serializer<T, U, Args...> launcharg(policy, sharedbuf, mapsize, serializer, deserializer, fn,												   std::forward<Args>(args)...);
-
-	int (*clonefn)(void *) = &exile_clone_handle_serializer<T, U, Args...>;
-	/* TODO: exception or what? */
-	int ret = do_clone(clonefn, &launcharg);
-	if(ret == 0)
-	{
-		size_t size = 0;
-		memcpy(&size, sharedbuf, sizeof(size));
-
-		return deserializer(sharedbuf + sizeof(size_t), size);
-	}
-	throw std::runtime_error(std::string("clone() failed: " + std::to_string(ret)));
-	return T();
-
-}
-
-template<class T>
-std::basic_string<typename T::value_type> deserialize_stdstring(const char *buf, size_t n)
-{
-	return std::basic_string<typename T::value_type> { buf, n };
-}
-
-template<class T>
-size_t serialize_stdstring(const std::basic_string<typename T::value_type> &t, char *buf, size_t n)
-{
-	if(n < t.size())
-	{
-		return 0;
-	}
-	memcpy(buf, t.data(), t.size());
-	return t.size();
-}
-
-
-template<typename T, typename U, typename ... Args>
-std::basic_string<typename T::value_type> exile_launch(struct exile_policy *policy, U fn, Args && ... args)
-{
-	return exile_launch<T, U, Args...>(policy, &serialize_stdstring<T>, &deserialize_stdstring<T>, fn, std::forward<Args>(args) ...);
-}

test.c

@@ -489,7 +489,6 @@ int test_no_new_fds()
 
 }
 
-extern int mkpath(const char *p, mode_t mode, int baseisfile);
 int test_mkpath()
 {
 	system("rm -rf /tmp/.exile.h/");
@@ -548,14 +547,12 @@ int test_fail_flags()
 	return 0;
 }
 
-
-static int *read_pipe = NULL;
 int do_launch_test(void *arg)
 {
 	int num = *(int *)(arg);
 	num += 1;
 	char buffer[512] = { 0 };
-	read(*read_pipe, buffer, sizeof(buffer)-1);
+	read(child_write_pipe[0], buffer, sizeof(buffer)-1);
 	printf("Sandboxed +1: %i\n", num);
 	printf("Echoing: %s\n", buffer);
 	fflush(stdout);
@@ -571,7 +568,6 @@ int test_launch()
 	params.func = &do_launch_test;
 	params.funcarg = #
 	params.policy = policy;
-	read_pipe = &params.child_write_pipe[0];
 	int launchfd = exile_launch(&params, &res);
 	if(launchfd < 0)
 	{
@@ -618,9 +614,9 @@ int test_launch_get()
 	size_t n = 0;
 	char *content = exile_launch_get(&params, &n);
 	unsigned int len = strlen(LAUNCH_GET_TEST_STR);
-	if(n != len)
+	if(n != strlen(LAUNCH_GET_TEST_STR))
 	{
-		LOG("Lenght does not match: %lu vs %u\n", n, len);
+		LOG("Lenght does does not match: %lu vs %u\n", n, len);
 		return 1;
 	}
 	if(strcmp(content, LAUNCH_GET_TEST_STR) != 0)
@@ -643,164 +639,6 @@ int test_vows_from_str()
 	return 0;
 }
 
-int test_clone3_nosys()
-{
-	struct exile_policy *policy = exile_init_policy();
-	policy->vow_promises = exile_vows_from_str("stdio rpath wpath cpath thread error");
-
-	exile_enable_policy(policy);
-	/* While args are invalid, it should never reach clone3 syscall handler, so it's irrelevant for
-	 our test*/
-	long ret =  syscall(__NR_clone3, NULL, 0);
-
-	if(ret == -1 && errno != ENOSYS)
-	{
-		LOG("clone3() was not allowed but did not return ENOSYS. It returned: %li, errno: %i\n", ret, errno);
-		return 1;
-	}
-	return 0;
-}
-
-int do_test_nsuidmap(const char *path,  const char *firstfield, const char *secondfield, const char *thirdfield)
-{
-	char *line = NULL;
-	size_t n = 0;
-	FILE *fp = fopen(path, "r");
-
-	int ret = getdelim(&line, &n, ' ', fp);
-	while(ret != -1 && strlen(line) == 1 && *line == ' ')
-		ret = getdelim(&line, &n, ' ', fp);
-	if(ret == -1)
-	{
-		LOG("getdelim() failed to read a line from %s\n", path);
-		return 1;
-	}
-	line[ret-1] = '\0';
-	if(strcmp(line, firstfield) != 0)
-	{
-		LOG("Invalid value for first entry in map: Expected: %s, was: %s\n", firstfield, line);
-		return 1;
-	}
-
-	ret = getdelim(&line, &n, ' ', fp);
-	while(ret != -1 && strlen(line) == 1 && *line == ' ')
-		ret = getdelim(&line, &n, ' ', fp);
-	if(ret == -1)
-	{
-		LOG("getdelim() failed to read a line from map\n");
-		return 1;
-	}
-	line[ret-1] = '\0';
-
-	if(strcmp(line, secondfield) != 0)
-	{
-		LOG("Invalid value for second entry in map: Expected: %s, was: %s\n", secondfield, line);
-		return 1;
-	}
-
-
-	ret = getdelim(&line, &n, ' ', fp);
-	while(ret != -1 && strlen(line) == 1 && *line == ' ')
-		ret = getdelim(&line, &n, ' ', fp);
-	if(ret == -1)
-	{
-		LOG("getdelim() failed to read a line from uid_map\n");
-		return 1;
-	}
-	line[ret-1] = '\0';
-	if(strcmp(line, thirdfield) != 0)
-	{
-		LOG("Invalid value for second entry in map: Expected: %s, was: %s\n", thirdfield, line);
-		return 1;
-	}
-
-	fclose(fp);
-	return 0;
-}
-
-int test_unshare_user()
-{
-	char uidstr[64];
-	snprintf(uidstr, sizeof(uidstr), "%u", getuid());
-
-	char gidstr[64];
-	snprintf(gidstr, sizeof(gidstr), "%u", getgid());
-
-	struct exile_policy *policy = exile_init_policy();
-	policy->namespace_options = EXILE_UNSHARE_USER;
-	xexile_enable_policy(policy);
-
-	if(do_test_nsuidmap("/proc/self/uid_map", "0", uidstr, "1") != 0)
-	{
-		LOG("/proc/self/uid_map failed\n");
-		return 1;
-	}
-
-	if(do_test_nsuidmap("/proc/self/gid_map", "0", gidstr, "1") != 0)
-	{
-		LOG("/proc/self/gid_map failed\n");
-		return 1;
-	}
-
-	FILE *fp = fopen("/proc/self/setgroups", "r");
-
-	char buffer[4096] = { 0 };
-	fread(buffer, sizeof(buffer), 1, fp);
-	fclose(fp);
-
-	if(strcmp(buffer, "deny\n") != 0)
-	{
-		LOG("/proc/self/setgroups does not contain 'deny'\n");
-		return 1;
-	}
-
-	return 0;
-}
-
-int test_unshare_user_own_uid()
-{
-	uid_t uid = getuid();
-	gid_t gid = getgid();
-
-	char uidstr[64];
-	snprintf(uidstr, sizeof(uidstr), "%u", uid);
-
-	char gidstr[64];
-	snprintf(gidstr, sizeof(gidstr), "%u", gid);
-
-	struct exile_policy *policy = exile_init_policy();
-	policy->namespace_options = EXILE_UNSHARE_USER;
-	policy->namespace_gid = gid;
-	policy->namespace_uid = uid;
-	xexile_enable_policy(policy);
-
-	if(do_test_nsuidmap("/proc/self/uid_map", uidstr, uidstr, "1") != 0)
-	{
-		LOG("/proc/self/uid_map failed\n");
-		return 1;
-	}
-
-	if(do_test_nsuidmap("/proc/self/gid_map", gidstr, gidstr, "1") != 0)
-	{
-		LOG("/proc/self/gid_map failed\n");
-		return 1;
-	}
-
-	FILE *fp = fopen("/proc/self/setgroups", "r");
-
-	char buffer[4096] = { 0 };
-	fread(buffer, sizeof(buffer), 1, fp);
-	fclose(fp);
-
-	if(strcmp(buffer, "deny\n") != 0)
-	{
-		LOG("/proc/self/setgroups does not contain 'deny'\n");
-		return 1;
-	}
-
-	return 0;
-}
-
 struct dispatcher
 {
 	char *name;
@@ -828,11 +666,6 @@ struct dispatcher dispatchers[] = {
 	{ "launch", &test_launch},
 	{ "launch-get", &test_launch_get},
 	{ "vow_from_str", &test_vows_from_str},
-	{ "clone3_nosys", &test_clone3_nosys},
-	{ "unshare-user", &test_unshare_user},
-	{ "unshare-user-own-uid", &test_unshare_user_own_uid},
-
-
 };
 
 int main(int argc, char *argv[])

test.cpp

@@ -1,92 +0,0 @@
-#include "exile.hpp"
-#include "assert.h"
-#include <map>
-
-std::string sandboxed_reverse(std::string str)
-{
-	std::reverse(str.begin(), str.end());
-	return str;
-}
-
-size_t stdstrlen(const std::string &str)
-{
-	return str.size();
-}
-
-int incrementer(int arg)
-{
-	return ++arg;
-}
-int test_exile_launch_trivial()
-{
-	int u = 22;
-	int result = exile_launch<int>(exile_init_policy(), &incrementer, u);
-	assert(result == 23);
-	return 0;
-}
-
-int test_exile_launch_stdstring()
-{
-	std::string str = "abc123";
-	std::string reversed = exile_launch<std::string>(exile_init_policy(), &sandboxed_reverse, str);
-	assert(reversed == "321cba");
-	return 0;
-}
-
-struct not_trivially_copyable
-{
-public:
-	std::string somecontent;
-};
-
-int test_exile_launch_serializer()
-{
-	static_assert(! std::is_trivially_copyable_v<not_trivially_copyable>);
-
-	auto serializer = [](const not_trivially_copyable &obj, char *buf, size_t n){
-		serialize_stdstring<std::string>(obj.somecontent, buf, n);
-		return obj.somecontent.size();
-	};
-
-	auto deserializer = [](const char *buffer, size_t n) {
-		not_trivially_copyable obj;
-		obj.somecontent = deserialize_stdstring<std::string>(buffer, n);
-		return obj;
-	};
-
-	not_trivially_copyable result = exile_launch<not_trivially_copyable>(exile_init_policy(), serializer, deserializer, []() {not_trivially_copyable obj; obj.somecontent = "Just something"; return obj;});
-
-	assert(result.somecontent == "Just something");
-	return 0;
-}
-
-int main(int argc, char *argv[])
-{
-	if(argc < 2)
-	{
-		std::cerr << "Missing test" << std::endl;
-		return 1;
-	}
-	std::map<std::string, int (*)()> map = {
-		{ "launch-trivial-cpp", &test_exile_launch_trivial} ,
-		{ "launch-stdstring-cpp", &test_exile_launch_stdstring },
-		{ "launch-serializer-cpp", &test_exile_launch_serializer },
-	};
-
-	std::string test = argv[1];
-	if(test == "--dumptests")
-	{
-		for(auto &entry : map)
-		{
-			std::cout << entry.first << std::endl;
-		}
-		return 0;
-	}
-	int (*fn)() = map[test];
-	if(fn != nullptr)
-	{
-		return fn();
-	}
-	std::cerr << "Unknown test" << std::endl;
-	return 1;
-}

test.sh

@@ -8,52 +8,50 @@ COUNT_SUCCEEDED=0
 COUNT_FAILED=0
 COUNT_SKIPPED=0
 
-print_fail()
+function print_fail()
 {
-	printf "${RED}$@${NC}\n" 1>&2
+	echo -e "${RED}$@${NC}" 1>&2
 }
 
-print_success()
+function print_success()
 {
-	printf "${GREEN}$@${NC}\n"
+	echo -e "${GREEN}$@${NC}"
 }
 
-print_skipped()
+function print_skipped()
 {
-	printf "${YELLOW}$@${NC}\n"
+	echo -e "${YELLOW}$@${NC}"
 }
 
-runtest_fail()
+function runtest_fail()
 {
 	print_fail "failed"
 	COUNT_FAILED=$(($COUNT_FAILED+1))
 }
 
-runtest_success()
+function runtest_success()
 {
 	print_success "ok"
 	COUNT_SUCCEEDED=$((COUNT_SUCCEEDED+1))
 }
 
-runtest_skipped()
+function runtest_skipped()
 {
 	print_skipped "skipped"
 	COUNT_SKIPPED=$((COUNT_SKIPPED+1))
 }
 
 
-runtest()
+function runtest()
 {
-	testbin="$1"
+	testname="$1"
-	testname="$2"
+	test_log_file="$2"
-	test_log_file="$3"
 
 	echo "Running: $testname. Date: $(date)" > "${test_log_file}"
 
-	echo -n "Running $testname... "
+	echo -n "Running $1... "
 	#exit $? to suppress shell message like "./test.sh: line 18: pid Bad system call"
-	(./$testbin "$testname" || exit $?) >> "${test_log_file}" 2>&1
+	(./test $1 || exit $?) &>> "${test_log_file}"
-
 	ret=$?
 	SUCCESS="no"
 	if [ $ret -eq 0 ] ; then
@@ -66,7 +64,7 @@ runtest()
 		runtest_fail
 	fi
 
-	echo "Finished: ${testname} (${testbin}). Date: $(date). Success: $SUCCESS" >> "${test_log_file}"
+	echo "Finished: ${testname}. Date: $(date). Success: $SUCCESS" >> "${test_log_file}"
 }
 
 GIT_ID=$( git log --pretty="format:%h" -n1 )
@@ -81,12 +79,7 @@ LOG_OUTPUT_DIR_PATH="${LOG_OUTPUT_DIR}/exile_test_${GIT_ID}_${TIMESTAMP}"
 
 for test in $( ./test --dumptests ) ; do
 	testname=$( echo $test )
-	runtest test "$testname" "${LOG_OUTPUT_DIR_PATH}/log.${testname}"
+	runtest "$testname" "${LOG_OUTPUT_DIR_PATH}/log.${testname}"
-done
-
-for test in $( ./testcpp --dumptests ) ; do
-	testname=$( echo $test )
-	runtest testcpp "$testname" "${LOG_OUTPUT_DIR_PATH}/log.${testname}"
 done
 echo
 echo "Tests finished. Logs in $(realpath ${LOG_OUTPUT_DIR_PATH})"