From 2be0acf3f37a35d7dfad67f060f343402664136c Mon Sep 17 00:00:00 2001 From: Artem Boldariev Date: Tue, 9 Jan 2024 19:16:26 +0200 Subject: [PATCH 1/5] Recreate listeners on DNS transport change This commit ensures that listeners are recreated on reconfiguration in the case when their type changes (or when PROXY protocol type changes, too). Previously, if a "listen-on" statement was modified to represent a different transport, BIND would not pick-up the change on reconfiguration if listener type changes (e.g. DoH -> DoT) for a given interface address and port combination. This commit fixes that by recreating the listener. Initially, that worked for most of the new transports as we would recreate listeners on each reconfiguration for DoH and DoT. But at some point we changed that in such a way that listeners were not recreated to avoid rebinding a port as on some platforms only root can do that for port numbers <1000, making some ports binding possible only on start-up. We chose to asynchronously update listener socket settings (like TLS contexts, HTTP settings) instead. Now, we both avoid recreating the sockets if unnecessary and recreate listeners when listener type changes. (cherry picked from commit d59cf5e0cec7aba9048f685e3cfd1f0e495f474c) --- lib/ns/include/ns/interfacemgr.h | 1 + lib/ns/interfacemgr.c | 96 +++++++++++++++++++++++++------- 2 files changed, 77 insertions(+), 20 deletions(-) diff --git a/lib/ns/include/ns/interfacemgr.h b/lib/ns/include/ns/interfacemgr.h index 028f86d570..0ae6fffd39 100644 --- a/lib/ns/include/ns/interfacemgr.h +++ b/lib/ns/include/ns/interfacemgr.h @@ -77,6 +77,7 @@ struct ns_interface { char name[32]; /*%< Null terminated. */ isc_nmsocket_t *udplistensocket; isc_nmsocket_t *tcplistensocket; + isc_nmsocket_t *tlslistensocket; isc_nmsocket_t *http_listensocket; isc_nmsocket_t *http_secure_listensocket; isc_quota_t *http_quota; diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index 50b87dfb5e..d9f479046f 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -541,7 +541,7 @@ ns_interface_listentls(ns_interface_t *ifp, isc_tlsctx_t *sslctx) { result = isc_nm_listentlsdns( ifp->mgr->nm, &ifp->addr, ns__client_request, ifp, ns__client_tcpconn, ifp, sizeof(ns_client_t), ifp->mgr->backlog, - &ifp->mgr->sctx->tcpquota, sslctx, &ifp->tcplistensocket); + &ifp->mgr->sctx->tcpquota, sslctx, &ifp->tlslistensocket); if (result != ISC_R_SUCCESS) { isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_ERROR, @@ -672,6 +672,9 @@ interface_setup(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr, const char *name, interface_create(mgr, addr, name, &ifp); } else { REQUIRE(!LISTENING(ifp)); + LOCK(&mgr->lock); + ifp->generation = mgr->generation; + UNLOCK(&mgr->lock); } ifp->flags |= NS_INTERFACEFLAG_LISTENING; @@ -743,6 +746,10 @@ ns_interface_shutdown(ns_interface_t *ifp) { isc_nm_stoplistening(ifp->tcplistensocket); isc_nmsocket_close(&ifp->tcplistensocket); } + if (ifp->tlslistensocket != NULL) { + isc_nm_stoplistening(ifp->tlslistensocket); + isc_nmsocket_close(&ifp->tlslistensocket); + } if (ifp->http_listensocket != NULL) { isc_nm_stoplistening(ifp->http_listensocket); isc_nmsocket_close(&ifp->http_listensocket); @@ -798,6 +805,14 @@ find_matching_interface(ns_interfacemgr_t *mgr, isc_sockaddr_t *addr) { return (ifp); } +static void +log_interface_shutdown(const ns_interface_t *ifp) { + char sabuf[ISC_SOCKADDR_FORMATSIZE]; + isc_sockaddr_format(&ifp->addr, sabuf, sizeof(sabuf)); + isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO, + "no longer listening on %s", sabuf); +} + /*% * Remove any interfaces whose generation number is not the current one. */ @@ -822,10 +837,7 @@ purge_old_interfaces(ns_interfacemgr_t *mgr) { for (ifp = ISC_LIST_HEAD(interfaces); ifp != NULL; ifp = next) { next = ISC_LIST_NEXT(ifp, link); if (LISTENING(ifp)) { - char sabuf[256]; - isc_sockaddr_format(&ifp->addr, sabuf, sizeof(sabuf)); - isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO, - "no longer listening on %s", sabuf); + log_interface_shutdown(ifp); ns_interface_shutdown(ifp); } ISC_LIST_UNLINK(interfaces, ifp, link); @@ -942,9 +954,8 @@ replace_listener_tlsctx(ns_interface_t *ifp, isc_tlsctx_t *newctx) { isc_sockaddr_format(&ifp->addr, sabuf, sizeof(sabuf)); isc_log_write(IFMGR_COMMON_LOGARGS, ISC_LOG_INFO, "updating TLS context on %s", sabuf); - if (ifp->tcplistensocket != NULL) { - /* 'tcplistensocket' is used for DoT */ - isc_nmsocket_set_tlsctx(ifp->tcplistensocket, newctx); + if (ifp->tlslistensocket != NULL) { + isc_nmsocket_set_tlsctx(ifp->tlslistensocket, newctx); } else if (ifp->http_secure_listensocket != NULL) { isc_nmsocket_set_tlsctx(ifp->http_secure_listensocket, newctx); } @@ -1015,6 +1026,57 @@ update_listener_configuration(ns_interfacemgr_t *mgr, ns_interface_t *ifp, UNLOCK(&mgr->lock); } +static bool +same_listener_type(ns_interface_t *ifp, ns_listenelt_t *new_le) { + bool same_transport_type = false; + + if (new_le->is_http && new_le->sslctx != NULL && + ifp->http_secure_listensocket != NULL) + { + /* HTTPS/DoH */ + same_transport_type = true; + } else if (new_le->is_http && new_le->sslctx == NULL && + ifp->http_listensocket != NULL) + { + /* HTTP/plain DoH */ + same_transport_type = true; + } else if (new_le->sslctx != NULL && ifp->tlslistensocket != NULL) { + /* TLS/DoT */ + same_transport_type = true; + } else if (new_le->sslctx == NULL && (ifp->udplistensocket != NULL || + ifp->tcplistensocket != NULL)) + { + /* "plain" DNS/Do53 */ + same_transport_type = true; + } + + return (same_transport_type); +} + +static bool +interface_update_or_shutdown(ns_interfacemgr_t *mgr, ns_interface_t *ifp, + ns_listenelt_t *le, const bool config) { + if (LISTENING(ifp) && config && !same_listener_type(ifp, le)) { + /* + * DNS listener type has been changed on re-configuration. We + * will need to recreate the listener anew. + */ + log_interface_shutdown(ifp); + ns_interface_shutdown(ifp); + } else { + LOCK(&mgr->lock); + ifp->generation = mgr->generation; + UNLOCK(&mgr->lock); + if (LISTENING(ifp)) { + if (config) { + update_listener_configuration(mgr, ifp, le); + } + return (true); + } + } + return (false); +} + static isc_result_t do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { isc_interfaceiter_t *iter = NULL; @@ -1082,12 +1144,9 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { ifp = find_matching_interface(mgr, &listen_addr); if (ifp != NULL) { - ifp->generation = mgr->generation; - if (LISTENING(ifp)) { - if (config) { - update_listener_configuration( - mgr, ifp, le); - } + bool cont = interface_update_or_shutdown( + mgr, ifp, le, config); + if (cont) { continue; } } @@ -1233,12 +1292,9 @@ do_scan(ns_interfacemgr_t *mgr, bool verbose, bool config) { ifp = find_matching_interface(mgr, &listen_sockaddr); if (ifp != NULL) { - ifp->generation = mgr->generation; - if (LISTENING(ifp)) { - if (config) { - update_listener_configuration( - mgr, ifp, le); - } + bool cont = interface_update_or_shutdown( + mgr, ifp, le, config); + if (cont) { continue; } } From cff69c65b5e5710c62361e968eb7a36eea8c0fb9 Mon Sep 17 00:00:00 2001 From: Artem Boldariev Date: Fri, 12 Jan 2024 17:50:12 +0200 Subject: [PATCH 2/5] Fix flawed logic when detecting same listener type The older version of the code was reporting that listeners are going to be of the same type after reconfiguration when switching from DoT to HTTPS listener, making BIND abort its executions. That was happening due to the flaw in logic due to which the code could consider a current listener and a configuration for the new one to be of the same type (DoT) even when the new listener entry is explicitly marked as HTTP. The checks for PROXY in between the configuration were masking that behaviour, but when porting it to 9.18 (when there is no PROXY support), the behaviour was exposed. Now the code mirrors the logic in 'interface_setup()' closely (as it was meant to). (cherry picked from commit 8ae661048d7baa3b1fb955cecc4101a2daa32a65) --- lib/ns/interfacemgr.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index d9f479046f..c7e057bf9e 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -1030,16 +1030,13 @@ static bool same_listener_type(ns_interface_t *ifp, ns_listenelt_t *new_le) { bool same_transport_type = false; - if (new_le->is_http && new_le->sslctx != NULL && - ifp->http_secure_listensocket != NULL) - { - /* HTTPS/DoH */ - same_transport_type = true; - } else if (new_le->is_http && new_le->sslctx == NULL && - ifp->http_listensocket != NULL) - { - /* HTTP/plain DoH */ - same_transport_type = true; + /* See 'interface_setup()' above */ + if (new_le->is_http) { + /* HTTP/DoH */ + same_transport_type = (new_le->sslctx != NULL && + ifp->http_secure_listensocket != NULL) || + (new_le->sslctx == NULL && + ifp->http_listensocket != NULL); } else if (new_le->sslctx != NULL && ifp->tlslistensocket != NULL) { /* TLS/DoT */ same_transport_type = true; From a76e304f5e19d114389a5f0320d71d5cd498ff5d Mon Sep 17 00:00:00 2001 From: Artem Boldariev Date: Wed, 10 Jan 2024 19:24:46 +0200 Subject: [PATCH 3/5] Add a system test to verify listener transport change functionality This commit adds a system test that helps to verify that changing a listener transport by editing "listen-on" statements before reconfiguration works as expected. (cherry picked from commit 211f12ff850677c39cdaa9bdb36c860a5837e0b2) --- bin/tests/system/transport-change/clean.sh | 24 ++++++ .../ns1/named-http-plain.conf.in | 45 +++++++++++ .../transport-change/ns1/named-https.conf.in | 45 +++++++++++ .../transport-change/ns1/named-tls.conf.in | 45 +++++++++++ .../system/transport-change/ns1/named.conf.in | 45 +++++++++++ bin/tests/system/transport-change/prereq.sh | 22 +++++ bin/tests/system/transport-change/privkey.pem | 0 .../transport-change/self-signed-cert.pem | 11 +++ .../transport-change/self-signed-key.pem | 5 ++ bin/tests/system/transport-change/setup.sh | 21 +++++ bin/tests/system/transport-change/tests.sh | 81 +++++++++++++++++++ .../tests_sh_transport_change.py | 14 ++++ 12 files changed, 358 insertions(+) create mode 100644 bin/tests/system/transport-change/clean.sh create mode 100644 bin/tests/system/transport-change/ns1/named-http-plain.conf.in create mode 100644 bin/tests/system/transport-change/ns1/named-https.conf.in create mode 100644 bin/tests/system/transport-change/ns1/named-tls.conf.in create mode 100644 bin/tests/system/transport-change/ns1/named.conf.in create mode 100644 bin/tests/system/transport-change/prereq.sh create mode 100644 bin/tests/system/transport-change/privkey.pem create mode 100644 bin/tests/system/transport-change/self-signed-cert.pem create mode 100644 bin/tests/system/transport-change/self-signed-key.pem create mode 100644 bin/tests/system/transport-change/setup.sh create mode 100644 bin/tests/system/transport-change/tests.sh create mode 100644 bin/tests/system/transport-change/tests_sh_transport_change.py diff --git a/bin/tests/system/transport-change/clean.sh b/bin/tests/system/transport-change/clean.sh new file mode 100644 index 0000000000..e8d1b95ee5 --- /dev/null +++ b/bin/tests/system/transport-change/clean.sh @@ -0,0 +1,24 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +# +# Clean up after zone transfer tests. +# + +rm -f ./*/named.conf +rm -f ./*/named.memstats +rm -f ./*/named.run +rm -f ./*/named.run.prev +rm -f ./dig.out.* +rm -f ./*/example.db +rm -rf ./headers.* diff --git a/bin/tests/system/transport-change/ns1/named-http-plain.conf.in b/bin/tests/system/transport-change/ns1/named-http-plain.conf.in new file mode 100644 index 0000000000..849aa3eabe --- /dev/null +++ b/bin/tests/system/transport-change/ns1/named-http-plain.conf.in @@ -0,0 +1,45 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, you can obtain one at https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +include "../../_common/rndc.key"; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +tls self-signed { + cert-file "../self-signed-cert.pem"; + key-file "../self-signed-key.pem"; +}; + +options { + pid-file "named.pid"; + ## + # generic + listen-on port @PORT@ { 10.53.0.1; }; + # test TLS + listen-on port @EXTRAPORT1@ tls none http default { 10.53.0.1; }; + listen-on-v6 port @EXTRAPORT1@ tls none http default { fd92:7065:b8e:ffff::1; }; + ## + recursion no; + notify explicit; + statistics-file "named.stats"; + dnssec-validation yes; + tcp-initial-timeout 1200; +}; + +zone "example" { + type primary; + file "example.db"; + allow-transfer { any; }; +}; diff --git a/bin/tests/system/transport-change/ns1/named-https.conf.in b/bin/tests/system/transport-change/ns1/named-https.conf.in new file mode 100644 index 0000000000..26763a1c9e --- /dev/null +++ b/bin/tests/system/transport-change/ns1/named-https.conf.in @@ -0,0 +1,45 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, you can obtain one at https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +include "../../_common/rndc.key"; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +tls self-signed { + cert-file "../self-signed-cert.pem"; + key-file "../self-signed-key.pem"; +}; + +options { + pid-file "named.pid"; + ## + # generic + listen-on port @PORT@ { 10.53.0.1; }; + # test TLS + listen-on port @EXTRAPORT1@ tls self-signed http default { 10.53.0.1; }; + listen-on-v6 port @EXTRAPORT1@ tls self-signed http default { fd92:7065:b8e:ffff::1; }; + ## + recursion no; + notify explicit; + statistics-file "named.stats"; + dnssec-validation yes; + tcp-initial-timeout 1200; +}; + +zone "example" { + type primary; + file "example.db"; + allow-transfer { any; }; +}; diff --git a/bin/tests/system/transport-change/ns1/named-tls.conf.in b/bin/tests/system/transport-change/ns1/named-tls.conf.in new file mode 100644 index 0000000000..27fce04b25 --- /dev/null +++ b/bin/tests/system/transport-change/ns1/named-tls.conf.in @@ -0,0 +1,45 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, you can obtain one at https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +include "../../_common/rndc.key"; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +tls self-signed { + cert-file "../self-signed-cert.pem"; + key-file "../self-signed-key.pem"; +}; + +options { + pid-file "named.pid"; + ## + # generic + listen-on port @PORT@ { 10.53.0.1; }; + # test TLS + listen-on port @EXTRAPORT1@ tls self-signed { 10.53.0.1; }; + listen-on-v6 port @EXTRAPORT1@ tls self-signed { fd92:7065:b8e:ffff::1; }; + ## + recursion no; + notify explicit; + statistics-file "named.stats"; + dnssec-validation yes; + tcp-initial-timeout 1200; +}; + +zone "example" { + type primary; + file "example.db"; + allow-transfer { any; }; +}; diff --git a/bin/tests/system/transport-change/ns1/named.conf.in b/bin/tests/system/transport-change/ns1/named.conf.in new file mode 100644 index 0000000000..817a43f440 --- /dev/null +++ b/bin/tests/system/transport-change/ns1/named.conf.in @@ -0,0 +1,45 @@ +/* + * Copyright (C) Internet Systems Consortium, Inc. ("ISC") + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, you can obtain one at https://mozilla.org/MPL/2.0/. + * + * See the COPYRIGHT file distributed with this work for additional + * information regarding copyright ownership. + */ + +include "../../_common/rndc.key"; + +controls { + inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; }; +}; + +tls self-signed { + cert-file "../self-signed-cert.pem"; + key-file "../self-signed-key.pem"; +}; + +options { + pid-file "named.pid"; + ## + # generic + listen-on port @PORT@ { 10.53.0.1; }; + # test + listen-on port @EXTRAPORT1@ { 10.53.0.1; }; + listen-on-v6 port @EXTRAPORT1@ { fd92:7065:b8e:ffff::1; }; + ## + recursion no; + notify explicit; + statistics-file "named.stats"; + dnssec-validation yes; + tcp-initial-timeout 1200; +}; + +zone "example" { + type primary; + file "example.db"; + allow-transfer { any; }; +}; diff --git a/bin/tests/system/transport-change/prereq.sh b/bin/tests/system/transport-change/prereq.sh new file mode 100644 index 0000000000..0c19f1178b --- /dev/null +++ b/bin/tests/system/transport-change/prereq.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +# shellcheck disable=SC1091 +. ../conf.sh + +$FEATURETEST --with-libnghttp2 || { + echo_i "This test requires libnghttp2 support." >&2 + exit 255 +} + +exit 0 diff --git a/bin/tests/system/transport-change/privkey.pem b/bin/tests/system/transport-change/privkey.pem new file mode 100644 index 0000000000..e69de29bb2 diff --git a/bin/tests/system/transport-change/self-signed-cert.pem b/bin/tests/system/transport-change/self-signed-cert.pem new file mode 100644 index 0000000000..3f4df28f60 --- /dev/null +++ b/bin/tests/system/transport-change/self-signed-cert.pem @@ -0,0 +1,11 @@ +-----BEGIN CERTIFICATE----- +MIIBqTCCAVCgAwIBAgIULBCxkDF3scu+KzMu4JWrS1MiD8gwCgYIKoZIzj0EAwIw +FjEUMBIGA1UEAwwLZXhhbXBsZS5jb20wIBcNMjQwMTEwMTQwOTAyWhgPMjA1MTA1 +MjgxNDA5MDJaMBYxFDASBgNVBAMMC2V4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI +KoZIzj0DAQcDQgAEraleW8FCXwU72Iva/H2FRiY5yrnKOVG0wZ8UN8bghx2yyK+z +EFaHS5buo5jEnWnweX2qrX4N9RWDii7nqfwjNaN6MHgwHQYDVR0OBBYEFEGCx9FF +rNxaR7zTM74ksT4fDaGjMB8GA1UdIwQYMBaAFEGCx9FFrNxaR7zTM74ksT4fDaGj +MA8GA1UdEwEB/wQFMAMBAf8wJQYDVR0RBB4wHIILZXhhbXBsZS5jb22CDSouZXhh +bXBsZS5jb20wCgYIKoZIzj0EAwIDRwAwRAIgL+cDL9EKz9YY3iR6/fZqjniXaiap +lMfzbtesX1LVi04CIBOBW97oz4jQ1K4D1QN4aDJpit2LJWrEKHyLk4SPqZUS +-----END CERTIFICATE----- diff --git a/bin/tests/system/transport-change/self-signed-key.pem b/bin/tests/system/transport-change/self-signed-key.pem new file mode 100644 index 0000000000..b68bd11a6c --- /dev/null +++ b/bin/tests/system/transport-change/self-signed-key.pem @@ -0,0 +1,5 @@ +-----BEGIN PRIVATE KEY----- +MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9uAMbwHDtsF9BDAu +CafftgyXCZbbRy8aJpoo76B8iwWhRANCAAStqV5bwUJfBTvYi9r8fYVGJjnKuco5 +UbTBnxQ3xuCHHbLIr7MQVodLlu6jmMSdafB5faqtfg31FYOKLuep/CM1 +-----END PRIVATE KEY----- diff --git a/bin/tests/system/transport-change/setup.sh b/bin/tests/system/transport-change/setup.sh new file mode 100644 index 0000000000..f726f7020d --- /dev/null +++ b/bin/tests/system/transport-change/setup.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +# shellcheck disable=SC1091 +. ../conf.sh + +$SHELL clean.sh + +$SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db + +copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/transport-change/tests.sh b/bin/tests/system/transport-change/tests.sh new file mode 100644 index 0000000000..796d0b9e56 --- /dev/null +++ b/bin/tests/system/transport-change/tests.sh @@ -0,0 +1,81 @@ +#!/bin/sh + +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + +set -e + +# shellcheck disable=SC1091 +. ../conf.sh + +dig_out_basename="dig.out.test" +testing="testing if the query is successfully completed" + +dig_with_opts() { + # shellcheck disable=SC2086 + "$DIG" -p "${EXTRAPORT1}" +noadd +nosea +nostat +noquest +nocmd "$@" NS example +} + +status=0 +n=0 + +run_dig_test() { + test_message="$1" + shift + n=$((n + 1)) + echo_i "$test_message ($n)" + dig_failed=0 + dig_with_opts "$@" >"$dig_out_basename$n" || dig_failed=1 +} + +run_dig_test_expect_success() { + ret=0 + run_dig_test "$@" + if [ $dig_failed != 0 ]; then + ret=1 + elif ! [ -s "$dig_out_basename$n" ]; then + ret=1 + fi + if [ $ret != 0 ]; then echo_i "failed"; fi + status=$((status + ret)) +} + +run_dig_multitest_expect_success() { + message="$1" + shift + run_dig_test_expect_success "$message (IPv4)" -b 10.53.0.10 @10.53.0.1 "$@" + run_dig_test_expect_success "$message (IPv6)" -b fd92:7065:b8e:ffff::10 @fd92:7065:b8e:ffff::1 "$@" +} + +reconfig_server() { + message="$1" + shift + config_file="$1" + shift + echo_i "$message" + copy_setports "ns1/$config_file" "ns1/named.conf" + rndc_reconfig ns1 10.53.0.1 +} + +run_dig_multitest_expect_success "$testing: a UDP query over Do53" +run_dig_multitest_expect_success "$testing: a TCP query over Do53" +tcp + +reconfig_server "reconfiguring the server to use TLS/DoT" named-tls.conf.in +run_dig_multitest_expect_success "$testing: a query over TLS/DoT" +tls + +reconfig_server "reconfiguring the server to use HTTPS/DoH" named-https.conf.in +run_dig_multitest_expect_success "$testing: a query over HTTPS/DoH" +https + +reconfig_server "reconfiguring the server to use plain HTTP/DoH" named-http-plain.conf.in +run_dig_multitest_expect_success "$testing: a query over plain HTTP/DoH" +http-plain + +echo_i "exit status: $status" +[ $status -eq 0 ] || exit 1 diff --git a/bin/tests/system/transport-change/tests_sh_transport_change.py b/bin/tests/system/transport-change/tests_sh_transport_change.py new file mode 100644 index 0000000000..d86446389e --- /dev/null +++ b/bin/tests/system/transport-change/tests_sh_transport_change.py @@ -0,0 +1,14 @@ +# Copyright (C) Internet Systems Consortium, Inc. ("ISC") +# +# SPDX-License-Identifier: MPL-2.0 +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, you can obtain one at https://mozilla.org/MPL/2.0/. +# +# See the COPYRIGHT file distributed with this work for additional +# information regarding copyright ownership. + + +def test_transport_change(run_tests_sh): + run_tests_sh() From 4d5320c5409e3bd515aa1f7e64d5f20f4c74bf9a Mon Sep 17 00:00:00 2001 From: Artem Boldariev Date: Thu, 11 Jan 2024 16:30:17 +0200 Subject: [PATCH 4/5] Update CHANGES [GL #4518] [GL #4528] Mentioned that all changes to listen-on statements are now applied on reconfiguration. (cherry picked from commit d1a2ad0f443982efeb703a0a0214e5f778241f91) --- CHANGES | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index 45bbc7a4be..5701e6bfd9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +6322. [bug] Changes to "listen-on" statements were ignored on + reconfiguration unless the port or interface address was + changed, making it impossible to change a related + listener transport type. Thanks to Thomas Amgarten. + [GL #4518] [GL #4528] + 6320. [bug] Fix a possible crash in 'dig +nssearch +nofail' and 'host -C' commands when one of the name servers returns SERVFAIL. [GL #4508] From 6fe3abc1ba495ad6b071c8012be9d481f216b15a Mon Sep 17 00:00:00 2001 From: Artem Boldariev Date: Thu, 11 Jan 2024 16:39:59 +0200 Subject: [PATCH 5/5] Update release notes [GL #4518] [GL #4528] Mentioned that all changes to listen-on statements are now applied on reconfiguration. (cherry picked from commit ad5378fad755b96f6b0b8d6465533b2e32f94869) --- doc/notes/notes-current.rst | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst index 9843823910..4c27810c5a 100644 --- a/doc/notes/notes-current.rst +++ b/doc/notes/notes-current.rst @@ -35,7 +35,13 @@ Feature Changes Bug Fixes ~~~~~~~~~ -- None. +- Changes to ``listen-on`` statements were ignored on reconfiguration + unless the port or interface address was changed, making it + impossible to change a related listener transport type. That issue + has been fixed. + + ISC would like to thank Thomas Amgarten for bringing this issue to + our attention. :gl:`#4518`, :gl:`#4528` Known Issues ~~~~~~~~~~~~