You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
2.0 KiB
53 lines
2.0 KiB
4 weeks ago
|
From e91ab7758bed0cf3dcf8ed745f91063d7ec4011c Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
|
||
|
|
Date: Thu, 4 Jan 2024 13:39:27 +0100
|
||
|
|
Subject: [PATCH] Fix map offsets in the "masterformat" system test
|
||
|
|
|
||
|
|
The "masterformat" system test attempts to check named-checkzone
|
||
|
|
behavior when it is fed corrupt map-format zone files. However, despite
|
||
|
|
the RBTDB and RBT structures having evolved over the years, the offsets
|
||
|
|
at which a valid map-format zone file is malformed by the "masterformat"
|
||
|
|
test have not been updated accordingly, causing the relevant checks to
|
||
|
|
introduce a different type of corruption than they were originally meant
|
||
|
|
to cause:
|
||
|
|
|
||
|
|
- the "bad node header" check originally mangled the 'type' member of
|
||
|
|
the rdatasetheader_t structure for cname.example.nil,
|
||
|
|
|
||
|
|
- the "bad node data" check originally mangled the 'serial' and
|
||
|
|
'rdh_ttl' members of the rdatasetheader_t structure for
|
||
|
|
aaaa.example.nil.
|
||
|
|
|
||
|
|
Update the offsets at which the map-format zone file is malformed at by
|
||
|
|
the "masterformat" system test so that the relevant checks fulfill their
|
||
|
|
original purpose again.
|
||
|
|
---
|
||
|
|
bin/tests/system/masterformat/tests.sh | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
|
||
|
|
index 364a0d2..bb4e6ec 100755
|
||
|
|
--- a/bin/tests/system/masterformat/tests.sh
|
||
|
|
+++ b/bin/tests/system/masterformat/tests.sh
|
||
|
|
@@ -295,7 +295,7 @@ status=$((status+ret))
|
||
|
|
echo_i "checking corrupt map files fail to load (bad node header) ($n)"
|
||
|
|
ret=0
|
||
|
|
cp map.5 badmap
|
||
|
|
-stomp badmap 2754 2 99
|
||
|
|
+stomp badmap 3706 2 99
|
||
|
|
$CHECKZONE -D -f map -F text -o text.5 example.nil badmap > /dev/null
|
||
|
|
[ $? = 1 ] || ret=1
|
||
|
|
n=$((n+1))
|
||
|
|
@@ -305,7 +305,7 @@ status=$((status+ret))
|
||
|
|
echo_i "checking corrupt map files fail to load (bad node data) ($n)"
|
||
|
|
ret=0
|
||
|
|
cp map.5 badmap
|
||
|
|
-stomp badmap 2897 5 127
|
||
|
|
+stomp badmap 3137 5 127
|
||
|
|
$CHECKZONE -D -f map -F text -o text.5 example.nil badmap > /dev/null
|
||
|
|
[ $? = 1 ] || ret=1
|
||
|
|
n=$((n+1))
|
||
|
|
--
|
||
|
|
2.44.0
|
||
|
|
|