Commit 7f2427999a for bind
commit 7f2427999acb9324698b74359bea859e9e9a42a1
Author: Alessio Podda <alessio@isc.org>
Date: Fri Sep 4 10:15:20 2026 +0200
No cached synth-from-dnssec anchors
Synth-from-dnssec needs to avoid shadowing local zones. This
was achieved by building a cached table with local zones, forward-only
zones and root hints.
Building this table was surprisingly expensive at start time for the
1m zone synthetic test, and removing it doesn't show any impact in
Shotgun, so we simplify zone and view configuration by removing it.
diff --git a/bin/named/server.c b/bin/named/server.c
index 8cd496f559..01b64b5ac7 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -875,13 +875,6 @@ cleanup:
return result;
}
-static void
-sfd_add(const dns_name_t *name, void *arg) {
- if (arg != NULL) {
- dns_view_sfd_add(arg, name);
- }
-}
-
/*%
* Parse 'key' in the context of view configuration 'vconfig'. If successful,
* add the key to 'secroots' if both of the following conditions are true:
@@ -971,7 +964,7 @@ process_key(const cfg_obj_t *key, dns_keytable_t *secroots,
* dns_keytable_add().
*/
result = dns_keytable_add(secroots, initializing, initializing, keyname,
- &ds, sfd_add, view);
+ &ds);
done:
return result;
@@ -5834,10 +5827,6 @@ configure_forward(const cfg_obj_t *config, dns_view_t *view,
goto cleanup;
}
- if (fwdpolicy == dns_fwdpolicy_only) {
- dns_view_sfd_add(view, origin);
- }
-
cleanup:
ISC_LIST_FOREACH(fwdlist, fwd, link) {
diff --git a/lib/dns/forward.c b/lib/dns/forward.c
index 84efbc4772..b5da35cfc1 100644
--- a/lib/dns/forward.c
+++ b/lib/dns/forward.c
@@ -175,6 +175,44 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name,
return result;
}
+isc_result_t
+dns_fwdtable_finddeepestonly(dns_fwdtable_t *fwdtable, const dns_name_t *name,
+ dns_name_t *foundname) {
+ isc_result_t result;
+ dns_qpread_t qpr;
+ dns_qpchain_t chain;
+ void *pval = NULL;
+
+ REQUIRE(VALID_FWDTABLE(fwdtable));
+ REQUIRE(dns_name_isabsolute(name));
+ REQUIRE(foundname != NULL);
+
+ dns_qpmulti_query(fwdtable->table, &qpr);
+ result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, &chain,
+ &pval, NULL);
+ if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
+ unsigned int len = dns_qpchain_length(&chain);
+
+ for (unsigned int i = len; i-- > 0;) {
+ dns_forwarders_t *fwdrs = NULL;
+
+ dns_qpchain_node(&chain, i, (void **)&fwdrs, NULL);
+ if (fwdrs->fwdpolicy == dns_fwdpolicy_only) {
+ dns_name_copy(&fwdrs->name, foundname);
+ result = ISC_R_SUCCESS;
+ goto done;
+ }
+ }
+ }
+
+ result = ISC_R_NOTFOUND;
+
+done:
+ dns_qpread_destroy(fwdtable->table, &qpr);
+
+ return result;
+}
+
void
dns_fwdtable_destroy(dns_fwdtable_t **fwdtablep) {
dns_fwdtable_t *fwdtable = NULL;
diff --git a/lib/dns/include/dns/forward.h b/lib/dns/include/dns/forward.h
index 1fbb7f9099..31e113aa04 100644
--- a/lib/dns/include/dns/forward.h
+++ b/lib/dns/include/dns/forward.h
@@ -94,6 +94,22 @@ dns_fwdtable_find(dns_fwdtable_t *fwdtable, const dns_name_t *name,
* \li #ISC_R_NOTFOUND No match
*/
+isc_result_t
+dns_fwdtable_finddeepestonly(dns_fwdtable_t *fwdtable, const dns_name_t *name,
+ dns_name_t *foundname);
+/*%<
+ * Finds the deepest enclosing 'forward only' domain in the forwarding table.
+ *
+ * Requires:
+ * \li fwdtable is a valid forwarding table.
+ * \li name is a valid name
+ * \li foundname is a valid name with enough space to hold the result
+ *
+ * Returns:
+ * \li #ISC_R_SUCCESS Success
+ * \li #ISC_R_NOTFOUND No forward-only match
+ */
+
void
dns_fwdtable_destroy(dns_fwdtable_t **fwdtablep);
/*%<
diff --git a/lib/dns/include/dns/keytable.h b/lib/dns/include/dns/keytable.h
index aa9f813140..863d232faf 100644
--- a/lib/dns/include/dns/keytable.h
+++ b/lib/dns/include/dns/keytable.h
@@ -46,8 +46,6 @@
#include <dst/dst.h>
-typedef void (*dns_keytable_callback_t)(const dns_name_t *name, void *fn_arg);
-
void
dns_keytable_create(dns_view_t *view, dns_keytable_t **keytablep);
/*%<
@@ -61,8 +59,7 @@ dns_keytable_create(dns_view_t *view, dns_keytable_t **keytablep);
isc_result_t
dns_keytable_add(dns_keytable_t *keytable, bool managed, bool initial,
- dns_name_t *name, dns_rdata_ds_t *ds,
- dns_keytable_callback_t callback, void *callback_arg);
+ dns_name_t *name, dns_rdata_ds_t *ds);
/*%<
* Add a key to 'keytable'. The keynode associated with 'name'
* is updated with the DS specified in 'ds'.
@@ -123,8 +120,7 @@ dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name);
*/
isc_result_t
-dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname,
- dns_keytable_callback_t callback, void *callback_arg);
+dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname);
/*%<
* Delete all trust anchors from 'keytable' matching name 'keyname'
*
diff --git a/lib/dns/include/dns/view.h b/lib/dns/include/dns/view.h
index 7633cae1a5..ba38d12b98 100644
--- a/lib/dns/include/dns/view.h
+++ b/lib/dns/include/dns/view.h
@@ -150,7 +150,6 @@ struct dns_view {
dns_nametree_t *answeracl_exclude;
dns_nametree_t *denyanswernames;
dns_nametree_t *answernames_exclude;
- dns_nametree_t *sfd;
dns_rrl_t *rrl;
bool provideixfr;
bool requestnsid;
@@ -1110,35 +1109,12 @@ dns_view_flushonshutdown(dns_view_t *view, bool flush);
*\li 'view' to be valid.
*/
-void
-dns_view_sfd_add(dns_view_t *view, const dns_name_t *name);
-/*%<
- * Add 'name' to the synth-from-dnssec namespace tree for the
- * view. If the tree does not already exist create it.
- *
- * Requires:
- *\li 'view' to be valid.
- *\li 'name' to be valid.
- */
-
-void
-dns_view_sfd_del(dns_view_t *view, const dns_name_t *name);
-/*%<
- * Delete 'name' to the synth-from-dnssec namespace tree for
- * the view when the count of previous adds and deletes becomes
- * zero.
- *
- * Requires:
- *\li 'view' to be valid.
- *\li 'name' to be valid.
- */
-
void
dns_view_sfd_find(dns_view_t *view, const dns_name_t *name,
dns_name_t *foundname);
/*%<
- * Find the enclosing name to the synth-from-dnssec namespace tree for 'name'
- * in the specified view.
+ * Find the enclosing synth-from-dnssec namespace boundary for 'name' in the
+ * specified view.
*
* Requires:
*\li 'view' to be valid.
diff --git a/lib/dns/keytable.c b/lib/dns/keytable.c
index 6868f08998..55c155b417 100644
--- a/lib/dns/keytable.c
+++ b/lib/dns/keytable.c
@@ -334,8 +334,7 @@ new_keynode(const dns_name_t *name, dns_rdata_ds_t *ds,
*/
static isc_result_t
insert(dns_keytable_t *keytable, bool managed, bool initial,
- const dns_name_t *keyname, dns_rdata_ds_t *ds,
- dns_keytable_callback_t callback, void *callback_arg) {
+ const dns_name_t *keyname, dns_rdata_ds_t *ds) {
isc_result_t result;
dns_keynode_t *newnode = NULL;
dns_qp_t *qp = NULL;
@@ -356,9 +355,6 @@ insert(dns_keytable_t *keytable, bool managed, bool initial,
*/
newnode = new_keynode(keyname, ds, keytable, managed, initial);
result = dns_qp_insert(qp, newnode, 0);
- if (callback != NULL) {
- (*callback)(keyname, callback_arg);
- }
} else {
/*
* A node already exists for "keyname" in "keytable".
@@ -378,23 +374,20 @@ insert(dns_keytable_t *keytable, bool managed, bool initial,
isc_result_t
dns_keytable_add(dns_keytable_t *keytable, bool managed, bool initial,
- dns_name_t *name, dns_rdata_ds_t *ds,
- dns_keytable_callback_t callback, void *callback_arg) {
+ dns_name_t *name, dns_rdata_ds_t *ds) {
REQUIRE(ds != NULL);
REQUIRE(!initial || managed);
- return insert(keytable, managed, initial, name, ds, callback,
- callback_arg);
+ return insert(keytable, managed, initial, name, ds);
}
isc_result_t
dns_keytable_marksecure(dns_keytable_t *keytable, const dns_name_t *name) {
- return insert(keytable, true, false, name, NULL, NULL, NULL);
+ return insert(keytable, true, false, name, NULL);
}
isc_result_t
-dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname,
- dns_keytable_callback_t callback, void *callback_arg) {
+dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname) {
isc_result_t result;
dns_qp_t *qp = NULL;
void *pval = NULL;
@@ -407,9 +400,6 @@ dns_keytable_delete(dns_keytable_t *keytable, const dns_name_t *keyname,
NULL);
if (result == ISC_R_SUCCESS) {
dns_keynode_t *n = pval;
- if (callback != NULL) {
- (*callback)(keyname, callback_arg);
- }
dns_keynode_detach(&n);
}
dns_qp_compact(qp, DNS_QPGC_MAYBE);
diff --git a/lib/dns/view.c b/lib/dns/view.c
index 58040a6381..2a6cf6af2c 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -173,8 +173,6 @@ dns_view_create(isc_mem_t *mctx, dns_dispatchmgr_t *dispatchmgr,
dns_aclenv_create(view->mctx, &view->aclenv);
- dns_nametree_create(view->mctx, DNS_NAMETREE_COUNT, "sfd", &view->sfd);
-
view->magic = DNS_VIEW_MAGIC;
*viewp = view;
}
@@ -325,9 +323,6 @@ destroy(dns_view_t *view) {
if (view->answernames_exclude != NULL) {
dns_nametree_detach(&view->answernames_exclude);
}
- if (view->sfd != NULL) {
- dns_nametree_detach(&view->sfd);
- }
if (view->secroots_priv != NULL) {
dns_keytable_detach(&view->secroots_priv);
}
@@ -1890,29 +1885,53 @@ dns_view_flushonshutdown(dns_view_t *view, bool flush) {
}
void
-dns_view_sfd_add(dns_view_t *view, const dns_name_t *name) {
+dns_view_sfd_find(dns_view_t *view, const dns_name_t *name,
+ dns_name_t *foundname) {
+ dns_fixedname_t fcandidate;
+ dns_name_t *candidate = dns_fixedname_initname(&fcandidate);
+ dns_zone_t *zone = NULL;
+ dns_keytable_t *secroots = NULL;
+ dns_zt_t *zonetable = NULL;
+ unsigned int foundlabels = 0;
isc_result_t result;
REQUIRE(DNS_VIEW_VALID(view));
- result = dns_nametree_add(view->sfd, name, 0);
- RUNTIME_CHECK(result == ISC_R_SUCCESS);
-}
+ dns_name_copy(dns_rootname, foundname);
-void
-dns_view_sfd_del(dns_view_t *view, const dns_name_t *name) {
- REQUIRE(DNS_VIEW_VALID(view));
+ rcu_read_lock();
+ zonetable = rcu_dereference(view->zonetable);
+ if (zonetable != NULL) {
+ result = dns_zt_find(zonetable, name, 0, &zone);
+ } else {
+ result = ISC_R_NOTFOUND;
+ }
+ rcu_read_unlock();
- dns_nametree_delete(view->sfd, name);
-}
+ if (result == ISC_R_SUCCESS || result == DNS_R_PARTIALMATCH) {
+ dns_name_copy(dns_zone_getorigin(zone), foundname);
+ foundlabels = dns_name_countlabels(foundname);
+ dns_zone_detach(&zone);
+ }
-void
-dns_view_sfd_find(dns_view_t *view, const dns_name_t *name,
- dns_name_t *foundname) {
- REQUIRE(DNS_VIEW_VALID(view));
+ result = dns_fwdtable_finddeepestonly(view->fwdtable, name, candidate);
+ if (result == ISC_R_SUCCESS &&
+ dns_name_countlabels(candidate) > foundlabels)
+ {
+ dns_name_copy(candidate, foundname);
+ foundlabels = dns_name_countlabels(foundname);
+ }
- if (!dns_nametree_covered(view->sfd, name, foundname, 0)) {
- dns_name_copy(dns_rootname, foundname);
+ result = dns_view_getsecroots(view, &secroots);
+ if (result == ISC_R_SUCCESS) {
+ result = dns_keytable_finddeepestmatch(secroots, name,
+ candidate);
+ if (result == ISC_R_SUCCESS &&
+ dns_name_countlabels(candidate) > foundlabels)
+ {
+ dns_name_copy(candidate, foundname);
+ }
+ dns_keytable_detach(&secroots);
}
}
@@ -2007,8 +2026,7 @@ dns_view_addtrustedkey(dns_view_t *view, dns_rdatatype_t rdtype,
digest, sizeof(digest), &ds));
}
- CHECK(dns_keytable_add(view->secroots_priv, false, false, name, &ds,
- NULL, NULL));
+ CHECK(dns_keytable_add(view->secroots_priv, false, false, name, &ds));
cleanup:
return result;
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 1e9216eb33..8c120e8d77 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -849,11 +849,9 @@ dns__zone_setview_helper(dns_zone_t *zone, dns_view_t *view) {
INSIST(zone != zone->raw);
if (zone->view != NULL) {
- dns_view_sfd_del(zone->view, &zone->origin);
dns_view_weakdetach(&zone->view);
}
dns_view_weakattach(view, &zone->view);
- dns_view_sfd_add(view, &zone->origin);
if (dns__zone_inline_secure(zone)) {
dns_zone_setview(zone->raw, view);
@@ -3472,23 +3470,6 @@ cleanup:
return result;
}
-/*
- * Synth-from-dnssec callbacks to add/delete names from namespace tree.
- */
-static void
-sfd_add(const dns_name_t *name, void *arg) {
- if (arg != NULL) {
- dns_view_sfd_add(arg, name);
- }
-}
-
-static void
-sfd_del(const dns_name_t *name, void *arg) {
- if (arg != NULL) {
- dns_view_sfd_del(arg, name);
- }
-}
-
/*
* Add key to the security roots.
*/
@@ -3511,8 +3492,7 @@ trust_key(dns_zone_t *zone, dns_name_t *keyname, dns_rdata_dnskey_t *dnskey,
dns_rdatatype_dnskey, dnskey, &buffer));
CHECK(dns_ds_fromkeyrdata(keyname, &rdata, DNS_DSDIGEST_SHA256, digest,
sizeof(digest), &ds));
- CHECK(dns_keytable_add(sr, true, initial, keyname, &ds, sfd_add,
- zone->view));
+ CHECK(dns_keytable_add(sr, true, initial, keyname, &ds));
dns_keytable_detach(&sr);
@@ -3554,7 +3534,7 @@ load_secroots(dns_zone_t *zone, dns_name_t *name, dns_rdataset_t *rdataset) {
result = dns_view_getsecroots(zone->view, &sr);
if (result == ISC_R_SUCCESS) {
- dns_keytable_delete(sr, name, sfd_del, zone->view);
+ dns_keytable_delete(sr, name);
dns_keytable_detach(&sr);
}
diff --git a/tests/dns/keytable_test.c b/tests/dns/keytable_test.c
index 1d2e6feffe..264a136473 100644
--- a/tests/dns/keytable_test.c
+++ b/tests/dns/keytable_test.c
@@ -179,16 +179,14 @@ create_tables(void) {
dns_test_namefromstring("example.com.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr1, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds),
ISC_R_SUCCESS);
/* Add an initializing managed key */
dns_test_namefromstring("managed.com.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr1, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, true, true, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, true, true, keyname, &ds),
ISC_R_SUCCESS);
/* Add a null key */
@@ -243,8 +241,7 @@ ISC_LOOP_TEST_IMPL(add) {
dns_test_namefromstring("example.com.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr1, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds),
ISC_R_SUCCESS);
dns_keynode_detach(&keynode);
assert_int_equal(
@@ -255,8 +252,7 @@ ISC_LOOP_TEST_IMPL(add) {
dns_keynode_detach(&keynode);
create_dsstruct(keyname, 257, 3, 5, keystr2, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds),
ISC_R_SUCCESS);
assert_int_equal(
dns_keytable_find(keytable, str2name("example.com"), &keynode),
@@ -284,8 +280,7 @@ ISC_LOOP_TEST_IMPL(add) {
dns_test_namefromstring("managed.com.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr2, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, true, true, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, true, true, keyname, &ds),
ISC_R_SUCCESS);
assert_int_equal(
dns_keytable_find(keytable, str2name("managed.com"), &keynode),
@@ -299,8 +294,7 @@ ISC_LOOP_TEST_IMPL(add) {
* to a non-initializing key and make sure there are still two key
* nodes for managed.com, both containing non-initializing keys.
*/
- assert_int_equal(dns_keytable_add(keytable, true, false, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, true, false, keyname, &ds),
ISC_R_SUCCESS);
assert_int_equal(
dns_keytable_find(keytable, str2name("managed.com"), &keynode),
@@ -315,8 +309,7 @@ ISC_LOOP_TEST_IMPL(add) {
dns_test_namefromstring("two.com.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr1, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, true, true, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, true, true, keyname, &ds),
ISC_R_SUCCESS);
assert_int_equal(
dns_keytable_find(keytable, str2name("two.com"), &keynode),
@@ -332,8 +325,7 @@ ISC_LOOP_TEST_IMPL(add) {
*/
create_dsstruct(keyname, 257, 3, 5, keystr2, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, true, false, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, true, false, keyname, &ds),
ISC_R_SUCCESS);
assert_int_equal(
dns_keytable_find(keytable, str2name("two.com"), &keynode),
@@ -351,8 +343,7 @@ ISC_LOOP_TEST_IMPL(add) {
dns_test_namefromstring("null.example.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr2, digest, sizeof(digest),
&ds);
- assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds,
- NULL, NULL),
+ assert_int_equal(dns_keytable_add(keytable, false, false, keyname, &ds),
ISC_R_SUCCESS);
assert_int_equal(
dns_keytable_find(keytable, str2name("null.example"), &keynode),
@@ -388,21 +379,18 @@ ISC_LOOP_TEST_IMPL(delete) {
create_tables();
/* dns_keytable_delete requires exact match */
- assert_int_equal(dns_keytable_delete(keytable, str2name("example.org"),
- NULL, NULL),
+ assert_int_equal(dns_keytable_delete(keytable, str2name("example.org")),
ISC_R_NOTFOUND);
- assert_int_equal(dns_keytable_delete(keytable,
- str2name("s.example.com"), NULL,
- NULL),
- ISC_R_NOTFOUND);
- assert_int_equal(dns_keytable_delete(keytable, str2name("example.com"),
- NULL, NULL),
+ assert_int_equal(
+ dns_keytable_delete(keytable, str2name("s.example.com")),
+ ISC_R_NOTFOUND);
+ assert_int_equal(dns_keytable_delete(keytable, str2name("example.com")),
ISC_R_SUCCESS);
/* works also for nodes with a null key */
- assert_int_equal(dns_keytable_delete(keytable, str2name("null.example"),
- NULL, NULL),
- ISC_R_SUCCESS);
+ assert_int_equal(
+ dns_keytable_delete(keytable, str2name("null.example")),
+ ISC_R_SUCCESS);
/* or a negative trust anchor */
assert_int_equal(
@@ -458,8 +446,7 @@ ISC_LOOP_TEST_IMPL(deletekey) {
* after deleting the node, any deletekey or delete attempt should
* result in NOTFOUND.
*/
- assert_int_equal(dns_keytable_delete(keytable, keyname, NULL, NULL),
- ISC_R_SUCCESS);
+ assert_int_equal(dns_keytable_delete(keytable, keyname), ISC_R_SUCCESS);
assert_int_equal(dns_keytable_deletekey(keytable, keyname, &dnskey),
ISC_R_NOTFOUND);
@@ -471,8 +458,7 @@ ISC_LOOP_TEST_IMPL(deletekey) {
create_keystruct(257, 3, 5, keystr1, keydata, sizeof(keydata), &dnskey);
assert_int_equal(dns_keytable_deletekey(keytable, keyname, &dnskey),
DNS_R_PARTIALMATCH);
- assert_int_equal(dns_keytable_delete(keytable, keyname, NULL, NULL),
- ISC_R_SUCCESS);
+ assert_int_equal(dns_keytable_delete(keytable, keyname), ISC_R_SUCCESS);
destroy_tables();
@@ -615,8 +601,7 @@ ISC_LOOP_TEST_IMPL(nta) {
dns_test_namefromstring("example.", &fn);
create_dsstruct(keyname, 257, 3, 5, keystr1, digest, sizeof(digest),
&ds);
- result = dns_keytable_add(keytable, false, false, keyname, &ds, NULL,
- NULL),
+ result = dns_keytable_add(keytable, false, false, keyname, &ds),
assert_int_equal(result, ISC_R_SUCCESS);
result = dns_ntatable_add(ntatable, str2name("insecure.example"), false,
diff --git a/tests/dns/zt_test.c b/tests/dns/zt_test.c
index 26d994c3b2..91dd05706b 100644
--- a/tests/dns/zt_test.c
+++ b/tests/dns/zt_test.c
@@ -28,11 +28,14 @@
#include <isc/buffer.h>
#include <isc/lib.h>
#include <isc/loop.h>
+#include <isc/sockaddr.h>
#include <isc/timer.h>
#include <isc/urcu.h>
#include <isc/util.h>
#include <dns/db.h>
+#include <dns/forward.h>
+#include <dns/keytable.h>
#include <dns/lib.h>
#include <dns/name.h>
#include <dns/view.h>
@@ -63,6 +66,66 @@ count_zone(dns_zone_t *zone, void *uap) {
return ISC_R_SUCCESS;
}
+ISC_LOOP_TEST_IMPL(sfd_forward_only_deepest) {
+ dns_fixedname_t child, found, parent, qname;
+ dns_name_t *childname = dns_fixedname_initname(&child);
+ dns_name_t *name = dns_fixedname_initname(&qname);
+ dns_name_t *namespace = dns_fixedname_initname(&found);
+ dns_name_t *parentname = dns_fixedname_initname(&parent);
+ isc_sockaddrlist_t addrs;
+ isc_result_t result;
+
+ result = dns_test_makeview("view", false, false, &view);
+ assert_int_equal(result, ISC_R_SUCCESS);
+
+ ISC_LIST_INIT(addrs);
+
+ dns_test_namefromstring("example.", &parent);
+ dns_test_namefromstring("child.example.", &child);
+
+ result = dns_fwdtable_add(view->fwdtable, parentname, &addrs,
+ dns_fwdpolicy_only);
+ assert_int_equal(result, ISC_R_SUCCESS);
+ result = dns_fwdtable_add(view->fwdtable, childname, &addrs,
+ dns_fwdpolicy_first);
+ assert_int_equal(result, ISC_R_SUCCESS);
+
+ dns_test_namefromstring("www.child.example.", &qname);
+ dns_view_sfd_find(view, name, namespace);
+ assert_true(dns_name_equal(namespace, parentname));
+
+ dns_view_detach(&view);
+ isc_loopmgr_shutdown();
+}
+
+ISC_LOOP_TEST_IMPL(sfd_secroots_boundary) {
+ dns_fixedname_t anchor, found, qname;
+ dns_name_t *anchorname = dns_fixedname_initname(&anchor);
+ dns_name_t *name = dns_fixedname_initname(&qname);
+ dns_name_t *namespace = dns_fixedname_initname(&found);
+ dns_keytable_t *secroots = NULL;
+ isc_result_t result;
+
+ result = dns_test_makeview("view", false, false, &view);
+ assert_int_equal(result, ISC_R_SUCCESS);
+
+ dns_view_initsecroots(view);
+ result = dns_view_getsecroots(view, &secroots);
+ assert_int_equal(result, ISC_R_SUCCESS);
+
+ dns_test_namefromstring("secure.example.", &anchor);
+ result = dns_keytable_marksecure(secroots, anchorname);
+ assert_int_equal(result, ISC_R_SUCCESS);
+ dns_keytable_detach(&secroots);
+
+ dns_test_namefromstring("www.secure.example.", &qname);
+ dns_view_sfd_find(view, name, namespace);
+ assert_true(dns_name_equal(namespace, anchorname));
+
+ dns_view_detach(&view);
+ isc_loopmgr_shutdown();
+}
+
/* apply a function to a zone table */
ISC_LOOP_TEST_IMPL(apply) {
isc_result_t result;
@@ -261,6 +324,8 @@ ISC_LOOP_TEST_IMPL(asyncload_zt) {
}
ISC_TEST_LIST_START
+ISC_TEST_ENTRY_CUSTOM(sfd_forward_only_deepest, setup_managers, teardown_test)
+ISC_TEST_ENTRY_CUSTOM(sfd_secroots_boundary, setup_managers, teardown_test)
ISC_TEST_ENTRY_CUSTOM(apply, setup_managers, teardown_test)
ISC_TEST_ENTRY_CUSTOM(asyncload_zone, setup_managers, teardown_test)
ISC_TEST_ENTRY_CUSTOM(asyncload_zt, setup_managers, teardown_test)