WEBDIENSTE/NLnetLabs-dnst
1
0
Fork 0
mirror of https://github.com/NLnetLabs/dnst.git synced 2026-09-10 03:47:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken nsec3-hash integration test, and update ldns=nsec3-hash to also use 0 iterations by default (which makes it now inconsistent with main so this may be revisited later).

Browse Source
This commit is contained in:
Ximon Eighteen
2024-12-05 11:28:50 +01:00
parent 16a9f5aa98
commit 5fbfd6183c
2 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/commands/nsec3hash.rs
+1 -1
View File
@@ -67,7 +67,7 @@ impl LdnsCommand for Nsec3Hash {
fn parse_ldns<I: IntoIterator<Item = OsString>>(args: I) -> Result<Args, Error> {
let mut algorithm = Nsec3HashAlg::SHA1;
let mut iterations = 1;
let mut iterations = 0;
let mut salt = Nsec3Salt::empty();
let mut name = None;
tests/nsec3hash.rs
+17 -35
View File
@@ -2,8 +2,7 @@ mod common;
use common::assert_org_ldns_cmd_eq_new_ldns_cmd;
const LDNS_NSEC3_CMD: &str = "ldns-nsec3-hash";
const DNST_NSEC3_SUBCMD: &str = "nsec3-hash";
const LDNS_CMD: &str = "ldns-nsec3-hash";
const TEST_ZONE_NAME: &str = "nlnetlabs.nl";
#[ignore = "should only be run if ldns command line tools are installed"]
@@ -12,46 +11,39 @@ fn nsec3_hash() {
// Note: ldns-nsec3-hash defaults NSEC3 iterations to 1, while dnst
// nsec-hash defaults NSEC3 iterations to 0.
assert_org_ldns_cmd_eq_new_ldns_cmd(
&[LDNS_NSEC3_CMD, TEST_ZONE_NAME],
&[DNST_NSEC3_SUBCMD, "--iterations", "1", TEST_ZONE_NAME],
&[LDNS_CMD, TEST_ZONE_NAME],
&[LDNS_CMD, "-t", "1", TEST_ZONE_NAME],
true,
);
assert_org_ldns_cmd_eq_new_ldns_cmd(
&[LDNS_NSEC3_CMD, TEST_ZONE_NAME, "-t", "0"],
&[DNST_NSEC3_SUBCMD, TEST_ZONE_NAME],
&[LDNS_CMD, TEST_ZONE_NAME, "-t", "0"],
&[LDNS_CMD, TEST_ZONE_NAME],
true,
);
assert_org_ldns_cmd_eq_new_ldns_cmd(
&[LDNS_NSEC3_CMD, "-a", "1", TEST_ZONE_NAME],
&[LDNS_CMD, "-a", "1", TEST_ZONE_NAME],
&[
DNST_NSEC3_SUBCMD,
"--iterations",
LDNS_CMD,
"-t",
"1",
"--algorithm",
"-a",
"1",
TEST_ZONE_NAME,
],
true,
);
assert_org_ldns_cmd_eq_new_ldns_cmd(
&[LDNS_NSEC3_CMD, "-s", "", TEST_ZONE_NAME],
&[
DNST_NSEC3_SUBCMD,
"--iterations",
"1",
"--salt",
"",
TEST_ZONE_NAME,
],
&[LDNS_CMD, "-s", "", TEST_ZONE_NAME],
&[LDNS_CMD, "-t", "1", "-s", "", TEST_ZONE_NAME],
true,
);
assert_org_ldns_cmd_eq_new_ldns_cmd(
&[LDNS_NSEC3_CMD, "-s", "DEADBEEF", TEST_ZONE_NAME],
&[LDNS_CMD, "-s", "DEADBEEF", TEST_ZONE_NAME],
&[
DNST_NSEC3_SUBCMD,
"--iterations",
LDNS_CMD,
"-t",
"1",
"--salt",
"-s",
"DEADBEEF",
TEST_ZONE_NAME,
],
@@ -60,18 +52,8 @@ fn nsec3_hash() {
for iterations in 0..10 {
assert_org_ldns_cmd_eq_new_ldns_cmd(
&[
LDNS_NSEC3_CMD,
"-t",
&iterations.to_string(),
TEST_ZONE_NAME,
],
&[
DNST_NSEC3_SUBCMD,
"-i",
&iterations.to_string(),
TEST_ZONE_NAME,
],
&[LDNS_CMD, "-t", &iterations.to_string(), TEST_ZONE_NAME],
&[LDNS_CMD, "-t", &iterations.to_string(), TEST_ZONE_NAME],
true,
);
}