X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve%2Fresolved-manager.c;h=ba2380d68287dd9c1df085fef52b40cecb6f6015;hp=fecd7ea0c61b4e951218e6d49519383335eb4ae0;hb=5cb36f41f01cf4b1f4395abfffd1b33116591e58;hpb=b2fadec6048adb3596f2633cb7fe7a49f5937a18 diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index fecd7ea0c..ba2380d68 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -33,7 +33,12 @@ #include "conf-parser.h" #include "socket-util.h" #include "af-list.h" -#include "resolved.h" +#include "utf8.h" + +#include "resolved-dns-domain.h" +#include "resolved-conf.h" +#include "resolved-bus.h" +#include "resolved-manager.h" #define SEND_TIMEOUT_USEC (200 * USEC_PER_MSEC) @@ -179,7 +184,6 @@ fail: return 0; } - static int manager_rtnl_listen(Manager *m) { _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL; sd_rtnl_message *i; @@ -303,85 +307,90 @@ static int manager_network_monitor_listen(Manager *m) { return 0; } -static int parse_dns_server_string(Manager *m, const char *string) { - const char *word, *state; - size_t length; +static int determine_hostname(char **ret) { + _cleanup_free_ char *h = NULL, *n = NULL; int r; - assert(m); - assert(string); - - FOREACH_WORD_QUOTED(word, length, string, state) { - char buffer[length+1]; - int family; - union in_addr_union addr; - - memcpy(buffer, word, length); - buffer[length] = 0; + assert(ret); - r = in_addr_from_string_auto(buffer, &family, &addr); - if (r < 0) { - log_warning("Ignoring invalid DNS address '%s'", buffer); - continue; - } + h = gethostname_malloc(); + if (!h) + return log_oom(); - /* filter out duplicates */ - if (manager_find_dns_server(m, family, &addr)) - continue; + if (!utf8_is_valid(h)) { + log_error("System hostname is not UTF-8 clean."); + return -EINVAL; + } - r = dns_server_new(m, NULL, NULL, family, &addr); - if (r < 0) - return r; + r = dns_name_normalize(h, &n); + if (r < 0) { + log_error("System hostname '%s' cannot be normalized.", h); + return r; } - /* do not warn about state here, since probably systemd already did */ + + *ret = n; + n = NULL; return 0; } -int config_parse_dnsv( - const char *unit, - const char *filename, - unsigned line, - const char *section, - unsigned section_line, - const char *lvalue, - int ltype, - const char *rvalue, - void *data, - void *userdata) { - +static int on_hostname_change(sd_event_source *es, int fd, uint32_t revents, void *userdata) { + _cleanup_free_ char *h = NULL; Manager *m = userdata; int r; - assert(filename); - assert(lvalue); - assert(rvalue); assert(m); - /* Empty assignment means clear the list */ - if (isempty(rvalue)) { - while (m->dns_servers) - dns_server_free(m->dns_servers); + r = determine_hostname(&h); + if (r < 0) + return 0; /* ignore invalid hostnames */ + if (streq(h, m->hostname)) return 0; - } - r = parse_dns_server_string(m, rvalue); - if (r < 0) { - log_error("Failed to parse DNS server string"); - return r; - } + log_info("System hostname changed to '%s'.", h); + free(m->hostname); + m->hostname = h; + h = NULL; + + manager_refresh_rrs(m); return 0; } -int manager_parse_config_file(Manager *m) { +static int manager_watch_hostname(Manager *m) { + _cleanup_free_ char *h = NULL; + int r; + assert(m); - return config_parse(NULL, "/etc/systemd/resolved.conf", NULL, - "Resolve\0", - config_item_perf_lookup, resolved_gperf_lookup, - false, false, true, m); + m->hostname_fd = open("/proc/sys/kernel/hostname", O_RDONLY|O_CLOEXEC|O_NDELAY|O_NOCTTY); + if (m->hostname_fd < 0) { + log_warning("Failed to watch hostname: %m"); + return 0; + } + + r = sd_event_add_io(m->event, &m->hostname_event_source, m->hostname_fd, 0, on_hostname_change, m); + if (r < 0) { + if (r == -EPERM) + /* kernels prior to 3.2 don't support polling this file. Ignore the failure. */ + m->hostname_fd = safe_close(m->hostname_fd); + else { + log_error("Failed to add hostname event source: %s", strerror(-r)); + return r; + } + } + + r = determine_hostname(&m->hostname); + if (r < 0) { + log_info("Defaulting to hostname 'linux'."); + m->hostname = strdup("linux"); + if (!m->hostname) + return log_oom(); + } else + log_info("Using system hostname '%s'.", m->hostname); + + return 0; } int manager_new(Manager **ret) { @@ -397,17 +406,15 @@ int manager_new(Manager **ret) { m->dns_ipv4_fd = m->dns_ipv6_fd = -1; m->llmnr_ipv4_udp_fd = m->llmnr_ipv6_udp_fd = -1; m->llmnr_ipv4_tcp_fd = m->llmnr_ipv6_tcp_fd = -1; + m->hostname_fd = -1; - m->use_llmnr = true; + m->llmnr_support = SUPPORT_YES; + m->read_resolv_conf = true; - r = parse_dns_server_string(m, DNS_SERVERS); + r = manager_parse_dns_server(m, DNS_SERVER_FALLBACK, DNS_SERVERS); if (r < 0) return r; - m->hostname = gethostname_malloc(); - if (!m->hostname) - return -ENOMEM; - r = sd_event_default(&m->event); if (r < 0) return r; @@ -417,6 +424,10 @@ int manager_new(Manager **ret) { sd_event_set_watchdog(m->event, true); + r = manager_watch_hostname(m); + if (r < 0) + return r; + r = dns_scope_new(m, &m->unicast_scope, NULL, DNS_PROTOCOL_DNS, AF_UNSPEC); if (r < 0) return r; @@ -461,7 +472,7 @@ Manager *manager_free(Manager *m) { while (m->dns_queries) dns_query_free(m->dns_queries); - hashmap_free(m->dns_query_transactions); + hashmap_free(m->dns_transactions); while ((l = hashmap_first(m->links))) link_free(l); @@ -471,6 +482,8 @@ Manager *manager_free(Manager *m) { while (m->dns_servers) dns_server_free(m->dns_servers); + while (m->fallback_dns_servers) + dns_server_free(m->fallback_dns_servers); sd_event_source_unref(m->network_event_source); sd_network_monitor_unref(m->network_monitor); @@ -497,12 +510,120 @@ Manager *manager_free(Manager *m) { dns_resource_key_unref(m->host_ipv4_key); dns_resource_key_unref(m->host_ipv6_key); + + safe_close(m->hostname_fd); + sd_event_source_unref(m->hostname_event_source); free(m->hostname); + free(m); return NULL; } +int manager_read_resolv_conf(Manager *m) { + _cleanup_fclose_ FILE *f = NULL; + struct stat st, own; + char line[LINE_MAX]; + DnsServer *s, *nx; + usec_t t; + int r; + + assert(m); + + /* Reads the system /etc/resolv.conf, if it exists and is not + * symlinked to our own resolv.conf instance */ + + if (!m->read_resolv_conf) + return 0; + + r = stat("/etc/resolv.conf", &st); + if (r < 0) { + if (errno != ENOENT) + log_warning("Failed to open /etc/resolv.conf: %m"); + r = -errno; + goto clear; + } + + /* Have we already seen the file? */ + t = timespec_load(&st.st_mtim); + if (t == m->resolv_conf_mtime) + return 0; + + m->resolv_conf_mtime = t; + + /* Is it symlinked to our own file? */ + if (stat("/run/systemd/resolve/resolv.conf", &own) >= 0 && + st.st_dev == own.st_dev && + st.st_ino == own.st_ino) { + r = 0; + goto clear; + } + + f = fopen("/etc/resolv.conf", "re"); + if (!f) { + if (errno != ENOENT) + log_warning("Failed to open /etc/resolv.conf: %m"); + r = -errno; + goto clear; + } + + if (fstat(fileno(f), &st) < 0) { + log_error("Failed to stat open file: %m"); + r = -errno; + goto clear; + } + + LIST_FOREACH(servers, s, m->dns_servers) + s->marked = true; + + FOREACH_LINE(line, f, r = -errno; goto clear) { + union in_addr_union address; + int family; + char *l; + const char *a; + + truncate_nl(line); + + l = strstrip(line); + if (*l == '#' || *l == ';') + continue; + + a = first_word(l, "nameserver"); + if (!a) + continue; + + r = in_addr_from_string_auto(a, &family, &address); + if (r < 0) { + log_warning("Failed to parse name server %s.", a); + continue; + } + + LIST_FOREACH(servers, s, m->dns_servers) + if (s->family == family && in_addr_equal(family, &s->address, &address) > 0) + break; + + if (s) + s->marked = false; + else { + r = dns_server_new(m, NULL, DNS_SERVER_SYSTEM, NULL, family, &address); + if (r < 0) + goto clear; + } + } + + LIST_FOREACH_SAFE(servers, s, nx, m->dns_servers) + if (s->marked) + dns_server_free(s); + + return 0; + +clear: + while (m->dns_servers) + dns_server_free(m->dns_servers); + + return r; +} + static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { _cleanup_free_ char *t = NULL; int r; @@ -512,8 +633,8 @@ static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { assert(count); r = in_addr_to_string(s->family, &s->address, &t); - if (r < 0) { - log_warning("Invalid DNS address. Ignoring."); + if (r < 0) { + log_warning("Invalid DNS address. Ignoring: %s", strerror(-r)); return; } @@ -525,7 +646,7 @@ static void write_resolve_conf_server(DnsServer *s, FILE *f, unsigned *count) { } int manager_write_resolv_conf(Manager *m) { - const char *path = "/run/systemd/resolve/resolv.conf"; + static const char path[] = "/run/systemd/resolve/resolv.conf"; _cleanup_free_ char *temp_path = NULL; _cleanup_fclose_ FILE *f = NULL; unsigned count = 0; @@ -536,6 +657,9 @@ int manager_write_resolv_conf(Manager *m) { assert(m); + /* Read the system /etc/resolv.conf first */ + manager_read_resolv_conf(m); + r = fopen_temporary(path, &f, &temp_path); if (r < 0) return r; @@ -548,12 +672,17 @@ int manager_write_resolv_conf(Manager *m) { "# resolv.conf(5) in a different way, replace the symlink by a\n" "# static file or a different symlink.\n\n", f); + LIST_FOREACH(servers, s, m->dns_servers) + write_resolve_conf_server(s, f, &count); + HASHMAP_FOREACH(l, m->links, i) LIST_FOREACH(servers, s, l->dns_servers) write_resolve_conf_server(s, f, &count); - LIST_FOREACH(servers, s, m->dns_servers) - write_resolve_conf_server(s, f, &count); + if (count == 0) { + LIST_FOREACH(servers, s, m->fallback_dns_servers) + write_resolve_conf_server(s, f, &count); + } r = fflush_and_check(f); if (r < 0) @@ -703,7 +832,7 @@ int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) { static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; - DnsQueryTransaction *t = NULL; + DnsTransaction *t = NULL; Manager *m = userdata; int r; @@ -712,11 +841,11 @@ static int on_dns_packet(sd_event_source *s, int fd, uint32_t revents, void *use return r; if (dns_packet_validate_reply(p) > 0) { - t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); + t = hashmap_get(m->dns_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); if (!t) return 0; - dns_query_transaction_process_reply(t, p); + dns_transaction_process_reply(t, p); } else log_debug("Invalid DNS packet."); @@ -924,27 +1053,68 @@ int manager_send(Manager *m, int fd, int ifindex, int family, const union in_add return -EAFNOSUPPORT; } -DnsServer* manager_find_dns_server(Manager *m, int family, const union in_addr_union *in_addr) { +bool manager_known_dns_server(Manager *m, int family, const union in_addr_union *in_addr) { DnsServer *s; assert(m); assert(in_addr); - LIST_FOREACH(servers, s, m->dns_servers) { + LIST_FOREACH(servers, s, m->dns_servers) + if (s->family == family && in_addr_equal(family, &s->address, in_addr) > 0) + return true; - if (s->family == family && - in_addr_equal(family, &s->address, in_addr)) - return s; - } + LIST_FOREACH(servers, s, m->fallback_dns_servers) + if (s->family == family && in_addr_equal(family, &s->address, in_addr) > 0) + return true; - return NULL; + return false; +} + +static DnsServer *manager_set_dns_server(Manager *m, DnsServer *s) { + assert(m); + + if (m->current_dns_server == s) + return s; + + if (s) { + _cleanup_free_ char *ip = NULL; + + in_addr_to_string(s->family, &s->address, &ip); + log_info("Switching to system DNS server %s.", strna(ip)); + } else + log_info("No system DNS server set."); + + m->current_dns_server = s; + return s; } DnsServer *manager_get_dns_server(Manager *m) { + Link *l; assert(m); + /* Try to read updates resolv.conf */ + manager_read_resolv_conf(m); + if (!m->current_dns_server) - m->current_dns_server = m->dns_servers; + manager_set_dns_server(m, m->dns_servers); + + if (!m->current_dns_server) { + bool found = false; + Iterator i; + + /* No DNS servers configured, let's see if there are + * any on any links. If not, we use the fallback + * servers */ + + HASHMAP_FOREACH(l, m->links, i) + if (l->dns_servers) { + found = true; + break; + } + + if (!found) + manager_set_dns_server(m, m->fallback_dns_servers); + } return m->current_dns_server; } @@ -952,20 +1122,23 @@ DnsServer *manager_get_dns_server(Manager *m) { void manager_next_dns_server(Manager *m) { assert(m); - if (!m->current_dns_server) { - m->current_dns_server = m->dns_servers; - return; - } - + /* If there's currently no DNS server set, then the next + * manager_get_dns_server() will find one */ if (!m->current_dns_server) return; + /* Change to the next one */ if (m->current_dns_server->servers_next) { - m->current_dns_server = m->current_dns_server->servers_next; + manager_set_dns_server(m, m->current_dns_server->servers_next); return; } - m->current_dns_server = m->dns_servers; + /* If there was no next one, then start from the beginning of + * the list */ + if (m->current_dns_server->type == DNS_SERVER_FALLBACK) + manager_set_dns_server(m, m->fallback_dns_servers); + else + manager_set_dns_server(m, m->dns_servers); } uint32_t manager_find_mtu(Manager *m) { @@ -990,7 +1163,7 @@ uint32_t manager_find_mtu(Manager *m) { static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *userdata) { _cleanup_(dns_packet_unrefp) DnsPacket *p = NULL; - DnsQueryTransaction *t = NULL; + DnsTransaction *t = NULL; Manager *m = userdata; int r; @@ -1001,11 +1174,11 @@ static int on_llmnr_packet(sd_event_source *s, int fd, uint32_t revents, void *u if (dns_packet_validate_reply(p) > 0) { log_debug("Got reply packet for id %u", DNS_PACKET_ID(p)); - t = hashmap_get(m->dns_query_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); + t = hashmap_get(m->dns_transactions, UINT_TO_PTR(DNS_PACKET_ID(p))); if (!t) return 0; - dns_query_transaction_process_reply(t, p); + dns_transaction_process_reply(t, p); } else if (dns_packet_validate_query(p) > 0) { Link *l; @@ -1397,14 +1570,94 @@ int manager_ifindex_is_loopback(Manager *m, int ifindex) { } int manager_find_ifindex(Manager *m, int family, const union in_addr_union *in_addr) { - Link *l; + LinkAddress *a; + + assert(m); + + a = manager_find_link_address(m, family, in_addr); + if (a) + return a->link->ifindex; + + return 0; +} + +void manager_refresh_rrs(Manager *m) { Iterator i; + Link *l; assert(m); - HASHMAP_FOREACH(l, m->links, i) - if (link_find_address(l, family, in_addr)) - return l->ifindex; + m->host_ipv4_key = dns_resource_key_unref(m->host_ipv4_key); + m->host_ipv6_key = dns_resource_key_unref(m->host_ipv6_key); + + HASHMAP_FOREACH(l, m->links, i) { + link_add_rrs(l, true); + link_add_rrs(l, false); + } +} + +int manager_next_hostname(Manager *m) { + const char *p; + uint64_t u; + char *h; + + assert(m); + + p = strchr(m->hostname, 0); + assert(p); + + while (p > m->hostname) { + if (!strchr("0123456789", p[-1])) + break; + + p--; + } + + if (*p == 0 || safe_atou64(p, &u) < 0 || u <= 0) + u = 1; + + u++; + + if (asprintf(&h, "%.*s%" PRIu64, (int) (p - m->hostname), m->hostname, u) < 0) + return -ENOMEM; + + log_info("Hostname conflict, changing published hostname from '%s' to '%s'.", m->hostname, h); + + free(m->hostname); + m->hostname = h; + + manager_refresh_rrs(m); return 0; } + +LinkAddress* manager_find_link_address(Manager *m, int family, const union in_addr_union *in_addr) { + Iterator i; + Link *l; + + assert(m); + + HASHMAP_FOREACH(l, m->links, i) { + LinkAddress *a; + + a = link_find_address(l, family, in_addr); + if (a) + return a; + } + + return NULL; +} + +int manager_our_packet(Manager *m, DnsPacket *p) { + assert(m); + assert(p); + + return !!manager_find_link_address(m, p->family, &p->sender); +} + +static const char* const support_table[_SUPPORT_MAX] = { + [SUPPORT_NO] = "no", + [SUPPORT_YES] = "yes", + [SUPPORT_RESOLVE] = "resolve", +}; +DEFINE_STRING_TABLE_LOOKUP(support, Support);