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=1244b6dd079176af3db7ef35bb1920b911070471;hp=02e971dbf3bfe65092c92b29b05d4ced40ca19a9;hb=6073b6f26ab9fc6bf335faa7073ec443eef093fd;hpb=3cb10d3a0b1b6a7c44f307f2abb5215104e16941 diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 02e971dbf..1244b6dd0 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -25,140 +25,227 @@ #include "resolved.h" #include "resolved-dns-domain.h" -static void bus_method_resolve_hostname_complete(DnsQuery *q) { +static int reply_query_state(DnsQuery *q) { + _cleanup_free_ char *ip = NULL; + const char *name; int r; - assert(q); + if (q->request_hostname) + name = q->request_hostname; + else { + r = in_addr_to_string(q->request_family, &q->request_address, &ip); + if (r < 0) + return r; - switch(q->state) { + name = ip; + } + + switch (q->state) { - case DNS_QUERY_SKIPPED: - r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_NAME_SERVERS, "Not appropriate name servers or networks found"); - break; + case DNS_QUERY_NO_SERVERS: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_NAME_SERVERS, "No appropriate name servers or networks for name found"); case DNS_QUERY_TIMEOUT: - r = sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "Query timed out"); - break; + return sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "Query timed out"); case DNS_QUERY_ATTEMPTS_MAX: - r = sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "All attempts to contact name servers or networks failed"); - break; + return sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "All attempts to contact name servers or networks failed"); + + case DNS_QUERY_RESOURCES: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_RESOURCES, "Not enough resources"); + + case DNS_QUERY_INVALID_REPLY: + return sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); case DNS_QUERY_FAILURE: { _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - if (q->rcode == DNS_RCODE_NXDOMAIN) - sd_bus_error_setf(&error, _BUS_ERROR_DNS "NXDOMAIN", "Hostname %s does not exist", q->request_hostname); + if (q->answer_rcode == DNS_RCODE_NXDOMAIN) + sd_bus_error_setf(&error, _BUS_ERROR_DNS "NXDOMAIN", "'%s' not found", name); else { const char *rc, *n; - char p[DECIMAL_STR_MAX(q->rcode)]; + char p[3]; /* the rcode is 4 bits long */ - rc = dns_rcode_to_string(q->rcode); + rc = dns_rcode_to_string(q->answer_rcode); if (!rc) { - sprintf(p, "%i", q->rcode); + sprintf(p, "%i", q->answer_rcode); rc = p; } n = strappenda(_BUS_ERROR_DNS, rc); - - sd_bus_error_setf(&error, n, "Could not resolve hostname %s, server or network returned error %s", q->request_hostname, rc); + sd_bus_error_setf(&error, n, "Could not resolve '%s', server or network returned error %s", name, rc); } - r = sd_bus_reply_method_error(q->request, &error); - break; + return sd_bus_reply_method_error(q->request, &error); } - case DNS_QUERY_SUCCESS: { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - unsigned i, n, added = 0; + case DNS_QUERY_NULL: + case DNS_QUERY_PENDING: + case DNS_QUERY_SUCCESS: + default: + assert_not_reached("Impossible state"); + } +} + +static int append_address(sd_bus_message *reply, DnsResourceRecord *rr, int ifindex) { + int r; - assert(q->packet); + assert(reply); + assert(rr); - r = dns_packet_skip_question(q->packet); - if (r < 0) - goto parse_fail; + r = sd_bus_message_open_container(reply, 'r', "iayi"); + if (r < 0) + return r; - r = sd_bus_message_new_method_return(q->request, &reply); + if (rr->key->type == DNS_TYPE_A) { + r = sd_bus_message_append(reply, "i", AF_INET); if (r < 0) - goto finish; + return r; + + r = sd_bus_message_append_array(reply, 'y', &rr->a.in_addr, sizeof(struct in_addr)); - r = sd_bus_message_open_container(reply, 'a', "(yayi)"); + } else if (rr->key->type == DNS_TYPE_AAAA) { + r = sd_bus_message_append(reply, "i", AF_INET6); if (r < 0) - goto finish; + return r; - n = DNS_PACKET_ANCOUNT(q->packet) + - DNS_PACKET_NSCOUNT(q->packet) + - DNS_PACKET_ARCOUNT(q->packet); - for (i = 0; i < n; i++) { - _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; + r = sd_bus_message_append_array(reply, 'y', &rr->aaaa.in6_addr, sizeof(struct in6_addr)); + } else + return -EAFNOSUPPORT; + + 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; + + return 0; +} + +static void bus_method_resolve_hostname_complete(DnsQuery *q) { + _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *cname = NULL, *canonical = NULL; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL; + unsigned added = 0, i; + int r, ifindex; - r = dns_packet_read_rr(q->packet, &rr, NULL); + assert(q); + + if (q->state != DNS_QUERY_SUCCESS) { + r = reply_query_state(q); + goto finish; + } + + r = sd_bus_message_new_method_return(q->request, &reply); + if (r < 0) + goto finish; + + r = sd_bus_message_open_container(reply, 'a', "(iayi)"); + if (r < 0) + goto finish; + + answer = dns_answer_ref(q->answer); + ifindex = q->answer_ifindex; + + for (i = 0; i < answer->n_rrs; i++) { + r = dns_question_matches_rr(q->question, answer->rrs[i]); + if (r < 0) + goto parse_fail; + if (r == 0) { + /* Hmm, if this is not an address record, + maybe it's a cname? If so, remember this */ + r = dns_question_matches_cname(q->question, answer->rrs[i]); if (r < 0) goto parse_fail; + if (r > 0) + cname = dns_resource_record_ref(answer->rrs[i]); - if (rr->key.class != DNS_CLASS_IN) - continue; + continue; + } - if (!(q->request_family != AF_INET6 && rr->key.type == DNS_TYPE_A) && - !(q->request_family != AF_INET && rr->key.type == DNS_TYPE_AAAA)) - continue; + r = append_address(reply, answer->rrs[i], ifindex); + if (r < 0) + goto finish; - if (!dns_name_equal(rr->key.name, q->request_hostname)) - continue; + if (!canonical) + canonical = dns_resource_record_ref(answer->rrs[i]); - r = sd_bus_message_open_container(reply, 'r', "yayi"); - if (r < 0) - goto finish; + added ++; + } - if (rr->key.type == DNS_TYPE_A) { - r = sd_bus_message_append(reply, "y", AF_INET); - if (r < 0) - goto finish; + 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; + } - r = sd_bus_message_append_array(reply, 'y', &rr->a.in_addr, sizeof(struct in_addr)); - } else { - r = sd_bus_message_append(reply, "y", AF_INET6); - if (r < 0) - goto finish; + /* This has a cname? Then update the query with the + * new cname. */ + r = dns_query_cname_redirect(q, cname->cname.name); + if (r < 0) { + if (r == -ELOOP) + r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_CNAME_LOOP, "CNAME loop on '%s'", q->request_hostname); + else + r = sd_bus_reply_method_errno(q->request, -r, NULL); - r = sd_bus_message_append_array(reply, 'y', &rr->aaaa.in6_addr, sizeof(struct in6_addr)); - } - if (r < 0) - goto finish; + goto finish; + } - r = sd_bus_message_append(reply, "i", q->packet->ifindex); + /* Before we restart the query, let's see if any of + * the RRs we already got already answers our query */ + for (i = 0; i < answer->n_rrs; i++) { + r = dns_question_matches_rr(q->question, answer->rrs[i]); if (r < 0) - goto finish; + goto parse_fail; + if (r == 0) + continue; - r = sd_bus_message_close_container(reply); + r = append_address(reply, answer->rrs[i], ifindex); if (r < 0) goto finish; - added ++; + if (!canonical) + canonical = dns_resource_record_ref(answer->rrs[i]); + + added++; } + /* If we didn't find anything, then let's restart the + * query, this time with the cname */ if (added <= 0) { - r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_SUCH_RR, "Hostname %s does not have RR of this type", q->request_hostname); - break; + r = dns_query_go(q); + if (r == -ESRCH) { + r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_NAME_SERVERS, "No appropriate name servers or networks for name found"); + goto finish; + } + if (r < 0) { + r = sd_bus_reply_method_errno(q->request, -r, NULL); + goto finish; + } + return; } + } - r = sd_bus_message_close_container(reply); - if (r < 0) - goto finish; + r = sd_bus_message_close_container(reply); + if (r < 0) + goto finish; - r = sd_bus_send(q->manager->bus, reply, NULL); - break; - } + /* 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)); + if (r < 0) + goto finish; - parse_fail: - case DNS_QUERY_INVALID_REPLY: - r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); - break; + r = sd_bus_send(q->manager->bus, reply, NULL); + goto finish; - case DNS_QUERY_NULL: - case DNS_QUERY_SENT: - assert_not_reached("Unexpected query state"); - } +parse_fail: + r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); finish: if (r < 0) @@ -168,43 +255,56 @@ finish: } 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; - uint8_t family; - DnsResourceKey keys[2]; + int family; DnsQuery *q; - unsigned n = 0; int r; assert(bus); assert(message); assert(m); - r = sd_bus_message_read(message, "sy", &hostname, &family); + r = sd_bus_message_read(message, "si", &hostname, &family); if (r < 0) return r; if (!IN_SET(family, AF_INET, AF_INET6, AF_UNSPEC)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %u", family); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family); if (!hostname_is_valid(hostname)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid hostname '%s'", hostname); + question = dns_question_new(family == AF_UNSPEC ? 2 : 1); + if (!question) + return -ENOMEM; + if (family != AF_INET6) { - keys[n].class = DNS_CLASS_IN; - keys[n].type = DNS_TYPE_A; - keys[n].name = (char*) hostname; - n++; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; + + key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_A, hostname); + if (!key) + return -ENOMEM; + + r = dns_question_add(question, key); + if (r < 0) + return r; } if (family != AF_INET) { - keys[n].class = DNS_CLASS_IN; - keys[n].type = DNS_TYPE_AAAA; - keys[n].name = (char*) hostname; - n++; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; + + key = dns_resource_key_new(DNS_CLASS_IN, DNS_TYPE_AAAA, hostname); + if (!key) + return -ENOMEM; + + r = dns_question_add(question, key); + if (r < 0) + return r; } - r = dns_query_new(m, &q, keys, n); + r = dns_query_new(m, &q, question); if (r < 0) return r; @@ -213,9 +313,13 @@ 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_start(q); + r = dns_query_go(q); if (r < 0) { dns_query_free(q); + + if (r == -ESRCH) + sd_bus_error_setf(error, BUS_ERROR_NO_NAME_SERVERS, "No appropriate name servers or networks for name found"); + return r; } @@ -223,120 +327,60 @@ static int bus_method_resolve_hostname(sd_bus *bus, sd_bus_message *message, voi } static void bus_method_resolve_address_complete(DnsQuery *q) { - _cleanup_free_ char *ip = NULL; + _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; + _cleanup_(dns_answer_unrefp) DnsAnswer *answer = NULL; + unsigned added = 0, i; int r; assert(q); - in_addr_to_string(q->request_family, &q->request_address, &ip); - - switch(q->state) { - - case DNS_QUERY_SKIPPED: - r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_NAME_SERVERS, "Not appropriate name servers or networks found"); - break; - - case DNS_QUERY_TIMEOUT: - r = sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "Query timed out"); - break; - - case DNS_QUERY_ATTEMPTS_MAX: - r = sd_bus_reply_method_errorf(q->request, SD_BUS_ERROR_TIMEOUT, "All attempts to contact name servers or networks failed"); - break; - - case DNS_QUERY_FAILURE: { - _cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL; - - if (q->rcode == DNS_RCODE_NXDOMAIN) - sd_bus_error_setf(&error, _BUS_ERROR_DNS "NXDOMAIN", "No hostname known for address %s ", ip); - else { - const char *rc, *n; - char p[DECIMAL_STR_MAX(q->rcode)]; - - rc = dns_rcode_to_string(q->rcode); - if (!rc) { - sprintf(p, "%i", q->rcode); - rc = p; - } - - n = strappenda(_BUS_ERROR_DNS, rc); - - sd_bus_error_setf(&error, n, "Could not resolve address %s, server or network returned error %s", ip, rc); - } - - r = sd_bus_reply_method_error(q->request, &error); - break; + if (q->state != DNS_QUERY_SUCCESS) { + r = reply_query_state(q); + goto finish; } - case DNS_QUERY_SUCCESS: { - _cleanup_bus_message_unref_ sd_bus_message *reply = NULL; - unsigned i, n, added = 0; - _cleanup_free_ char *reverse = NULL; + r = sd_bus_message_new_method_return(q->request, &reply); + if (r < 0) + goto finish; - assert(q->packet); + r = sd_bus_message_open_container(reply, 'a', "s"); + if (r < 0) + goto finish; - r = dns_name_reverse(q->request_family, &q->request_address, &reverse); - if (r < 0) - goto finish; + answer = dns_answer_ref(q->answer); - r = dns_packet_skip_question(q->packet); + for (i = 0; i < answer->n_rrs; i++) { + r = dns_question_matches_rr(q->question, answer->rrs[i]); if (r < 0) goto parse_fail; + if (r == 0) + continue; - r = sd_bus_message_new_method_return(q->request, &reply); + r = sd_bus_message_append(reply, "s", answer->rrs[i]->ptr.name); if (r < 0) goto finish; - r = sd_bus_message_open_container(reply, 'a', "s"); - if (r < 0) - goto finish; - - n = DNS_PACKET_ANCOUNT(q->packet) + - DNS_PACKET_NSCOUNT(q->packet) + - DNS_PACKET_ARCOUNT(q->packet); - for (i = 0; i < n; i++) { - _cleanup_(dns_resource_record_unrefp) DnsResourceRecord *rr = NULL; - - r = dns_packet_read_rr(q->packet, &rr, NULL); - if (r < 0) - goto parse_fail; - - if (rr->key.class != DNS_CLASS_IN) - continue; - if (rr->key.type != DNS_TYPE_PTR) - continue; - if (!dns_name_equal(rr->key.name, reverse)) - continue; - - r = sd_bus_message_append(reply, "s", rr->ptr.name); - if (r < 0) - goto finish; - - added ++; - } + added ++; + } - if (added <= 0) { - r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_SUCH_RR, "Address %s does not have RR of this type", ip); - break; - } + if (added <= 0) { + _cleanup_free_ char *ip = NULL; - r = sd_bus_message_close_container(reply); - if (r < 0) - goto finish; + in_addr_to_string(q->request_family, &q->request_address, &ip); - r = sd_bus_send(q->manager->bus, reply, NULL); - break; + r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_NO_SUCH_RR, "Address '%s' does not have any RR of requested type", ip); + goto finish; } - parse_fail: - case DNS_QUERY_INVALID_REPLY: - r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); - break; + r = sd_bus_message_close_container(reply); + if (r < 0) + goto finish; - case DNS_QUERY_NULL: - case DNS_QUERY_SENT: - assert_not_reached("Unexpected query state"); - } + r = sd_bus_send(q->manager->bus, reply, NULL); + goto finish; + +parse_fail: + r = sd_bus_reply_method_errorf(q->request, BUS_ERROR_INVALID_REPLY, "Received invalid reply"); finish: if (r < 0) @@ -346,11 +390,12 @@ finish: } static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { - _cleanup_(dns_resource_key_free) DnsResourceKey key = {}; + _cleanup_(dns_resource_key_unrefp) DnsResourceKey *key = NULL; + _cleanup_(dns_question_unrefp) DnsQuestion *question = NULL; + _cleanup_free_ char *reverse = NULL; Manager *m = userdata; - uint8_t family; + int family, ifindex; const void *d; - int ifindex; DnsQuery *q; size_t sz; int r; @@ -359,19 +404,18 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void assert(message); assert(m); - r = sd_bus_message_read(message, "y", &family); + r = sd_bus_message_read(message, "i", &family); if (r < 0) return r; if (!IN_SET(family, AF_INET, AF_INET6)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %u", family); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Unknown address family %i", family); r = sd_bus_message_read_array(message, 'y', &d, &sz); if (r < 0) return r; - if ((family == AF_INET && sz != sizeof(struct in_addr)) || - (family == AF_INET6 && sz != sizeof(struct in6_addr))) + 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); @@ -380,13 +424,25 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void if (ifindex < 0) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid interface index"); - key.class = DNS_CLASS_IN; - key.type = DNS_TYPE_PTR; - r = dns_name_reverse(family, d, &key.name); + r = dns_name_reverse(family, d, &reverse); if (r < 0) return r; - r = dns_query_new(m, &q, &key, 1); + question = dns_question_new(1); + if (!question) + return -ENOMEM; + + key = dns_resource_key_new_consume(DNS_CLASS_IN, DNS_TYPE_PTR, reverse); + if (!key) + return -ENOMEM; + + reverse = NULL; + + r = dns_question_add(question, key); + if (r < 0) + return r; + + r = dns_query_new(m, &q, question); if (r < 0) return r; @@ -395,9 +451,13 @@ 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_start(q); + r = dns_query_go(q); if (r < 0) { dns_query_free(q); + + if (r == -ESRCH) + sd_bus_error_setf(error, BUS_ERROR_NO_NAME_SERVERS, "No appropriate name servers or networks for name found"); + return r; } @@ -406,8 +466,8 @@ static int bus_method_resolve_address(sd_bus *bus, sd_bus_message *message, void static const sd_bus_vtable resolve_vtable[] = { SD_BUS_VTABLE_START(0), - SD_BUS_METHOD("ResolveHostname", "sy", "a(yayi)", bus_method_resolve_hostname, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD("ResolveAddress", "yayi", "as", bus_method_resolve_address, SD_BUS_VTABLE_UNPRIVILEGED), + 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_VTABLE_END, };