Commit e389863979 for bind
commit e3898639790ac96bcc116fc6d33c6b1efe4b4f98
Author: Štěpán Balážik <stepan@isc.org>
Date: Mon Oct 26 14:17:44 2026 +0100
Take the nsec_wildcard_wrong_zone servers from the test fixtures
The module kept the resolver's and the authoritative server's addresses
in constants, and ns2's static-stubs listed the server's address. The
tests now take the servers as their ns2 and ans1 fixtures, and ns2's
template names the server.
Assisted-by: Claude:claude-fable-5-1
diff --git a/bin/tests/system/nsec_wildcard_wrong_zone/ns2/named.conf.j2 b/bin/tests/system/nsec_wildcard_wrong_zone/ns2/named.conf.j2
index 3973d645f8..c5b36c148a 100644
--- a/bin/tests/system/nsec_wildcard_wrong_zone/ns2/named.conf.j2
+++ b/bin/tests/system/nsec_wildcard_wrong_zone/ns2/named.conf.j2
@@ -1,5 +1,7 @@
// validating resolver
+{% set ans1 = Nameserver("ans1") %}
+
options {
{% include_indented "_common/options.conf.j2" %}
dnssec-validation yes;
@@ -11,12 +13,12 @@ options {
zone "victim.example" {
type static-stub;
- server-addresses { 10.53.0.1; };
+ server-addresses { @ans1.ip@; };
};
zone "abc.example" {
type static-stub;
- server-addresses { 10.53.0.1; };
+ server-addresses { @ans1.ip@; };
};
{% include "_common/trusted.conf.j2" %}
diff --git a/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py b/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py
index 97ef6f4896..b7df7d0e8b 100644
--- a/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py
+++ b/bin/tests/system/nsec_wildcard_wrong_zone/tests_nsec_wildcard_wrong_zone.py
@@ -25,8 +25,6 @@ VALID_NXDOMAIN = f"bar.{ATTACKER}"
CONTROL = f"wild1.{VICTIM}"
CONTROL_NODATA = f"wild2.{VICTIM}"
CONTROL_A = "192.0.2.1"
-AUTH = "10.53.0.1"
-RESOLVER = "10.53.0.2"
pytestmark = pytest.mark.extra_artifacts(
[
@@ -46,8 +44,8 @@ def bootstrap():
return {"trust_anchors": trust_anchors}
-def test_forged_response_contains_cross_zone_nsec():
- response = isctest.query.tcp(isctest.query.create(ATTACK, "A"), AUTH)
+def test_forged_response_contains_cross_zone_nsec(ans1):
+ response = isctest.query.tcp(isctest.query.create(ATTACK, "A"), ans1.ip)
isctest.check.nxdomain(response)
signers = {
@@ -61,24 +59,24 @@ def test_forged_response_contains_cross_zone_nsec():
}, response.to_text()
-def test_resolver_rejects_cross_zone_nowildcard_proof():
- response = isctest.query.tcp(isctest.query.create(ATTACKER, "SOA"), RESOLVER)
+def test_resolver_rejects_cross_zone_nowildcard_proof(ns2):
+ response = isctest.query.tcp(isctest.query.create(ATTACKER, "SOA"), ns2.ip)
isctest.check.noerror(response)
isctest.check.adflag(response)
- response = isctest.query.tcp(isctest.query.create(ATTACK, "A"), RESOLVER)
+ response = isctest.query.tcp(isctest.query.create(ATTACK, "A"), ns2.ip)
isctest.check.servfail(response)
isctest.check.noadflag(response)
-def test_valid_same_zone_nxdomain_still_validates():
- response = isctest.query.tcp(isctest.query.create(VALID_NXDOMAIN, "A"), RESOLVER)
+def test_valid_same_zone_nxdomain_still_validates(ns2):
+ response = isctest.query.tcp(isctest.query.create(VALID_NXDOMAIN, "A"), ns2.ip)
isctest.check.nxdomain(response)
isctest.check.adflag(response)
-def test_valid_wildcard_still_validates():
- response = isctest.query.tcp(isctest.query.create(CONTROL, "A"), RESOLVER)
+def test_valid_wildcard_still_validates(ns2):
+ response = isctest.query.tcp(isctest.query.create(CONTROL, "A"), ns2.ip)
isctest.check.noerror(response)
isctest.check.adflag(response)
answer = response.get_rrset(
@@ -88,8 +86,8 @@ def test_valid_wildcard_still_validates():
assert any(rdata.address == CONTROL_A for rdata in answer), response.to_text()
-def test_valid_wildcard_nodata_still_validates():
- response = isctest.query.tcp(isctest.query.create(CONTROL_NODATA, "AAAA"), RESOLVER)
+def test_valid_wildcard_nodata_still_validates(ns2):
+ response = isctest.query.tcp(isctest.query.create(CONTROL_NODATA, "AAAA"), ns2.ip)
isctest.check.noerror(response)
isctest.check.adflag(response)
assert not response.answer, response.to_text()