X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fbus-proxyd%2Fproxy.c;h=4be2a6289aca7a738c93135b37ba30132dc3aad0;hp=f7daec68fd7feae920343fd1436699137c9272cc;hb=d90c154eb180783098683ce8e1c03cd29d9b77ce;hpb=7447362c530e3f7128f16a35d1e43da4251144cc diff --git a/src/bus-proxyd/proxy.c b/src/bus-proxyd/proxy.c index f7daec68f..4be2a6289 100644 --- a/src/bus-proxyd/proxy.c +++ b/src/bus-proxyd/proxy.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include @@ -53,7 +53,7 @@ #include "proxy.h" #include "synthesize.h" -static int proxy_create_dest(Proxy *p, const char *dest, const char *local_sec, bool negotiate_fds) { +static int proxy_create_destination(Proxy *p, const char *destination, const char *local_sec, bool negotiate_fds) { _cleanup_bus_close_unref_ sd_bus *b = NULL; int r; @@ -65,7 +65,7 @@ static int proxy_create_dest(Proxy *p, const char *dest, const char *local_sec, if (r < 0) return log_error_errno(r, "Failed to set bus name: %m"); - r = sd_bus_set_address(b, dest); + r = sd_bus_set_address(b, destination); if (r < 0) return log_error_errno(r, "Failed to set address to connect to: %m"); @@ -73,7 +73,7 @@ static int proxy_create_dest(Proxy *p, const char *dest, const char *local_sec, if (r < 0) return log_error_errno(r, "Failed to set FD negotiation: %m"); - r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT); + r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_EUID|SD_BUS_CREDS_PID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_SELINUX_CONTEXT); if (r < 0) return log_error_errno(r, "Failed to set credential negotiation: %m"); @@ -81,12 +81,12 @@ static int proxy_create_dest(Proxy *p, const char *dest, const char *local_sec, b->fake_pids.pid = p->local_creds.pid; b->fake_pids_valid = true; - b->fake_creds.uid = p->local_creds.uid; - b->fake_creds.euid = UID_INVALID; + b->fake_creds.uid = UID_INVALID; + b->fake_creds.euid = p->local_creds.uid; b->fake_creds.suid = UID_INVALID; b->fake_creds.fsuid = UID_INVALID; - b->fake_creds.gid = p->local_creds.gid; - b->fake_creds.egid = GID_INVALID; + b->fake_creds.gid = GID_INVALID; + b->fake_creds.egid = p->local_creds.gid; b->fake_creds.sgid = GID_INVALID; b->fake_creds.fsgid = GID_INVALID; b->fake_creds_valid = true; @@ -104,7 +104,7 @@ static int proxy_create_dest(Proxy *p, const char *dest, const char *local_sec, if (r < 0) return log_error_errno(r, "Failed to start bus client: %m"); - p->dest_bus = b; + p->destination_bus = b; b = NULL; return 0; } @@ -122,7 +122,7 @@ static int proxy_create_local(Proxy *p, int in_fd, int out_fd, bool negotiate_fd if (r < 0) return log_error_errno(r, "Failed to set fds: %m"); - r = sd_bus_get_bus_id(p->dest_bus, &server_id); + r = sd_bus_get_bus_id(p->destination_bus, &server_id); if (r < 0) return log_error_errno(r, "Failed to get server ID: %m"); @@ -134,7 +134,7 @@ static int proxy_create_local(Proxy *p, int in_fd, int out_fd, bool negotiate_fd if (r < 0) return log_error_errno(r, "Failed to set FD negotiation: %m"); - r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_UID|SD_BUS_CREDS_PID|SD_BUS_CREDS_GID|SD_BUS_CREDS_SELINUX_CONTEXT); + r = sd_bus_negotiate_creds(b, true, SD_BUS_CREDS_EUID|SD_BUS_CREDS_PID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_SELINUX_CONTEXT); if (r < 0) return log_error_errno(r, "Failed to set credential negotiation: %m"); @@ -158,10 +158,10 @@ static int proxy_prepare_matches(Proxy *p) { const char *unique; int r; - if (!p->dest_bus->is_kernel) + if (!p->destination_bus->is_kernel) return 0; - r = sd_bus_get_unique_name(p->dest_bus, &unique); + r = sd_bus_get_unique_name(p->destination_bus, &unique); if (r < 0) return log_error_errno(r, "Failed to get unique name: %m"); @@ -177,7 +177,7 @@ static int proxy_prepare_matches(Proxy *p) { if (!match) return log_oom(); - r = sd_bus_add_match(p->dest_bus, NULL, match, NULL, NULL); + r = sd_bus_add_match(p->destination_bus, NULL, match, NULL, NULL); if (r < 0) return log_error_errno(r, "Failed to add match for NameLost: %m"); @@ -194,14 +194,14 @@ static int proxy_prepare_matches(Proxy *p) { if (!match) return log_oom(); - r = sd_bus_add_match(p->dest_bus, NULL, match, NULL, NULL); + r = sd_bus_add_match(p->destination_bus, NULL, match, NULL, NULL); if (r < 0) return log_error_errno(r, "Failed to add match for NameAcquired: %m"); return 0; } -int proxy_new(Proxy **out, int in_fd, int out_fd, const char *dest) { +int proxy_new(Proxy **out, int in_fd, int out_fd, const char *destination) { _cleanup_(proxy_freep) Proxy *p = NULL; _cleanup_free_ char *local_sec = NULL; bool is_unix; @@ -226,7 +226,7 @@ int proxy_new(Proxy **out, int in_fd, int out_fd, const char *dest) { (void) getpeersec(in_fd, &local_sec); } - r = proxy_create_dest(p, dest, local_sec, is_unix); + r = proxy_create_destination(p, destination, local_sec, is_unix); if (r < 0) return r; @@ -248,7 +248,7 @@ Proxy *proxy_free(Proxy *p) { return NULL; sd_bus_close_unrefp(&p->local_bus); - sd_bus_close_unrefp(&p->dest_bus); + sd_bus_close_unrefp(&p->destination_bus); set_free_free(p->owned_names); free(p); @@ -264,7 +264,7 @@ int proxy_set_policy(Proxy *p, SharedPolicy *sp, char **configuration) { assert(sp); /* no need to load legacy policy if destination is not kdbus */ - if (!p->dest_bus->is_kernel) + if (!p->destination_bus->is_kernel) return 0; p->policy = sp; @@ -279,7 +279,7 @@ int proxy_set_policy(Proxy *p, SharedPolicy *sp, char **configuration) { if (!configuration) { const char *scope; - r = sd_bus_get_scope(p->dest_bus, &scope); + r = sd_bus_get_scope(p->destination_bus, &scope); if (r < 0) return log_error_errno(r, "Couldn't determine bus scope: %m"); @@ -329,23 +329,23 @@ int proxy_hello_policy(Proxy *p, uid_t original_uid) { } static int proxy_wait(Proxy *p) { - uint64_t timeout_dest, timeout_local, t; - int events_dest, events_local, fd; + uint64_t timeout_destination, timeout_local, t; + int events_destination, events_local, fd; struct timespec _ts, *ts; struct pollfd *pollfd; int r; assert(p); - fd = sd_bus_get_fd(p->dest_bus); + fd = sd_bus_get_fd(p->destination_bus); if (fd < 0) return log_error_errno(fd, "Failed to get fd: %m"); - events_dest = sd_bus_get_events(p->dest_bus); - if (events_dest < 0) - return log_error_errno(events_dest, "Failed to get events mask: %m"); + events_destination = sd_bus_get_events(p->destination_bus); + if (events_destination < 0) + return log_error_errno(events_destination, "Failed to get events mask: %m"); - r = sd_bus_get_timeout(p->dest_bus, &timeout_dest); + r = sd_bus_get_timeout(p->destination_bus, &timeout_destination); if (r < 0) return log_error_errno(r, "Failed to get timeout: %m"); @@ -357,8 +357,8 @@ static int proxy_wait(Proxy *p) { if (r < 0) return log_error_errno(r, "Failed to get timeout: %m"); - t = timeout_dest; - if (t == (uint64_t) -1 || (timeout_local != (uint64_t) -1 && timeout_local < timeout_dest)) + t = timeout_destination; + if (t == (uint64_t) -1 || (timeout_local != (uint64_t) -1 && timeout_local < timeout_destination)) t = timeout_local; if (t == (uint64_t) -1) @@ -376,7 +376,7 @@ static int proxy_wait(Proxy *p) { } pollfd = (struct pollfd[3]) { - { .fd = fd, .events = events_dest, }, + { .fd = fd, .events = events_destination, }, { .fd = p->local_in, .events = events_local & POLLIN, }, { .fd = p->local_out, .events = events_local & POLLOUT, }, }; @@ -431,10 +431,10 @@ static int process_policy_unlocked(sd_bus *from, sd_bus *to, sd_bus_message *m, return 0; /* The message came from the kernel, and is sent to our legacy client. */ - sd_bus_creds_get_well_known_names(&m->creds, &sender_names); + (void) sd_bus_creds_get_well_known_names(&m->creds, &sender_names); - (void) sd_bus_creds_get_uid(&m->creds, &sender_uid); - (void) sd_bus_creds_get_gid(&m->creds, &sender_gid); + (void) sd_bus_creds_get_euid(&m->creds, &sender_uid); + (void) sd_bus_creds_get_egid(&m->creds, &sender_gid); if (sender_uid == UID_INVALID || sender_gid == GID_INVALID) { _cleanup_bus_creds_unref_ sd_bus_creds *sender_creds = NULL; @@ -446,12 +446,12 @@ static int process_policy_unlocked(sd_bus *from, sd_bus *to, sd_bus_message *m, * case, query the creds of the peer * instead. */ - r = bus_get_name_creds_kdbus(from, m->sender, SD_BUS_CREDS_UID|SD_BUS_CREDS_GID, true, &sender_creds); + r = bus_get_name_creds_kdbus(from, m->sender, SD_BUS_CREDS_EUID|SD_BUS_CREDS_EGID, true, &sender_creds); if (r < 0) return handle_policy_error(m, r); - (void) sd_bus_creds_get_uid(sender_creds, &sender_uid); - (void) sd_bus_creds_get_gid(sender_creds, &sender_gid); + (void) sd_bus_creds_get_euid(sender_creds, &sender_uid); + (void) sd_bus_creds_get_egid(sender_creds, &sender_gid); } /* First check whether the sender can send the message to our name */ @@ -483,7 +483,7 @@ static int process_policy_unlocked(sd_bus *from, sd_bus *to, sd_bus_message *m, if (m->destination) { r = bus_get_name_creds_kdbus(to, m->destination, SD_BUS_CREDS_WELL_KNOWN_NAMES|SD_BUS_CREDS_UNIQUE_NAME| - SD_BUS_CREDS_UID|SD_BUS_CREDS_GID|SD_BUS_CREDS_PID, + SD_BUS_CREDS_EUID|SD_BUS_CREDS_EGID|SD_BUS_CREDS_PID, true, &destination_creds); if (r < 0) return handle_policy_error(m, r); @@ -492,10 +492,10 @@ static int process_policy_unlocked(sd_bus *from, sd_bus *to, sd_bus_message *m, if (r < 0) return handle_policy_error(m, r); - sd_bus_creds_get_well_known_names(destination_creds, &destination_names); + (void) sd_bus_creds_get_well_known_names(destination_creds, &destination_names); - (void) sd_bus_creds_get_uid(destination_creds, &destination_uid); - (void) sd_bus_creds_get_gid(destination_creds, &destination_gid); + (void) sd_bus_creds_get_euid(destination_creds, &destination_uid); + (void) sd_bus_creds_get_egid(destination_creds, &destination_gid); } /* First check if we (the sender) can send to this name */ @@ -576,22 +576,22 @@ static int process_hello(Proxy *p, sd_bus_message *m) { if (p->got_hello) return 0; - return log_error_errno(-EIO, "First packet isn't hello (it's %s.%s), aborting.", m->interface, m->member); + return log_error_errno(EIO, "First packet isn't hello (it's %s.%s), aborting.", m->interface, m->member); } if (p->got_hello) - return log_error_errno(-EIO, "Got duplicate hello, aborting."); + return log_error_errno(EIO, "Got duplicate hello, aborting."); p->got_hello = true; - if (!p->dest_bus->is_kernel) + if (!p->destination_bus->is_kernel) return 0; r = sd_bus_message_new_method_return(m, &n); if (r < 0) return log_error_errno(r, "Failed to generate HELLO reply: %m"); - r = sd_bus_message_append(n, "s", p->dest_bus->unique_name); + r = sd_bus_message_append(n, "s", p->destination_bus->unique_name); if (r < 0) return log_error_errno(r, "Failed to append unique name to HELLO reply: %m"); @@ -617,7 +617,7 @@ static int process_hello(Proxy *p, sd_bus_message *m) { if (r < 0) return log_error_errno(r, "Failed to allocate initial NameAcquired message: %m"); - r = sd_bus_message_append(n, "s", p->dest_bus->unique_name); + r = sd_bus_message_append(n, "s", p->destination_bus->unique_name); if (r < 0) return log_error_errno(r, "Failed to append unique name to NameAcquired message: %m"); @@ -666,20 +666,19 @@ static int patch_sender(sd_bus *a, sd_bus_message *m) { return 0; } -static int proxy_process_dest_to_local(Proxy *p) { +static int proxy_process_destination_to_local(Proxy *p) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; assert(p); - r = sd_bus_process(p->dest_bus, &m); + r = sd_bus_process(p->destination_bus, &m); + if (r == -ECONNRESET || r == -ENOTCONN) /* Treat 'connection reset by peer' as clean exit condition */ + return r; if (r < 0) { - /* treat 'connection reset by peer' as clean exit condition */ - if (r != -ECONNRESET) - log_error_errno(r, "Failed to process destination bus: %m"); + log_error_errno(r, "Failed to process destination bus: %m"); return r; } - if (r == 0) return 0; if (!m) @@ -689,58 +688,67 @@ static int proxy_process_dest_to_local(Proxy *p) { if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected")) return -ECONNRESET; - r = synthesize_name_acquired(p->dest_bus, p->local_bus, m); + r = synthesize_name_acquired(p->destination_bus, p->local_bus, m); + if (r == -ECONNRESET || r == -ENOTCONN) + return r; if (r < 0) return log_error_errno(r, "Failed to synthesize message: %m"); - patch_sender(p->dest_bus, m); + patch_sender(p->destination_bus, m); if (p->policy) { - r = process_policy(p->dest_bus, p->local_bus, m, p->policy, &p->local_creds, p->owned_names); + r = process_policy(p->destination_bus, p->local_bus, m, p->policy, &p->local_creds, p->owned_names); + if (r == -ECONNRESET || r == -ENOTCONN) + return r; if (r < 0) return log_error_errno(r, "Failed to process policy: %m"); - else if (r > 0) + if (r > 0) return 1; } r = sd_bus_send(p->local_bus, m, NULL); if (r < 0) { - if (r == -EPERM && m->reply_cookie > 0) { - /* If the peer tries to send a reply and it is rejected with EPERM - * by the kernel, we ignore the error. This catches cases where the - * original method-call didn't had EXPECT_REPLY set, but the proxy-peer - * still sends a reply. This is allowed in dbus1, but not in kdbus. We - * don't want to track reply-windows in the proxy, so we simply ignore - * EPERM for all replies. The only downside is, that callers are no - * longer notified if their replies are dropped. However, this is - * equivalent to the caller's timeout to expire, so this should be - * acceptable. Nobody sane sends replies without a matching method-call, - * so nobody should care. */ - return 1; - } else { - if (r != -ECONNRESET) - log_error_errno(r, "Failed to send message to client: %m"); + if (r == -ECONNRESET || r == -ENOTCONN) return r; - } + + /* If the peer tries to send a reply and it is + * rejected with EPERM by the kernel, we ignore the + * error. This catches cases where the original + * method-call didn't had EXPECT_REPLY set, but the + * proxy-peer still sends a reply. This is allowed in + * dbus1, but not in kdbus. We don't want to track + * reply-windows in the proxy, so we simply ignore + * EPERM for all replies. The only downside is, that + * callers are no longer notified if their replies are + * dropped. However, this is equivalent to the + * caller's timeout to expire, so this should be + * acceptable. Nobody sane sends replies without a + * matching method-call, so nobody should care. */ + if (r == -EPERM && m->reply_cookie > 0) + return 1; + + /* Return the error to the client, if we can */ + synthetic_reply_method_errnof(m, r, "Failed to forward message we got from destination: %m"); + log_error_errno(r, "Failed to send message to client, ignoring: %m"); + return 1; } return 1; } -static int proxy_process_local_to_dest(Proxy *p) { +static int proxy_process_local_to_destination(Proxy *p) { _cleanup_bus_message_unref_ sd_bus_message *m = NULL; int r; assert(p); r = sd_bus_process(p->local_bus, &m); + if (r == -ECONNRESET || r == -ENOTCONN) /* Treat 'connection reset by peer' as clean exit condition */ + return r; if (r < 0) { - /* treat 'connection reset by peer' as clean exit condition */ - if (r != -ECONNRESET) - log_error_errno(r, "Failed to process local bus: %m"); + log_error_errno(r, "Failed to process local bus: %m"); return r; } - if (r == 0) return 0; if (!m) @@ -751,39 +759,48 @@ static int proxy_process_local_to_dest(Proxy *p) { return -ECONNRESET; r = process_hello(p, m); + if (r == -ECONNRESET || r == -ENOTCONN) + return r; if (r < 0) return log_error_errno(r, "Failed to process HELLO: %m"); - else if (r > 0) + if (r > 0) return 1; - r = bus_proxy_process_driver(p->dest_bus, p->local_bus, m, p->policy, &p->local_creds, p->owned_names); + r = bus_proxy_process_driver(p->destination_bus, p->local_bus, m, p->policy, &p->local_creds, p->owned_names); + if (r == -ECONNRESET || r == -ENOTCONN) + return r; if (r < 0) return log_error_errno(r, "Failed to process driver calls: %m"); - else if (r > 0) + if (r > 0) return 1; for (;;) { if (p->policy) { - r = process_policy(p->local_bus, p->dest_bus, m, p->policy, &p->local_creds, p->owned_names); + r = process_policy(p->local_bus, p->destination_bus, m, p->policy, &p->local_creds, p->owned_names); + if (r == -ECONNRESET || r == -ENOTCONN) + return r; if (r < 0) return log_error_errno(r, "Failed to process policy: %m"); - else if (r > 0) + if (r > 0) return 1; } - r = sd_bus_send(p->dest_bus, m, NULL); + r = sd_bus_send(p->destination_bus, m, NULL); if (r < 0) { - if (r == -EREMCHG) { - /* The name database changed since the policy check, hence let's check again */ + if (r == -ECONNRESET || r == -ENOTCONN) + return r; + + /* The name database changed since the policy check, hence let's check again */ + if (r == -EREMCHG) continue; - } else if (r == -EPERM && m->reply_cookie > 0) { - /* see above why EPERM is ignored for replies */ + + /* see above why EPERM is ignored for replies */ + if (r == -EPERM && m->reply_cookie > 0) return 1; - } else { - if (r != -ECONNRESET) - log_error_errno(r, "Failed to send message to bus: %m"); - return r; - } + + synthetic_reply_method_errnof(m, r, "Failed to forward message we got from local: %m"); + log_error_errno(r, "Failed to send message to bus: %m"); + return 1; } break; @@ -802,26 +819,28 @@ int proxy_run(Proxy *p) { if (p->got_hello) { /* Read messages from bus, to pass them on to our client */ - r = proxy_process_dest_to_local(p); - if (r == -ECONNRESET) + r = proxy_process_destination_to_local(p); + if (r == -ECONNRESET || r == -ENOTCONN) return 0; - else if (r < 0) + if (r < 0) return r; - else if (r > 0) + if (r > 0) busy = true; } /* Read messages from our client, to pass them on to the bus */ - r = proxy_process_local_to_dest(p); - if (r == -ECONNRESET) + r = proxy_process_local_to_destination(p); + if (r == -ECONNRESET || r == -ENOTCONN) return 0; - else if (r < 0) + if (r < 0) return r; - else if (r > 0) + if (r > 0) busy = true; if (!busy) { r = proxy_wait(p); + if (r == -ECONNRESET || r == -ENOTCONN) + return 0; if (r < 0) return r; }