mirror of
https://github.com/troglobit/finit.git
synced 2026-11-01 13:10:32 +00:00
libink/dbus: identify the caller behind a broker
On the local bus SO_PEERCRED says who is calling and the kernel is the one saying it. Behind a broker one connection carries every caller, so that credential describes dbus-daemon and nothing else, and every privileged method was refused there, root included. Ask the bus driver instead. libink parks the call and hands us the sender; we ask GetConnectionUnixUser and answer when the reply lands, through the same event loop as everything else. Nothing blocks: blocking in PID 1 is why libuEv exists. That needs calls libink can make on a connection it already has, so it gained those too. Answers are cached, since a bus never reuses a unique name while it runs. Not across a restart though: a new dbus-daemon numbers from scratch and :1.7 becomes somebody else, so the cache goes when the broker does. A sender name too long to key on is refused rather than truncated, two callers sharing a truncated key would share an identity. Privilege is no longer uid 0 alone. The socket is already owned by the --with-group group, so refusing its members every method that changes anything left a wheel user able to open the bus and unable to reboot. Both gates now say the same thing. Group membership needs NSS, which the C library loads with dlopen(), so the lookup is compiled out where Finit is built to link statically. That leaves such a build root-only, which is worth saying out loud rather than leaving to be discovered. Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
1 parent
d710a23513
commit
63aabaa6df
17 files changed
+774
-90
No files matched your search
+71
-1
@@ -5,6 +5,7 @@
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
@@ -21,6 +22,70 @@ uid_t link_connection_get_uid(const link_connection_t *conn)
|
||||
return conn ? conn->peer_uid : (uid_t)-1;
|
||||
}
|
||||
|
||||
/* Issue a method call and remember the serial so the reply can be
|
||||
* handed back to `cb` when the read loop picks it up. Nothing here
|
||||
* waits: this is the counterpart of link_client_call() for a
|
||||
* connection already owned by the event loop. */
|
||||
int link_connection_call(link_connection_t *conn, const char *destination,
|
||||
const char *path, const char *interface, const char *member,
|
||||
link_reply_cb_t cb, void *userdata,
|
||||
const char *signature, ...)
|
||||
{
|
||||
uint8_t body[LINK_CALL_BODY_MAX];
|
||||
uint8_t hdr[LINK_CALL_HDR_MAX];
|
||||
ssize_t blen = 0;
|
||||
ssize_t hlen;
|
||||
uint32_t serial;
|
||||
int i;
|
||||
|
||||
if (!conn || conn->fd < 0 || !path || !member) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
for (i = 0; i < LINK_PENDING_CAP; i++) {
|
||||
if (!conn->pending[i].used)
|
||||
break;
|
||||
}
|
||||
if (i == LINK_PENDING_CAP) {
|
||||
errno = EBUSY;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (signature && *signature) {
|
||||
va_list ap;
|
||||
|
||||
va_start(ap, signature);
|
||||
blen = __marshal_va(body, sizeof(body), signature, ap);
|
||||
va_end(ap);
|
||||
if (blen < 0) {
|
||||
errno = EMSGSIZE;
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
serial = ++conn->next_serial;
|
||||
hlen = __msg_build_method_call(hdr, sizeof(hdr), serial, path, interface,
|
||||
member, destination, signature, (uint32_t)blen);
|
||||
if (hlen < 0) {
|
||||
errno = EMSGSIZE;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (__io_write_all(conn->fd, hdr, (size_t)hlen) < 0)
|
||||
return -1;
|
||||
if (blen > 0 && __io_write_all(conn->fd, body, (size_t)blen) < 0)
|
||||
return -1;
|
||||
|
||||
|
||||
conn->pending[i].used = 1;
|
||||
conn->pending[i].serial = serial;
|
||||
conn->pending[i].cb = cb;
|
||||
conn->pending[i].userdata = userdata;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void link_connection_close(link_connection_t *conn)
|
||||
{
|
||||
size_t i;
|
||||
@@ -28,6 +93,11 @@ void link_connection_close(link_connection_t *conn)
|
||||
if (!conn)
|
||||
return;
|
||||
|
||||
|
||||
/* Anything waiting on this connection has to be told, or a parked
|
||||
* call sits forever and its caller never hears back. */
|
||||
__dispatch_forget_conn(conn);
|
||||
|
||||
for (i = 0; i < conn->matches_count; i++)
|
||||
__match_free(conn->matches[i]);
|
||||
|
||||
@@ -52,7 +122,7 @@ static int process_binary(link_connection_t *conn)
|
||||
if (consumed < 0)
|
||||
return -1;
|
||||
|
||||
if (__dispatch_message(conn, &msg) < 0)
|
||||
if (__dispatch_message(conn, &msg, (size_t)consumed) < 0)
|
||||
return -1;
|
||||
|
||||
memmove(conn->rxbuf, conn->rxbuf + consumed,
|
||||
|
||||
Reference in new issue
Block a user