mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

[master] Improve clarity of keytable unit tests

Browse Source 
4799.	[cleanup]	Improve clarity of keytable unit tests. [RT #46407]
This commit is contained in:
Michał Kępień
2017-10-28 19:59:40 +02:00
parent 8f532a13cb
commit c6c1193e39
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@@ -1,3 +1,5 @@
4799. [cleanup] Improve clarity of keytable unit tests. [RT #46407]
4798. [func] Keys specified in "managed-keys" statements 4798. [func] Keys specified in "managed-keys" statements
are tagged as "initializing" until they have been are tagged as "initializing" until they have been
updated by a key refresh query. If initialization updated by a key refresh query. If initialization

25
lib/dns/tests/keytable_test.c
View File

@@ -457,8 +457,7 @@ ATF_TC_BODY(find, tc) {
/* /*
* dns_keytable_find() requires exact name match. It matches node * dns_keytable_find() requires exact name match. It matches node
* that has a null key, too. But it doesn't match a negative trust * that has a null key, too.
* anchor.
*/ */
ATF_REQUIRE_EQ(dns_keytable_find(keytable, str2name("example.org"), ATF_REQUIRE_EQ(dns_keytable_find(keytable, str2name("example.org"),
&keynode), ISC_R_NOTFOUND); &keynode), ISC_R_NOTFOUND);
@@ -471,12 +470,10 @@ ATF_TC_BODY(find, tc) {
&keynode), ISC_R_SUCCESS); &keynode), ISC_R_SUCCESS);
ATF_REQUIRE_EQ(dns_keynode_key(keynode), NULL); ATF_REQUIRE_EQ(dns_keynode_key(keynode), NULL);
dns_keytable_detachkeynode(keytable, &keynode); dns_keytable_detachkeynode(keytable, &keynode);
ATF_REQUIRE_EQ(dns_keytable_find(keytable, str2name("insecure.example"),
&keynode), ISC_R_NOTFOUND);
/* /*
* dns_keytable_finddeepestmatch() allows partial match. Also match * dns_keytable_finddeepestmatch() allows partial match. Also match
* nodes with a null key or a negative trust anchor. * nodes with a null key.
*/ */
dns_fixedname_init(&fname); dns_fixedname_init(&fname);
name = dns_fixedname_name(&fname); name = dns_fixedname_name(&fname);
@@ -500,8 +497,7 @@ ATF_TC_BODY(find, tc) {
/* /*
* dns_keytable_findkeynode() requires exact name, algorithm, keytag * dns_keytable_findkeynode() requires exact name, algorithm, keytag
* match. If algorithm or keytag doesn't match, should result in * match. If algorithm or keytag doesn't match, should result in
* PARTIALMATCH. Same for a node with a null key or a negative trust * PARTIALMATCH. Same for a node with a null key.
* anchor.
*/ */
ATF_REQUIRE_EQ(dns_keytable_findkeynode(keytable, ATF_REQUIRE_EQ(dns_keytable_findkeynode(keytable,
str2name("example.org"), str2name("example.org"),
@@ -563,19 +559,15 @@ ATF_TC_BODY(issecuredomain, tc) {
} }
/* /*
* Domains that are an exact or partial match of a negative trust * If the key table has no entry (not even a null one) for a domain or
* anchor are considered insecure. * any of its ancestors, that domain is considered insecure.
*/ */
ATF_REQUIRE_EQ(dns_keytable_issecuredomain(keytable, ATF_REQUIRE_EQ(dns_keytable_issecuredomain(keytable,
str2name("insecure.example"), str2name("example.org"),
NULL, NULL,
&issecure), &issecure),
ISC_R_SUCCESS); ISC_R_SUCCESS);
ATF_REQUIRE_EQ(issecure, ISC_FALSE); ATF_REQUIRE_EQ(issecure, ISC_FALSE);
ATF_REQUIRE_EQ(dns_keytable_issecuredomain(
keytable, str2name("sub.insecure.example"),
NULL, &issecure), ISC_R_SUCCESS);
ATF_REQUIRE_EQ(issecure, ISC_FALSE);
destroy_tables(); destroy_tables();
dns_test_end(); dns_test_end();
@@ -675,6 +667,11 @@ ATF_TC_BODY(nta, tc) {
ATF_CHECK(issecure); ATF_CHECK(issecure);
/* Now check deletion */ /* Now check deletion */
result = dns_view_issecuredomain(myview, str2name("test.new.example"),
now, ISC_TRUE, &issecure);
ATF_CHECK_EQ(result, ISC_R_SUCCESS);
ATF_CHECK(issecure);
result = dns_ntatable_add(ntatable, str2name("new.example"), result = dns_ntatable_add(ntatable, str2name("new.example"),
ISC_FALSE, now, 3600); ISC_FALSE, now, 3600);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS); ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);