Coverage: add a flag to disable capsicum when running for coverage

heichalot · Dec 10, 2021 · e9c06cd · e9c06cd
1 parent 7347761
commit e9c06cd
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 0 deletions.
diff --git a/libpkg/triggers.c b/libpkg/triggers.c
@@ -438,9 +438,11 @@ trigger_execute_lua(const char *script, bool sandbox, pkghash *args)
 		lua_args_table(L, arguments, i);
 #ifdef HAVE_CAPSICUM
 		if (sandbox) {
+#ifndef defined(PKG_COVERAGE)
 			if (cap_enter() < 0 && errno != ENOSYS) {
 				err(1, "cap_enter failed");
 			}
+#endif
 		}
 #endif
 		if (luaL_dostring(L, script)) {

diff --git a/src/audit.c b/src/audit.c
@@ -378,12 +378,14 @@ exec_audit(int argc, char **argv)
 
 	/* Now we have vulnxml loaded and check list formed */
 #ifdef HAVE_CAPSICUM
+#ifndef PKG_COVERAGE
 	if (cap_enter() < 0 && errno != ENOSYS) {
 		warn("cap_enter() failed");
 		pkg_audit_free(audit);
 		pkghash_destroy(check);
 		return (EPKG_FATAL);
 	}
+#endif
 #endif
 
 	if (pkg_audit_process(audit) == EPKG_OK) {

diff --git a/src/clean.c b/src/clean.c
@@ -382,11 +382,13 @@ exec_clean(int argc, char **argv)
 			return (EXIT_FAILURE);
 		}
 
+#ifndef PKG_COVERAGE
 		if (cap_enter() < 0 && errno != ENOSYS) {
 			warn("cap_enter() failed");
 			close(cachefd);
 			return (EXIT_FAILURE);
 		}
+#endif
 #endif
 
 	kv_init(dl);

diff --git a/src/event.c b/src/event.c
@@ -225,10 +225,12 @@ event_sandboxed_call(pkg_sandbox_cb func, int fd, void *ud)
 
 	/* Here comes child process */
 #ifdef HAVE_CAPSICUM
+#ifndef PKG_COVERAGE
 	if (cap_enter() < 0 && errno != ENOSYS) {
 		warn("cap_enter() failed");
 		_exit(EXIT_FAILURE);
 	}
+#endif
 #endif
 
 	ret = func(fd, ud);
@@ -332,10 +334,12 @@ event_sandboxed_get_string(pkg_sandbox_cb func, char **result, int64_t *len,
 		err(EXIT_FAILURE, "Unable to setrlimit(RLIMIT_NPROC)");
 
 #ifdef HAVE_CAPSICUM
+#ifndef PKG_COVERAGE
 	if (cap_enter() < 0 && errno != ENOSYS) {
 		warn("cap_enter() failed");
 		return (EPKG_FATAL);
 	}
+#endif
 #endif
 
 	ret = func(pair[0], ud);

diff --git a/src/info.c b/src/info.c
@@ -277,11 +277,13 @@ exec_info(int argc, char **argv)
 			return (EXIT_FAILURE);
 		}
 
+#ifndef PKG_COVERAGE
 		if (cap_enter() < 0 && errno != ENOSYS) {
 			warn("cap_enter() failed");
 			close(fd);
 			return (EXIT_FAILURE);
 		}
+#endif
 #endif
 		if (opt == INFO_TAG_NAMEVER)
 			opt |= INFO_FULL;

diff --git a/src/ssh.c b/src/ssh.c
@@ -81,11 +81,13 @@ exec_ssh(int argc, char **argv __unused)
 		return (EXIT_FAILURE);
 	}
 
+#ifndef PKG_COVERAGE
 	if (cap_enter() < 0 && errno != ENOSYS) {
 		warn("cap_enter() failed");
 		close(fd);
 		return (EXIT_FAILURE);
 	}
+#endif
 
 #endif
 	if (pkg_sshserve(fd) != EPKG_OK) {

diff --git a/src/updating.c b/src/updating.c
@@ -316,11 +316,13 @@ exec_updating(int argc, char **argv)
 		return (EXIT_FAILURE);
 	}
 
+#ifndef PKG_COVERAGE
 	if (cap_enter() < 0 && errno != ENOSYS) {
 		warn("cap_enter() failed");
 		fclose(fd);
 		return (EXIT_FAILURE);
 	}
+#endif
 #endif
 
 	SLIST_INIT(&origins);

diff --git a/src/upgrade.c b/src/upgrade.c
@@ -124,13 +124,15 @@ check_vulnerable(struct pkg_audit *audit, struct pkgdb *db, int sock)
 	drop_privileges();
 
 #ifdef HAVE_CAPSICUM
+#ifndef PKG_COVERAGE
 	if (cap_enter() < 0 && errno != ENOSYS) {
 		warn("cap_enter() failed");
 		pkg_audit_free(audit);
 		pkghash_destroy(check);
 		fclose(out);
 		return;
 	}
+#endif
 #endif
 
 	if (pkg_audit_process(audit) == EPKG_OK) {