espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-09 12:17:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[posix] update Posix::Resolver to support RDNSS-discovered recursive DNS servers (#11342)

Browse Source 
Key Changes:
* Server Prioritization: RDNSS-discovered servers are prioritized
  based on their advertised lifetime. Servers with longer lifetimes
  are preferred.
* Recursive DNS Server List: The resolver maintains a list of
  recursive DNS servers, which now includes servers learned via RDNSS.
* DNS Query Integration: The resolver uses the RDNSS-learned servers
  when forwarding DNS queries upstream.
* Border Routing Integration: The RDNSS callback is registered to the
  border routing module.

Minor Changes:
* The unused function `Transaction *GetTransaction(int aFd)` is
  removed.
This commit is contained in:
Yang Song
2025-03-24 08:29:15 -07:00
committed by GitHub
parent a8fef54bf6
commit a41490ea40
6 changed files with 268 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/scripts/thread-cert/border_router/internet/test_upstream_dns.py
+52 -39
View File
@@ -39,29 +39,23 @@ import shlex
# a record resolved by BIND9 server.
#
# Topology:
# ----------------(eth)--------------------
# | |
# BR (Leader) DNS SERVER
# ----------------(eth)----------------------------------
# | | |
# BR (Leader) DNS SERVER 1 DNS SERVER 2
# |
# ROUTER
#
BR = 1
ROUTER = 2
DNS_SERVER = 3
DNS_SERVER_1 = 3
DNS_SERVER_2 = 4
TEST_DOMAIN = 'test.domain'
TEST_DOMAIN_IP6_ADDRESSES = {'2001:db8::1'}
TEST_DOMAIN_1 = 'test.domain.resolv'
TEST_DOMAIN_IP6_ADDRESSES_1 = {'2001:db8::1'}
TEST_DOMAIN_BIND_CONF = f'''
zone "{TEST_DOMAIN}" {{ type master; file "/etc/bind/db.test.domain"; }};
'''
TEST_DOMAIN_BIND_ZONE = f'''
$TTL 24h
@ IN SOA {TEST_DOMAIN} test.{TEST_DOMAIN}. ( 20230330 86400 300 604800 3600 )
@ IN NS {TEST_DOMAIN}.
''' + '\n'.join(f'@ IN AAAA {addr}' for addr in TEST_DOMAIN_IP6_ADDRESSES)
TEST_DOMAIN_2 = 'test.domain.rdnss'
TEST_DOMAIN_IP6_ADDRESSES_2 = {'2001:db8::2'}
class UpstreamDns(thread_cert.TestCase):
@@ -77,8 +71,12 @@ class UpstreamDns(thread_cert.TestCase):
'name': 'Router',
'version': '1.4',
},
DNS_SERVER: {
'name': 'DNS Server',
DNS_SERVER_1: {
'name': 'DNS Server 1',
'is_host': True
},
DNS_SERVER_2: {
'name': 'DNS Server 2',
'is_host': True
},
}
@@ -86,19 +84,15 @@ class UpstreamDns(thread_cert.TestCase):
def test(self):
br = self.nodes[BR]
router = self.nodes[ROUTER]
dns_server = self.nodes[DNS_SERVER]
dns_server_1 = self.nodes[DNS_SERVER_1]
dns_server_2 = self.nodes[DNS_SERVER_2]
self._start_dns_server(dns_server)
dns_server_addr = dns_server.get_ether_addrs(ipv4=True, ipv6=False)[0]
self._start_dns_server(dns_server_1, TEST_DOMAIN_1, TEST_DOMAIN_IP6_ADDRESSES_1)
self._start_dns_server(dns_server_2, TEST_DOMAIN_2, TEST_DOMAIN_IP6_ADDRESSES_2)
# Disable the bind9 service on the BR otherwise bind9 may respond to Thread devices' DNS queries
br.bash('service bind9 stop')
# Update BR's /etc/resolv.conf and force BR to reload it
br.bash(shlex.join(['echo', 'nameserver ' + dns_server_addr]) + ' > /etc/resolv.conf')
br.stop_otbr_service()
br.start_otbr_service()
br.start()
self.simulator.go(config.LEADER_STARTUP_DELAY)
self.assertEqual('leader', br.get_state())
@@ -115,26 +109,45 @@ class UpstreamDns(thread_cert.TestCase):
self.simulator.go(10)
router.srp_client_enable_auto_start_mode()
# verify the server can forward the DNS query to upstream server.
self._verify_upstream_dns(br, router)
def _verify_upstream_dns(self, br, ed):
upstream_dns_enabled = br.dns_upstream_query_state
if not upstream_dns_enabled:
br.dns_upstream_query_state = True
br.dns_upstream_query_state = True
self.assertTrue(br.dns_upstream_query_state)
resolved_names = ed.dns_resolve(TEST_DOMAIN)
self.assertEqual(len(resolved_names), len(TEST_DOMAIN_IP6_ADDRESSES))
for record in resolved_names:
self.assertIn(ipaddress.IPv6Address(record[0]).compressed, TEST_DOMAIN_IP6_ADDRESSES)
# Update BR's /etc/resolv.conf with the address of DNS server 1 and force BR to reload it
dns_server_addr_1 = dns_server_1.get_ether_addrs(ipv4=True, ipv6=False)[0]
br.bash(shlex.join(['echo', 'nameserver ' + dns_server_addr_1]) + ' > /etc/resolv.conf')
br.stop_otbr_service()
br.start_otbr_service()
# Publish RDNSS with the address of DNS server 2 through RA
dns_server_addr_2 = dns_server_2.get_ip6_address(config.ADDRESS_TYPE.ONLINK_ULA)[0]
br.start_rdnss_radvd_service(dns_server_addr_2)
self.simulator.go(10)
# verify the server can forward the DNS query to the two upstream servers.
resolved_addresses_1 = set(
ipaddress.IPv6Address(record[0]).compressed for record in router.dns_resolve(TEST_DOMAIN_1))
self.assertEqual(resolved_addresses_1, TEST_DOMAIN_IP6_ADDRESSES_1)
resolved_addresses_2 = set(
ipaddress.IPv6Address(record[0]).compressed for record in router.dns_resolve(TEST_DOMAIN_2))
self.assertEqual(resolved_addresses_2, TEST_DOMAIN_IP6_ADDRESSES_2)
def _start_dns_server(self, dns_server, test_domain, test_domain_ip6_addresses):
test_domain_bind_conf = f'''
zone "{test_domain}" {{ type master; file "/etc/bind/db.test.domain"; }};
'''
test_domain_bind_zone = f'''
$TTL 24h
@ IN SOA {test_domain} test.{test_domain}. ( 20230330 86400 300 604800 3600 )
@ IN NS {test_domain}.
''' + '\n'.join(f'@ IN AAAA {addr}' for addr in test_domain_ip6_addresses)
def _start_dns_server(self, dns_server):
dns_server.start(start_radvd=False)
dns_server.bash('service bind9 stop')
dns_server.bash(shlex.join(['echo', TEST_DOMAIN_BIND_CONF]) + ' >> /etc/bind/named.conf.local')
dns_server.bash(shlex.join(['echo', TEST_DOMAIN_BIND_ZONE]) + ' >> /etc/bind/db.test.domain')
dns_server.bash(shlex.join(['echo', test_domain_bind_conf]) + ' >> /etc/bind/named.conf.local')
dns_server.bash(shlex.join(['echo', test_domain_bind_zone]) + ' >> /etc/bind/db.test.domain')
dns_server.bash('service bind9 start')
tests/scripts/thread-cert/node.py
+22
View File
@@ -4145,6 +4145,28 @@ EOF
""" % (prefix,))
self._start_radvd_and_verify()
def start_rdnss_radvd_service(self, dns_server_address):
self.bash(f"""cat >/etc/radvd.conf <<EOF
interface eth0
{{
AdvSendAdvert on;
AdvReachableTime 20;
AdvRetransTimer 20;
AdvDefaultLifetime 180;
MinRtrAdvInterval 120;
MaxRtrAdvInterval 180;
AdvDefaultPreference low;
RDNSS {dns_server_address}
{{
AdvRDNSSLifetime 1800;
}};
}};
EOF
""")
self._start_radvd_and_verify()
def stop_radvd_service(self):
self.bash('service radvd stop')