Commit f774ff76e9 for bind

commit f774ff76e921bba7fb172a5b446f31aee70f54c2
Author: Štěpán Balážik <stepan@isc.org>
Date:   Mon Oct 26 10:30:41 2026 +0100

    Call Message.get_rrset() directly in the nsec_synthesis tests

    Since dnspython 2.4.0, Message.get_rrset() takes the owner name as text,
    so the _rrset() helper each test module carried only filled in the
    class, and its separate call without covers repeated the default.

    Assisted-by: Claude:claude-fable-5-1

diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py b/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py
index 6544b4f0cb..daf5c4d26a 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_child_next.py
@@ -77,37 +77,22 @@ def _query(server, qname, qtype):
     return isctest.query.tcp(query, server)


-def _rrset(response, section, owner, rdtype, covers=None):
-    if covers is None:
-        return response.get_rrset(
-            section,
-            dns.name.from_text(owner),
-            dns.rdataclass.IN,
-            rdtype,
-        )
-    return response.get_rrset(
-        section,
-        dns.name.from_text(owner),
-        dns.rdataclass.IN,
-        rdtype,
-        covers=covers,
-    )
-
-
 def _has_a(response, owner, address):
-    rrset = _rrset(response, response.answer, owner, dns.rdatatype.A)
+    rrset = response.get_rrset(
+        response.answer, owner, dns.rdataclass.IN, dns.rdatatype.A
+    )
     return rrset is not None and any(rdata.address == address for rdata in rrset)


 def _check_malicious_nsec(response, section):
-    nsec = _rrset(response, section, POISON, dns.rdatatype.NSEC)
+    nsec = response.get_rrset(section, POISON, dns.rdataclass.IN, dns.rdatatype.NSEC)
     assert nsec is not None, response.to_text()
     assert nsec[0].next == dns.name.from_text(POISON_NEXT), response.to_text()

