X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-bus.c;h=fba2afcc8d7838c6366686dbb8fde1d9d7b37ce6;hp=6bd2b53b0e6077b45af44a82b903857be70950f8;hb=657dbed29af59d519587aedf9f4a6ab921b0668c;hpb=7b9f7afcc04e80b77a2567b0750aa2cd03c1a1cd diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 6bd2b53b0..fba2afcc8 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -19,11 +19,12 @@ along with systemd; If not, see . ***/ -#include "bus-errors.h" +#include "bus-common-errors.h" #include "bus-util.h" -#include "resolved.h" #include "resolved-dns-domain.h" +#include "resolved-bus.h" +#include "resolved-def.h" static int reply_query_state(DnsQuery *q) { _cleanup_free_ char *ip = NULL; @@ -51,11 +52,14 @@ static int reply_query_state(DnsQuery *q) { case DNS_TRANSACTION_ATTEMPTS_MAX_REACHED: return sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "All attempts to contact name servers or networks failed"); + case DNS_TRANSACTION_INVALID_REPLY: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); + case DNS_TRANSACTION_RESOURCES: return sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_RESOURCES, "Not enough resources"); - case DNS_TRANSACTION_INVALID_REPLY: - return sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); + case DNS_TRANSACTION_ABORTED: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_ABORTED, "Query aborted"); case DNS_TRANSACTION_FAILURE: { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; @@ -72,7 +76,7 @@ static int reply_query_state(DnsQuery *q) { rc = p; } - n = strappenda(_BUS_ERROR_DNS, rc); + n = strjoina(_BUS_ERROR_DNS, rc); sd_bus_error_setf(&error, n, "Could not resolve '%s', server or network returned error %s", name, rc); } @@ -87,13 +91,13 @@ static int reply_query_state(DnsQuery *q) { } } -static int append_address(sd_bus_message *reply, DnsResourceRecord *rr, int ifindex) { +static int append_address(sd_bus_message *reply, DnsResourceRecord *rr) { int r; assert(reply); assert(rr); - r = sd_bus_message_open_container(reply, 'r', "iayi"); + r = sd_bus_message_open_container(reply, 'r', "iay"); if (r < 0) return r; @@ -116,10 +120,6 @@ static int append_address(sd_bus_message *reply, DnsResourceRecord *rr, int ifin if (r < 0) return r; - r = sd_bus_message_append(reply, "i", ifindex); - if (r < 0) - return r; - r = sd_bus_message_close_container(reply); if (r < 0) return r; @@ -132,7 +132,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL; unsigned added = 0, i; - int r, ifindex; + int r; assert(q); @@ -145,11 +145,13 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { if (r < 0) goto finish; - r = sd_bus_message_open_container(reply, 'a', "(iayi)"); + r = sd_bus_message_append(reply, "i", q->answer_ifindex); if (r < 0) goto finish; - ifindex = q->answer_ifindex; + r = sd_bus_message_open_container(reply, 'a', "(iay)"); + if (r < 0) + goto finish; if (q->answer) { answer = dns_answer_ref(q->answer); @@ -170,7 +172,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { continue; } - r = append_address(reply, answer->rrs[i], ifindex); + r = append_address(reply, answer->rrs[i]); if (r < 0) goto finish; @@ -181,7 +183,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { } } - if (added <= 0) { + if (added == 0) { if (!cname) { r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_SUCH_RR, "'%s' does not have any RR of requested type", q->request_hostname); goto finish; @@ -208,7 +210,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { if (r == 0) continue; - r = append_address(reply, answer->rrs[i], ifindex); + r = append_address(reply, answer->rrs[i]); if (r < 0) goto finish; @@ -218,6 +220,8 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { added++; } + // what about the cache? + /* If we didn't find anything, then let's restart the * query, this time with the cname */ if (added <= 0) { @@ -241,7 +245,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { /* Return the precise spelling and uppercasing reported by the server */ assert(canonical); - r = sd_bus_message_append(reply, "s", DNS_RESOURCE_KEY_NAME(canonical->key)); + r = sd_bus_message_append(reply, "st", DNS_RESOURCE_KEY_NAME(canonical->key), SD_RESOLVED_FLAGS_MAKE(q->answer_protocol, q->answer_family)); if (r < 0) goto finish; @@ -249,18 +253,34 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) { finish: if (r < 0) { - log_error("Failed to send hostname reply: %s", strerror(-r)); + log_error_errno(r, "Failed to send hostname reply: %m"); sd_bus_reply_method_errno(q->request, -r, NULL); } dns_query_free(q); } +static int check_ifindex_flags(int ifindex, uint64_t *flags, sd_bus_error *error) { + assert(flags); + + if (ifindex < 0) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index"); + + if (*flags & ~SD_RESOLVED_FLAGS_ALL) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid flags parameter"); + + if (*flags == 0) + *flags = SD_RESOLVED_FLAGS_DEFAULT; + + return 0; +} + static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_(dns_question_unrefp) DnsQuestion *question = NULL; Manager *m = userdata; const char *hostname; - int family; + int family, ifindex; + uint64_t flags; DnsQuery *q; int r; @@ -268,7 +288,7 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi assert(message); assert(m); - r = sd_bus_message_read(message, "si", &hostname, &family); + r = sd_bus_message_read(message, "isit", &ifindex, &hostname, &family, &flags); if (r < 0) return r; @@ -279,6 +299,10 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi if (r < 0) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid hostname '%s'", hostname); + r = check_ifindex_flags(ifindex, &flags, error); + if (r < 0) + return r; + question = dns_question_new(family == AF_UNSPEC ? 2 : 1); if (!question) return -ENOMEM; @@ -307,7 +331,7 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi return r; } - r = dns_query_new(m, &q, question); + r = dns_query_new(m, &q, question, ifindex, flags); if (r < 0) return r; @@ -316,6 +340,10 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi q->request_hostname = hostname; q->complete = bus_method_resolve_hostname_complete; + r = dns_query_bus_track(q, bus, message); + if (r < 0) + return r; + r = dns_query_go(q); if (r < 0) { dns_query_free(q); @@ -346,6 +374,10 @@ static void bus_method_resolve_address_complete(DnsQuery *q) { if (r < 0) goto finish; + r = sd_bus_message_append(reply, "i", q->answer_ifindex); + if (r < 0) + goto finish; + r = sd_bus_message_open_container(reply, 'a', "s"); if (r < 0) goto finish; @@ -368,7 +400,7 @@ static void bus_method_resolve_address_complete(DnsQuery *q) { } } - if (added <= 0) { + if (added == 0) { _cleanup_free_ char *ip = NULL; in_addr_to_string(q->request_family, &q->request_address, &ip); @@ -381,11 +413,15 @@ static void bus_method_resolve_address_complete(DnsQuery *q) { if (r < 0) goto finish; + r = sd_bus_message_append(reply, "t", SD_RESOLVED_FLAGS_MAKE(q->answer_protocol, q->answer_family)); + if (r < 0) + goto finish; + r = sd_bus_send(q->manager->bus, reply, NULL); finish: if (r < 0) { - log_error("Failed to send address reply: %s", strerror(-r)); + log_error_errno(r, "Failed to send address reply: %m"); sd_bus_reply_method_errno(q->request, -r, NULL); } @@ -398,6 +434,7 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void _cleanup_free_ char *reverse = NULL; Manager *m = userdata; int family, ifindex; + uint64_t flags; const void *d; DnsQuery *q; size_t sz; @@ -407,7 +444,7 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void assert(message); assert(m); - r = sd_bus_message_read(message, "i", &family); + r = sd_bus_message_read(message, "ii", &ifindex, &family); if (r < 0) return r; @@ -421,11 +458,13 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void if (sz != FAMILY_ADDRESS_SIZE(family)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid address size"); - r = sd_bus_message_read(message, "i", &ifindex); + r = sd_bus_message_read(message, "t", &flags); + if (r < 0) + return r; + + r = check_ifindex_flags(ifindex, &flags, error); if (r < 0) return r; - if (ifindex < 0) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index"); r = dns_name_reverse(family, d, &reverse); if (r < 0) @@ -445,7 +484,7 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void if (r < 0) return r; - r = dns_query_new(m, &q, question); + r = dns_query_new(m, &q, question, ifindex, flags); if (r < 0) return r; @@ -454,6 +493,10 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void memcpy(&q->request_address, d, sz); q->complete = bus_method_resolve_address_complete; + r = dns_query_bus_track(q, bus, message); + if (r < 0) + return r; + r = dns_query_go(q); if (r < 0) { dns_query_free(q); @@ -484,6 +527,10 @@ static void bus_method_resolve_record_complete(DnsQuery *q) { if (r < 0) goto finish; + r = sd_bus_message_append(reply, "i", q->answer_ifindex); + if (r < 0) + goto finish; + r = sd_bus_message_open_container(reply, 'a', "(qqay)"); if (r < 0) goto finish; @@ -538,11 +585,15 @@ static void bus_method_resolve_record_complete(DnsQuery *q) { if (r < 0) goto finish; + r = sd_bus_message_append(reply, "t", SD_RESOLVED_FLAGS_MAKE(q->answer_protocol, q->answer_family)); + if (r < 0) + goto finish; + r = sd_bus_send(q->manager->bus, reply, NULL); finish: if (r < 0) { - log_error("Failed to send record reply: %s", strerror(-r)); + log_error_errno(r, "Failed to send record reply: %m"); sd_bus_reply_method_errno(q->request, -r, NULL); } @@ -552,18 +603,18 @@ finish: static int bus_method_resolve_record(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; _cleanup_(dns_question_unrefp) DnsQuestion *question = NULL; - _cleanup_free_ char *reverse = NULL; Manager *m = userdata; - DnsQuery *q; - int r; uint16_t class, type; const char *name; + int r, ifindex; + uint64_t flags; + DnsQuery *q; assert(bus); assert(message); assert(m); - r = sd_bus_message_read(message, "sqq", &name, &class, &type); + r = sd_bus_message_read(message, "isqqt", &ifindex, &name, &class, &type, &flags); if (r < 0) return r; @@ -571,6 +622,10 @@ static int bus_method_resolve_record(sd_bus *bus, sd_bus_message *message, void if (r < 0) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid name '%s'", name); + r = check_ifindex_flags(ifindex, &flags, error); + if (r < 0) + return r; + question = dns_question_new(1); if (!question) return -ENOMEM; @@ -583,7 +638,7 @@ static int bus_method_resolve_record(sd_bus *bus, sd_bus_message *message, void if (r < 0) return r; - r = dns_query_new(m, &q, question); + r = dns_query_new(m, &q, question, ifindex, flags); if (r < 0) return r; @@ -591,6 +646,10 @@ static int bus_method_resolve_record(sd_bus *bus, sd_bus_message *message, void q->request_hostname = name; q->complete = bus_method_resolve_record_complete; + r = dns_query_bus_track(q, bus, message); + if (r < 0) + return r; + r = dns_query_go(q); if (r < 0) { dns_query_free(q); @@ -606,9 +665,9 @@ static int bus_method_resolve_record(sd_bus *bus, sd_bus_message *message, void static const sd_bus_vtable resolve_vtable[] = { SD_BUS_VTABLE_START(0), - SD_BUS_METHOD("ResolveHostname", "si", "a(iayi)s", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ResolveAddress", "iayi", "as", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ResolveRecord", "sqq", "a(qqay)", bus_method_resolve_record, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ResolveHostname", "isit", "ia(iay)st", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ResolveAddress", "iiayt", "iast", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD("ResolveRecord", "isqqt", "ia(qqay)t", bus_method_resolve_record, SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END, }; @@ -624,6 +683,28 @@ static int on_bus_retry(sd_event_source *s, usec_t usec, void *userdata) { return 0; } +static int match_prepare_for_sleep(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *ret_error) { + Manager *m = userdata; + int b, r; + + assert(bus); + assert(bus); + + r = sd_bus_message_read(message, "b", &b); + if (r < 0) { + log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m"); + return 0; + } + + if (b) + return 0; + + log_debug("Coming back from suspend, verifying all RRs..."); + + manager_verify_all(m); + return 0; +} + int manager_connect_bus(Manager *m) { int r; @@ -638,34 +719,37 @@ int manager_connect_bus(Manager *m) { * boot. Let's try in 5s again. As soon as we have * kdbus we can stop doing this... */ - log_debug("Failed to connect to bus, trying again in 5s: %s", strerror(-r)); + log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m"); r = sd_event_add_time(m->event, &m->bus_retry_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 5*USEC_PER_SEC, 0, on_bus_retry, m); - if (r < 0) { - log_error("Failed to install bus reconnect time event: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to install bus reconnect time event: %m"); return 0; } r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/resolve1", "org.freedesktop.resolve1.Manager", resolve_vtable, m); - if (r < 0) { - log_error("Failed to register object: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register object: %m"); r = sd_bus_request_name(m->bus, "org.freedesktop.resolve1", 0); - if (r < 0) { - log_error("Failed to register name: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register name: %m"); r = sd_bus_attach_event(m->bus, m->event, 0); - if (r < 0) { - log_error("Failed to attach bus to event loop: %s", strerror(-r)); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to attach bus to event loop: %m"); + + r = sd_bus_add_match(m->bus, &m->prepare_for_sleep_slot, + "type='signal'," + "sender='org.freedesktop.login1'," + "interface='org.freedesktop.login1.Manager'," + "member='PrepareForSleep'," + "path='/org/freedesktop/login1'", + match_prepare_for_sleep, + m); + if (r < 0) + log_error_errno(r, "Failed to add match for PrepareForSleep: %m"); return 0; }