Skip to content

Commit

Permalink
test: Gracefully handle running within user namespace with single user
Browse files Browse the repository at this point in the history
Unprivileged users often make themselves root by unsharing a user namespace
and then mapping their current user to root which does not require privileges.
Let's make sure our tests don't fail in such an environment by adding checks
where required to see if we're not running in a user namespace with only a
single user.

(cherry picked from commit ef31767ed7e21672a50b77e7b3935948aaba114c)
(cherry picked from commit ec5cdf9ba0e003de6f824a000c0bbe46fb4e0925)
(cherry picked from commit 4d4513c)
  • Loading branch information
DaanDeMeyer authored and bluca committed Sep 11, 2024
1 parent 8096e23 commit 1c514e7
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 10 deletions.
15 changes: 15 additions & 0 deletions src/shared/tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "strv.h"
#include "tests.h"
#include "tmpfile-util.h"
#include "uid-range.h"

char* setup_fake_runtime_dir(void) {
char t[] = "/tmp/fake-xdg-runtime-XXXXXX", *p;
Expand Down Expand Up @@ -165,6 +166,20 @@ bool have_namespaces(void) {
assert_not_reached();
}

bool userns_has_single_user(void) {
_cleanup_(uid_range_freep) UidRange *uidrange = NULL;

/* Check if we're in a user namespace with only a single user mapped in. We special case this
* scenario in a few tests because it's the only kind of namespace that can be created unprivileged
* and as such happens more often than not, so we make sure to deal with it so that all tests pass
* in such environments. */

if (uid_range_load_userns(&uidrange, NULL) < 0)
return false;

return uidrange->n_entries == 1 && uidrange->entries[0].nr == 1;
}

bool can_memlock(void) {
/* Let's see if we can mlock() a larger blob of memory. BPF programs are charged against
* RLIMIT_MEMLOCK, hence let's first make sure we can lock memory at all, and skip the test if we
Expand Down
1 change: 1 addition & 0 deletions src/shared/tests.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ void test_setup_logging(int level);
int write_tmpfile(char *pattern, const char *contents);

bool have_namespaces(void);
bool userns_has_single_user(void);

/* We use the small but non-trivial limit here */
#define CAN_MEMLOCK_SIZE (512 * 1024U)
Expand Down
2 changes: 1 addition & 1 deletion src/test/test-acl-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ TEST_RET(add_acls_for_user) {
cmd = strjoina("getfacl -p ", fn);
assert_se(system(cmd) == 0);

if (getuid() == 0) {
if (getuid() == 0 && !userns_has_single_user()) {
const char *nobody = NOBODY_USER_NAME;
r = get_user_creds(&nobody, &uid, NULL, NULL, NULL, 0);
if (r < 0)
Expand Down
7 changes: 5 additions & 2 deletions src/test/test-capability.c
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,13 @@ int main(int argc, char *argv[]) {

show_capabilities();

test_drop_privileges();
if (!userns_has_single_user())
test_drop_privileges();

test_update_inherited_set();

fork_test(test_have_effective_cap);
if (!userns_has_single_user())
fork_test(test_have_effective_cap);

if (run_ambient)
fork_test(test_apply_ambient_caps);
Expand Down
4 changes: 2 additions & 2 deletions src/test/test-chase.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ TEST(chase) {

/* Paths underneath the "root" with different UIDs while using CHASE_SAFE */

if (geteuid() == 0) {
if (geteuid() == 0 && !userns_has_single_user()) {
p = strjoina(temp, "/user");
assert_se(mkdir(p, 0755) >= 0);
assert_se(chown(p, UID_NOBODY, GID_NOBODY) >= 0);
Expand Down Expand Up @@ -313,7 +313,7 @@ TEST(chase) {
r = chase(p, NULL, 0, &result, NULL);
assert_se(r == -ENOENT);

if (geteuid() == 0) {
if (geteuid() == 0 && !userns_has_single_user()) {
p = strjoina(temp, "/priv1");
assert_se(mkdir(p, 0755) >= 0);

Expand Down
4 changes: 2 additions & 2 deletions src/test/test-chown-rec.c
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,8 @@ TEST(chown_recursive) {
}

static int intro(void) {
if (geteuid() != 0)
return log_tests_skipped("not running as root");
if (geteuid() != 0 || userns_has_single_user())
return log_tests_skipped("not running as root or in userns with single user");

return EXIT_SUCCESS;
}
Expand Down
7 changes: 7 additions & 0 deletions src/test/test-condition.c
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,13 @@ TEST(condition_test_group) {
condition_free(condition);
free(gid);

/* In an unprivileged user namespace with the current user mapped to root, all the auxiliary groups
* of the user will be mapped to the nobody group, which means the user in the user namespace is in
* both the root and the nobody group, meaning the next test can't work, so let's skip it in that
* case. */
if (in_group(NOBODY_GROUP_NAME) && in_group("root"))
return (void) log_tests_skipped("user is in both root and nobody group");

groupname = (char*)(getegid() == 0 ? NOBODY_GROUP_NAME : "root");
condition = condition_new(CONDITION_GROUP, groupname, false, false);
assert_se(condition);
Expand Down
4 changes: 2 additions & 2 deletions src/test/test-fs-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ TEST(chmod_and_chown) {
struct stat st;
const char *p;

if (geteuid() != 0)
return;
if (geteuid() != 0 || userns_has_single_user())
return (void) log_tests_skipped("not running as root or in userns with single user");

BLOCK_WITH_UMASK(0000);

Expand Down
3 changes: 3 additions & 0 deletions src/test/test-rm-rf.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ static void test_rm_rf_chmod_inner(void) {
TEST(rm_rf_chmod) {
int r;

if (getuid() == 0 && userns_has_single_user())
return (void) log_tests_skipped("running as root or in userns with single user");

if (getuid() == 0) {
/* This test only works unpriv (as only then the access mask for the owning user matters),
* hence drop privs here */
Expand Down
2 changes: 1 addition & 1 deletion src/test/test-socket-util.c
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ TEST(getpeercred_getpeergroups) {
struct ucred ucred;
int pair[2];

if (geteuid() == 0) {
if (geteuid() == 0 && !userns_has_single_user()) {
test_uid = 1;
test_gid = 2;
test_gids = (gid_t*) gids;
Expand Down

0 comments on commit 1c514e7

Please sign in to comment.