SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test-bus-peersockaddr: Migrate to new assertion macros

Browse Source
This commit is contained in:
Daan De Meyer
2025-11-12 14:24:12 +01:00
parent 491706368b
commit 4fd7bec2c9
1 changed files with 47 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-bus/test-bus-peersockaddr.c
+47 -57
View File
@@ -14,8 +14,8 @@
#include "user-util.h"
static bool gid_list_contained(const gid_t *a, size_t n, const gid_t *b, size_t m) {
assert_se(a || n == 0);
assert_se(b || m == 0);
ASSERT_TRUE(a || n == 0);
ASSERT_TRUE(b || m == 0);
/* Checks if every entry in a[] is also in b[] */
@@ -46,77 +46,70 @@ static void* server(void *p) {
sd_id128_t id;
int r;
assert_se(sd_id128_randomize(&id) >= 0);
ASSERT_OK(sd_id128_randomize(&id));
fd = accept4(listen_fd, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK);
assert_se(fd >= 0);
ASSERT_OK_ERRNO(fd = accept4(listen_fd, NULL, NULL, SOCK_CLOEXEC|SOCK_NONBLOCK));
assert_se(sd_bus_new(&bus) >= 0);
assert_se(sd_bus_set_fd(bus, fd, fd) >= 0);
ASSERT_OK(sd_bus_new(&bus));
ASSERT_OK(sd_bus_set_fd(bus, fd, fd));
TAKE_FD(fd);
assert_se(sd_bus_set_server(bus, true, id) >= 0);
assert_se(sd_bus_negotiate_creds(bus, 1, SD_BUS_CREDS_EUID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|SD_BUS_CREDS_DESCRIPTION|SD_BUS_CREDS_PIDFD|SD_BUS_CREDS_SUPPLEMENTARY_GIDS) >= 0);
assert_se(sd_bus_start(bus) >= 0);
assert_se(sd_bus_get_owner_creds(bus, SD_BUS_CREDS_EUID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|SD_BUS_CREDS_DESCRIPTION|SD_BUS_CREDS_PIDFD|SD_BUS_CREDS_SUPPLEMENTARY_GIDS, &c) >= 0);
ASSERT_OK(sd_bus_set_server(bus, true, id));
ASSERT_OK(sd_bus_negotiate_creds(bus, 1, SD_BUS_CREDS_EUID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|SD_BUS_CREDS_DESCRIPTION|SD_BUS_CREDS_PIDFD|SD_BUS_CREDS_SUPPLEMENTARY_GIDS));
ASSERT_OK(sd_bus_start(bus));
ASSERT_OK(sd_bus_get_owner_creds(bus, SD_BUS_CREDS_EUID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_PID|SD_BUS_CREDS_COMM|SD_BUS_CREDS_DESCRIPTION|SD_BUS_CREDS_PIDFD|SD_BUS_CREDS_SUPPLEMENTARY_GIDS, &c));
bus_creds_dump(c, /* f= */ NULL, /* terse= */ false);
uid_t u;
assert_se(sd_bus_creds_get_euid(c, &u) >= 0);
assert_se(u == getuid());
ASSERT_OK(sd_bus_creds_get_euid(c, &u));
ASSERT_EQ(u, getuid());
gid_t g;
assert_se(sd_bus_creds_get_egid(c, &g) >= 0);
assert_se(g == getgid());
ASSERT_OK(sd_bus_creds_get_egid(c, &g));
ASSERT_EQ(g, getgid());
pid_t pid;
assert_se(sd_bus_creds_get_pid(c, &pid) >= 0);
assert_se(pid == getpid_cached());
ASSERT_OK(sd_bus_creds_get_pid(c, &pid));
ASSERT_EQ(pid, getpid_cached());
int pidfd = -EBADF;
if (sd_bus_creds_get_pidfd_dup(c, &pidfd) >= 0) {
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
assert_se(pidref_set_pidfd_take(&pidref, pidfd) >= 0);
assert_se(pidref_is_self(&pidref));
ASSERT_OK(pidref_set_pidfd_take(&pidref, pidfd));
ASSERT_TRUE(pidref_is_self(&pidref));
}
const gid_t *gl = NULL;
int n;
n = sd_bus_creds_get_supplementary_gids(c, &gl);
int n = sd_bus_creds_get_supplementary_gids(c, &gl);
if (n >= 0) {
_cleanup_free_ gid_t *gg = NULL;
r = getgroups_alloc(&gg);
assert_se(r >= 0);
assert_se(gid_list_same(gl, n, gg, r));
ASSERT_OK(r = getgroups_alloc(&gg));
ASSERT_TRUE(gid_list_same(gl, n, gg, r));
}
const char *comm;
assert_se(sd_bus_creds_get_comm(c, &comm) >= 0);
assert_se(pid_get_comm(0, &our_comm) >= 0);
assert_se(streq_ptr(comm, our_comm));
ASSERT_OK(sd_bus_creds_get_comm(c, &comm));
ASSERT_OK(pid_get_comm(0, &our_comm));
ASSERT_STREQ(comm, our_comm);
const char *description;
assert_se(sd_bus_creds_get_description(c, &description) >= 0);
assert_se(streq_ptr(description, "wuffwuff"));
ASSERT_OK(sd_bus_creds_get_description(c, &description));
ASSERT_STREQ(description, "wuffwuff");
for (;;) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
r = sd_bus_process(bus, &m);
assert_se(r >= 0);
ASSERT_OK(r = sd_bus_process(bus, &m));
if (r == 0) {
assert_se(sd_bus_wait(bus, UINT64_MAX) >= 0);
ASSERT_OK(sd_bus_wait(bus, UINT64_MAX));
continue;
}
if (m && sd_bus_message_is_method_call(m, "foo.foo", "Foo") > 0) {
assert_se(sd_bus_reply_method_return(m, "s", "bar") >= 0);
ASSERT_OK(sd_bus_reply_method_return(m, "s", "bar"));
break;
}
}
@@ -129,15 +122,15 @@ static void* client(void *p) {
_cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
const char *z;
assert_se(sd_bus_new(&bus) >= 0);
assert_se(sd_bus_set_description(bus, "wuffwuff") >= 0);
assert_se(sd_bus_set_address(bus, p) >= 0);
assert_se(sd_bus_start(bus) >= 0);
ASSERT_OK(sd_bus_new(&bus));
ASSERT_OK(sd_bus_set_description(bus, "wuffwuff"));
ASSERT_OK(sd_bus_set_address(bus, p));
ASSERT_OK(sd_bus_start(bus));
assert_se(sd_bus_call_method(bus, "foo.foo", "/foo", "foo.foo", "Foo", NULL, &reply, "s", "foo") >= 0);
ASSERT_OK(sd_bus_call_method(bus, "foo.foo", "/foo", "foo.foo", "Foo", NULL, &reply, "s", "foo"));
assert_se(sd_bus_message_read(reply, "s", &z) >= 0);
assert_se(streq_ptr(z, "bar"));
ASSERT_OK(sd_bus_message_read(reply, "s", &z));
ASSERT_STREQ(z, "bar");
return NULL;
}
@@ -151,27 +144,24 @@ TEST(description) {
socklen_t salen;
pthread_t s, c;
fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0);
assert_se(fd >= 0);
assert_se(bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path)) >= 0); /* force auto-bind */
assert_se(listen(fd, 1) >= 0);
ASSERT_OK_ERRNO(fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC, 0));
ASSERT_OK_ERRNO(bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path))); /* force auto-bind */
ASSERT_OK_ERRNO(listen(fd, 1));
salen = sizeof(sa);
assert_se(getsockname(fd, &sa.sa, &salen) >= 0);
assert_se(salen >= offsetof(struct sockaddr_un, sun_path));
assert_se(sa.un.sun_path[0] == 0);
ASSERT_OK_ERRNO(getsockname(fd, &sa.sa, &salen));
ASSERT_GE(salen, offsetof(struct sockaddr_un, sun_path));
ASSERT_EQ(sa.un.sun_path[0], 0);
assert_se(asprintf(&a, "unix:abstract=%s", sa.un.sun_path + 1) >= 0);
ASSERT_OK(asprintf(&a, "unix:abstract=%s", sa.un.sun_path + 1));
assert_se(pthread_create(&s, NULL, server, INT_TO_PTR(fd)) == 0);
ASSERT_OK(-pthread_create(&s, NULL, server, INT_TO_PTR(fd)));
TAKE_FD(fd);
assert_se(pthread_create(&c, NULL, client, a) == 0);
ASSERT_OK(-pthread_create(&c, NULL, client, a));
assert_se(pthread_join(s, NULL) == 0);
assert_se(pthread_join(c, NULL) == 0);
ASSERT_OK(-pthread_join(s, NULL));
ASSERT_OK(-pthread_join(c, NULL));
}
DEFINE_TEST_MAIN(LOG_INFO);