-    rrsig = _rrset(
-        response,
+    rrsig = response.get_rrset(
         section,
         POISON,
+        dns.rdataclass.IN,
         dns.rdatatype.RRSIG,
         covers=dns.rdatatype.NSEC,
     )
@@ -145,4 +130,9 @@ def test_resolver_does_not_synth_from_insecure_child_nsec():
     isctest.check.noerror(response)
     assert _has_a(response, TARGET, TARGET_A), response.to_text()
     isctest.check.adflag(response)
-    assert _rrset(response, response.authority, POISON, dns.rdatatype.NSEC) is None
+    assert (
+        response.get_rrset(
+            response.authority, POISON, dns.rdataclass.IN, dns.rdatatype.NSEC
+        )
+        is None
+    )
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py b/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py
index 96d7e97471..0fd5e51d5e 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_exact_nodata.py
@@ -74,37 +74,22 @@ def _query(server, qname, qtype, cd=False, dnssec=True):
     return isctest.query.tcp(query, server)


-def _rrset(response, section, owner, rdtype, covers=None):
-    if covers is None:
-        return response.get_rrset(
-            section,
-            dns.name.from_text(owner),
-            dns.rdataclass.IN,
-            rdtype,
-        )
-    return response.get_rrset(
-        section,
-        dns.name.from_text(owner),
-        dns.rdataclass.IN,
-        rdtype,
-        covers=covers,
-    )
-
-
 def _has_a(response, owner, address):
-    rrset = _rrset(response, response.answer, owner, dns.rdatatype.A)
+    rrset = response.get_rrset(
+        response.answer, owner, dns.rdataclass.IN, dns.rdatatype.A
+    )
     return rrset is not None and any(rdata.address == address for rdata in rrset)


 def _check_forged_nsec(response, section):
-    nsec = _rrset(response, section, VICTIM, dns.rdatatype.NSEC)
+    nsec = response.get_rrset(section, VICTIM, dns.rdataclass.IN, dns.rdatatype.NSEC)
     assert nsec is not None, response.to_text()
     assert nsec[0].next == dns.name.from_text(POISON_NEXT), response.to_text()

-    rrsig = _rrset(
-        response,
+    rrsig = response.get_rrset(
         section,
         VICTIM,
+        dns.rdataclass.IN,
         dns.rdatatype.RRSIG,
         covers=dns.rdatatype.NSEC,
     )
@@ -142,5 +127,15 @@ def test_pending_exact_nodata_nsec_cache_poisoning():
     isctest.check.noerror(response)
     assert _has_a(response, VICTIM, VICTIM_A), response.to_text()
     isctest.check.adflag(response)
-    assert _rrset(response, response.answer, VICTIM, dns.rdatatype.NSEC) is None
-    assert _rrset(response, response.authority, VICTIM, dns.rdatatype.NSEC) is None
+    assert (
+        response.get_rrset(
+            response.answer, VICTIM, dns.rdataclass.IN, dns.rdatatype.NSEC
+        )
+        is None
+    )
+    assert (
+        response.get_rrset(
+            response.authority, VICTIM, dns.rdataclass.IN, dns.rdatatype.NSEC
+        )
+        is None
+    )
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py b/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py
index 86d16bcb52..cf7530baa7 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_pending_cd.py
@@ -75,37 +75,24 @@ def _query(server, qname, qtype, cd=False, dnssec=True):
     return isctest.query.tcp(query, server)


-def _rrset(response, section, owner, rdtype, covers=None):
-    if covers is None:
-        return response.get_rrset(
-            section,
-            dns.name.from_text(owner),
-            dns.rdataclass.IN,
-            rdtype,
-        )
-    return response.get_rrset(
-        section,
-        dns.name.from_text(owner),
-        dns.rdataclass.IN,
-        rdtype,
-        covers=covers,
-    )
-
-
 def _has_a(response, owner, address):
-    rrset = _rrset(response, response.answer, owner, dns.rdatatype.A)
+    rrset = response.get_rrset(
+        response.answer, owner, dns.rdataclass.IN, dns.rdatatype.A
+    )
     return rrset is not None and any(rdata.address == address for rdata in rrset)


 def _check_attacker_nsec(response, section):
-    nsec = _rrset(response, section, f"{ATTACKER}", dns.rdatatype.NSEC)
+    nsec = response.get_rrset(
+        section, f"{ATTACKER}", dns.rdataclass.IN, dns.rdatatype.NSEC
+    )
     assert nsec is not None, response.to_text()
     assert nsec[0].next == dns.name.from_text(POISON_NEXT), response.to_text()

-    rrsig = _rrset(
-        response,
+    rrsig = response.get_rrset(
         section,
         f"{ATTACKER}",
+        dns.rdataclass.IN,
         dns.rdatatype.RRSIG,
         covers=dns.rdatatype.NSEC,
     )
@@ -135,14 +122,24 @@ def test_pending_trust_nsec_cd_cache_poisoning():
     isctest.check.noerror(response)
     assert _has_a(response, VICTIM, VICTIM_A), response.to_text()
     isctest.check.adflag(response)
-    assert _rrset(response, response.authority, ATTACKER, dns.rdatatype.NSEC) is None
+    assert (
+        response.get_rrset(
+            response.authority, ATTACKER, dns.rdataclass.IN, dns.rdatatype.NSEC
+        )
+        is None
+    )

     # Step 4: Exploit Against Stub Client
     response = _query(RESOLVER, VICTIM, "A", dnssec=False)
     isctest.check.noerror(response)
     assert _has_a(response, VICTIM, VICTIM_A), response.to_text()
     isctest.check.adflag(response)
-    assert _rrset(response, response.authority, ATTACKER, dns.rdatatype.NSEC) is None
+    assert (
+        response.get_rrset(
+            response.authority, ATTACKER, dns.rdataclass.IN, dns.rdatatype.NSEC
+        )
+        is None
+    )

     # Step 5: Verify Upstream Queries
     with open("ans1/ans.run", "r", encoding="utf-8") as file:
diff --git a/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py b/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py
index 47383aa4b2..758114bb60 100644
--- a/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py
+++ b/bin/tests/system/nsec_synthesis/tests_nsec_selfloop.py
@@ -93,37 +93,24 @@ def _query(server, qname, qtype):
     return isctest.query.tcp(query, server)


-def _rrset(response, section, owner, rdtype, covers=None):
-    if covers is None:
-        return response.get_rrset(
-            section,
-            dns.name.from_text(owner),
-            dns.rdataclass.IN,
-            rdtype,
-        )
-    return response.get_rrset(
-        section,
-        dns.name.from_text(owner),
-        dns.rdataclass.IN,
-        rdtype,
-        covers=covers,
-    )
-
-
 def _has_a(response, owner, address):
-    rrset = _rrset(response, response.answer, owner, dns.rdatatype.A)
+    rrset = response.get_rrset(
+        response.answer, owner, dns.rdataclass.IN, dns.rdatatype.A
+    )
     return rrset is not None and any(rdata.address == address for rdata in rrset)


 def _check_child_self_loop_nsec(response):
-    nsec = _rrset(response, response.authority, CHILD, dns.rdatatype.NSEC)
+    nsec = response.get_rrset(
+        response.authority, CHILD, dns.rdataclass.IN, dns.rdatatype.NSEC
+    )
     assert nsec is not None, response.to_text()
     assert nsec[0].next == dns.name.from_text(CHILD), response.to_text()

-    rrsig = _rrset(
-        response,
+    rrsig = response.get_rrset(
         response.authority,
         CHILD,
+        dns.rdataclass.IN,
         dns.rdatatype.RRSIG,
         covers=dns.rdatatype.NSEC,
     )
@@ -148,4 +135,9 @@ def test_resolver_does_not_synth_parent_nxdomain_from_child_nsec():
     isctest.check.noerror(response)
     assert _has_a(response, VICTIM, VICTIM_A), response.to_text()
     isctest.check.adflag(response)
-    assert _rrset(response, response.authority, CHILD, dns.rdatatype.NSEC) is None
+    assert (
+        response.get_rrset(
+            response.authority, CHILD, dns.rdataclass.IN, dns.rdatatype.NSEC
+        )
+        is None
+    )