Commit 2d227253 authored by Mark Andrews's avatar Mark Andrews
Browse files

4764. [bug] Address portability issues in cds system test.

                        [RT #46214]
parent 8c3ee6e6
4764. [bug] Address portability issues in cds system test.
[RT #46214]
4763. [contrib] Improve compatibility when building MySQL DLZ
module by using mysql_config if available.
[RT #45558]
......
......@@ -6,6 +6,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
while read glob
do rm -f $glob
done <.gitignore
rm -f CDNSKEY* CDS* DS*
rm -f K*
rm -f UP*
rm -f brk.*
rm -f db.*
rm -f dsset-*
rm -f empty
rm -f sig.*
rm -f vars.sh
rm -f err* out* xerr xout
......@@ -66,8 +66,16 @@ $mangle " IN DS $id1 8 1 " <DS.1 >DS.broke1
$mangle " IN DS $id1 8 2 " <DS.1 >DS.broke2
$mangle " IN DS $id1 8 [12] " <DS.1 >DS.broke12
sed 's/^/update add /;$a send' <DS.2 >UP.add2
sed 's/^/update del /;$a send' <DS.1 >UP.del1
sed 's/^/update add /
$a\
send
' <DS.2 >UP.add2
sed 's/^/update del /
$a\
send
' <DS.1 >UP.del1
cat UP.add2 UP.del1 | sed 3d >UP.swap
sed 's/ add \(.*\) IN DS / add \1 3600 IN DS /' <UP.swap >UP.swapttl
......
......@@ -6,231 +6,233 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
set -eu
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
status=0
die() {
n=0
fail() {
echo "I:failed"
status=1
status=`expr $status + 1`
}
runcmd() {
"$@" 1> out.$n 2> err.$n
echo $?
}
ck() {
local x=$1 die=:
testcase() {
n=`expr $n + 1`
echo "I:$name ($n)"
expect=$1
shift
echo "I:$name"
result=`"$@" > out 2> err; echo $?`
if [ "$x" -ne "$result" ]
then echo "D:exit status does not match $y"
die=die
result=`runcmd "$@"`
check_stdout
check_stderr
if [ "$expect" -ne "$result" ]; then
echo "D:exit status does not match $expect"
fail
fi
ckerr
ckout
$die
rm -f err out xerr xout
unset name err out
unset name err out
}
ckerr() {
if [ -n "${err:=}" ]
then egrep "$err" err >/dev/null &&
return 0
else [ -s err ] ||
return 0
check_stderr() {
if [ -n "${err:=}" ]; then
egrep "$err" err.$n >/dev/null && return 0
else
[ -s err.$n ] || return 0
fi
echo "D:stderr did not match '$err'"
sed 's/^/D:/' err
die=die
fail
}
ckout() {
cmp out "${out:-empty}" >/dev/null && return
check_stdout() {
cmp out.$n "${out:-empty}" >/dev/null && return
echo "D:stdout did not match '$out'"
( echo "wanted"
cat "$out"
echo "got"
cat out
cat out.$n
) | sed 's/^/D:/'
die=die
fail
}
Z=cds.test
name='usage'
err='Usage'
ck 1 $CDS
testcase 1 $CDS
name='need a DS file'
err='DS pathname'
ck 1 $CDS $Z
testcase 1 $CDS $Z
name='name of dsset in directory'
err="./dsset-$Z.: file not found"
ck 1 $CDS -d . $Z
testcase 1 $CDS -d . $Z
name='load a file'
err='could not find DS records'
ck 1 $CDS -d empty $Z
testcase 1 $CDS -d empty $Z
name='load DS records'
err='path to file containing child data must be specified'
ck 1 $CDS -d DS.1 $Z
testcase 1 $CDS -d DS.1 $Z
name='missing DNSKEY'
err='could not find signed DNSKEY RRset'
ck 1 $CDS -f db.null -d DS.1 $Z
testcase 1 $CDS -f db.null -d DS.1 $Z
name='sigs too old'
err='could not validate child DNSKEY RRset'
ck 1 $CDS -f sig.null -d DS.1 $Z
testcase 1 $CDS -f sig.null -d DS.1 $Z
name='sigs too old, verbosely'
err='skip RRSIG by key [0-9]+: too old'
ck 1 $CDS -v1 -f sig.null -d DS.1 $Z
testcase 1 $CDS -v1 -f sig.null -d DS.1 $Z
name='old sigs are allowed'
err='found RRSIG by key'
out=DS.1
ck 0 $CDS -v1 -s -7200 -f sig.null -d DS.1 $Z
testcase 0 $CDS -v1 -s -7200 -f sig.null -d DS.1 $Z
name='no CDS/CDNSKEY records'
out=DS.1
ck 0 $CDS -s -7200 -f sig.null -d DS.1 $Z
testcase 0 $CDS -s -7200 -f sig.null -d DS.1 $Z
name='no child records, verbosely'
err='has neither CDS nor CDNSKEY records'
out=DS.1
ck 0 $CDS -v1 -s -7200 -f sig.null -d DS.1 $Z
testcase 0 $CDS -v1 -s -7200 -f sig.null -d DS.1 $Z
name='unsigned CDS'
err='missing RRSIG CDS records'
ck 1 $CDS -f brk.unsigned-cds -d DS.1 $Z
testcase 1 $CDS -f brk.unsigned-cds -d DS.1 $Z
name='correct signature inception time'
$CDS -v3 -s -7200 -f sig.cds.1 -d DS.1 $Z 1>xout 2>xerr
ck 0 $PERL checktime.pl 3600 xerr
testcase 0 $PERL checktime.pl 3600 xerr
name='in-place reads modification time'
ck 0 $CDS -f sig.cds.1 -i.bak -d DS.inplace $Z
testcase 0 $CDS -f sig.cds.1 -i.bak -d DS.inplace $Z
name='in-place output correct modification time'
ck 0 $PERL checkmtime.pl 3600 DS.inplace
testcase 0 $PERL checkmtime.pl 3600 DS.inplace
name='in-place backup correct modification time'
ck 0 $PERL checkmtime.pl 7200 DS.inplace.bak
testcase 0 $PERL checkmtime.pl 7200 DS.inplace.bak
name='in-place correct output'
ck 0 cmp DS.1 DS.inplace
testcase 0 cmp DS.1 DS.inplace
name='in-place backup unmodified'
ck 0 cmp DS.1 DS.inplace.bak
testcase 0 cmp DS.1 DS.inplace.bak
name='one mangled DS'
err='found RRSIG by key'
out=DS.1
ck 0 $CDS -v1 -s -7200 -f sig.cds.1 -d DS.broke1 $Z
testcase 0 $CDS -v1 -s -7200 -f sig.cds.1 -d DS.broke1 $Z
name='other mangled DS'
err='found RRSIG by key'
out=DS.1
ck 0 $CDS -v1 -s -7200 -f sig.cds.1 -d DS.broke2 $Z
testcase 0 $CDS -v1 -s -7200 -f sig.cds.1 -d DS.broke2 $Z
name='both mangled DS'
err='could not validate child DNSKEY RRset'
ck 1 $CDS -v1 -s -7200 -f sig.cds.1 -d DS.broke12 $Z
testcase 1 $CDS -v1 -s -7200 -f sig.cds.1 -d DS.broke12 $Z
name='mangle RRSIG CDS by ZSK'
err='found RRSIG by key'
out=DS.1
ck 0 $CDS -v1 -s -7200 -f brk.rrsig.cds.zsk -d DS.1 $Z
testcase 0 $CDS -v1 -s -7200 -f brk.rrsig.cds.zsk -d DS.1 $Z
name='mangle RRSIG CDS by KSK'
err='could not validate child CDS RRset'
ck 1 $CDS -v1 -s -7200 -f brk.rrsig.cds.ksk -d DS.1 $Z
testcase 1 $CDS -v1 -s -7200 -f brk.rrsig.cds.ksk -d DS.1 $Z
name='mangle CDS 1'
err='could not validate child DNSKEY RRset with new DS records'
ck 1 $CDS -s -7200 -f sig.cds-mangled -d DS.1 $Z
testcase 1 $CDS -s -7200 -f sig.cds-mangled -d DS.1 $Z
name='inconsistent digests'
err='do not cover each key with the same set of digest types'
ck 1 $CDS -s -7200 -f sig.bad-digests -d DS.1 $Z
testcase 1 $CDS -s -7200 -f sig.bad-digests -d DS.1 $Z
name='inconsistent algorithms'
err='missing signature for algorithm'
ck 1 $CDS -s -7200 -f sig.bad-algos -d DS.1 $Z
testcase 1 $CDS -s -7200 -f sig.bad-algos -d DS.1 $Z
name='add DS records'
out=DS.both
$CDS -s -7200 -f sig.cds.both -d DS.1 $Z >DS.out
# sort to allow for numerical vs lexical order of key tags
ck 0 sort DS.out
testcase 0 sort DS.out
name='update add'
out=UP.add2
ck 0 $CDS -u -s -7200 -f sig.cds.both -d DS.1 $Z
testcase 0 $CDS -u -s -7200 -f sig.cds.both -d DS.1 $Z
name='remove DS records'
out=DS.2
ck 0 $CDS -s -7200 -f sig.cds.2 -d DS.both $Z
testcase 0 $CDS -s -7200 -f sig.cds.2 -d DS.both $Z
name='update del'
out=UP.del1
ck 0 $CDS -u -s -7200 -f sig.cds.2 -d DS.both $Z
testcase 0 $CDS -u -s -7200 -f sig.cds.2 -d DS.both $Z
name='swap DS records'
out=DS.2
ck 0 $CDS -s -7200 -f sig.cds.2 -d DS.1 $Z
testcase 0 $CDS -s -7200 -f sig.cds.2 -d DS.1 $Z
name='update swap'
out=UP.swap
ck 0 $CDS -u -s -7200 -f sig.cds.2 -d DS.1 $Z
testcase 0 $CDS -u -s -7200 -f sig.cds.2 -d DS.1 $Z
name='TTL from -T'
out=DS.ttl2
ck 0 $CDS -T 3600 -s -7200 -f sig.cds.2 -d DS.1 $Z
testcase 0 $CDS -T 3600 -s -7200 -f sig.cds.2 -d DS.1 $Z
name='update TTL from -T'
out=UP.swapttl
ck 0 $CDS -u -T 3600 -s -7200 -f sig.cds.2 -d DS.1 $Z
testcase 0 $CDS -u -T 3600 -s -7200 -f sig.cds.2 -d DS.1 $Z
name='update TTL from dsset'
out=UP.swapttl
ck 0 $CDS -u -s -7200 -f sig.cds.2 -d DS.ttl1 $Z
testcase 0 $CDS -u -s -7200 -f sig.cds.2 -d DS.ttl1 $Z
name='TTL from -T overrides dsset'
out=DS.ttlong2
ck 0 $CDS -T 7200 -s -7200 -f sig.cds.2 -d DS.ttl1 $Z
testcase 0 $CDS -T 7200 -s -7200 -f sig.cds.2 -d DS.ttl1 $Z
name='stable DS record order (changes)'
out=DS.1
ck 0 $CDS -s -7200 -f sig.cds.rev1 -d DS.2 $Z
testcase 0 $CDS -s -7200 -f sig.cds.rev1 -d DS.2 $Z
name='CDNSKEY default algorithm'
out=DS.2-2
ck 0 $CDS -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
testcase 0 $CDS -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
name='CDNSKEY SHA1'
out=DS.2-1
ck 0 $CDS -a SHA1 -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
testcase 0 $CDS -a SHA1 -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
name='CDNSKEY two algorithms'
out=DS.2
ck 0 $CDS -a SHA1 -a SHA256 -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
testcase 0 $CDS -a SHA1 -a SHA256 -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
name='CDNSKEY two algorithms, reversed'
out=DS.2
ck 0 $CDS -a SHA256 -a SHA1 -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
testcase 0 $CDS -a SHA256 -a SHA1 -s -7200 -f sig.cdnskey.2 -d DS.1 $Z
name='CDNSKEY and CDS'
out=DS.2
ck 0 $CDS -s -7200 -f sig.cds.cdnskey.2 -d DS.1 $Z
testcase 0 $CDS -s -7200 -f sig.cds.cdnskey.2 -d DS.1 $Z
name='prefer CDNSKEY'
out=DS.2-2
ck 0 $CDS -D -s -7200 -f sig.cds.cdnskey.2 -d DS.1 $Z
testcase 0 $CDS -D -s -7200 -f sig.cds.cdnskey.2 -d DS.1 $Z
echo "I:exit status: 0"
exit $status
echo "I:exit status: $status"
[ $status -eq 0 ] || exit 1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment