mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-29 21:47:59 +00:00
Remove kasp shell script remainders
Now that all tests have been converted, we can remove 'kasp/tests.sh' and 'kasp/tests_sh_kasp.py'. (cherry picked from commit 6994a604a7943cccfb60d62a0a38ce8fa8f0e8ed)
This commit is contained in:
Matthijs Mekking
parent
383605c902
commit
546fdb9c20
@ -1,89 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: MPL-2.0
|
|
||||||
#
|
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
#
|
|
||||||
# See the COPYRIGHT file distributed with this work for additional
|
|
||||||
# information regarding copyright ownership.
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
# shellcheck source=conf.sh
|
|
||||||
. ../conf.sh
|
|
||||||
# shellcheck source=kasp.sh
|
|
||||||
. ../kasp.sh
|
|
||||||
|
|
||||||
start_time="$(TZ=UTC date +%s)"
|
|
||||||
status=0
|
|
||||||
n=0
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# Utilities #
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
# Call dig with default options.
|
|
||||||
dig_with_opts() {
|
|
||||||
|
|
||||||
if [ -n "$TSIG" ]; then
|
|
||||||
"$DIG" +tcp +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" -y "$TSIG" "$@"
|
|
||||||
else
|
|
||||||
"$DIG" +tcp +noadd +nosea +nostat +nocmd +dnssec -p "$PORT" "$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# RNDC.
|
|
||||||
rndccmd() {
|
|
||||||
"$RNDC" -c ../_common/rndc.conf -p "$CONTROLPORT" -s "$@"
|
|
||||||
}
|
|
||||||
|
|
||||||
# Log error and increment failure rate.
|
|
||||||
log_error() {
|
|
||||||
echo_i "error: $1"
|
|
||||||
ret=$((ret + 1))
|
|
||||||
}
|
|
||||||
|
|
||||||
# Default next key event threshold. May be extended by wait periods.
|
|
||||||
next_key_event_threshold=100
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
# Tests #
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
#
|
|
||||||
# named
|
|
||||||
#
|
|
||||||
|
|
||||||
# The NSEC record at the apex of the zone and its RRSIG records are
|
|
||||||
# added as part of the last step in signing a zone. We wait for the
|
|
||||||
# NSEC records to appear before proceeding with a counter to prevent
|
|
||||||
# infinite loops if there is an error.
|
|
||||||
n=$((n + 1))
|
|
||||||
echo_i "waiting for kasp signing changes to take effect ($n)"
|
|
||||||
ret=0
|
|
||||||
|
|
||||||
_wait_for_done_apexnsec() {
|
|
||||||
while read -r zone; do
|
|
||||||
dig_with_opts "$zone" @10.53.0.3 nsec >"dig.out.ns3.test$n.$zone" || return 1
|
|
||||||
grep "NS SOA" "dig.out.ns3.test$n.$zone" >/dev/null || return 1
|
|
||||||
grep "$zone\..*IN.*RRSIG" "dig.out.ns3.test$n.$zone" >/dev/null || return 1
|
|
||||||
done <ns3/zones
|
|
||||||
|
|
||||||
while read -r zone; do
|
|
||||||
dig_with_opts "$zone" @10.53.0.6 nsec >"dig.out.ns6.test$n.$zone" || return 1
|
|
||||||
grep "NS SOA" "dig.out.ns6.test$n.$zone" >/dev/null || return 1
|
|
||||||
grep "$zone\..*IN.*RRSIG" "dig.out.ns6.test$n.$zone" >/dev/null || return 1
|
|
||||||
done <ns6/zones
|
|
||||||
|
|
||||||
return 0
|
|
||||||
}
|
|
||||||
retry_quiet 30 _wait_for_done_apexnsec || ret=1
|
|
||||||
test "$ret" -eq 0 || echo_i "failed"
|
|
||||||
status=$((status + ret))
|
|
||||||
|
|
||||||
echo_i "exit status: $status"
|
|
||||||
[ $status -eq 0 ] || exit 1
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: MPL-2.0
|
|
||||||
#
|
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
# file, you can obtain one at https://mozilla.org/MPL/2.0/.
|
|
||||||
#
|
|
||||||
# See the COPYRIGHT file distributed with this work for additional
|
|
||||||
# information regarding copyright ownership.
|
|
||||||
|
|
||||||
import pytest
|
|
||||||
|
|
||||||
pytestmark = pytest.mark.extra_artifacts(
|
|
||||||
[
|
|
||||||
"K*.private",
|
|
||||||
"K*.key",
|
|
||||||
"K*.state",
|
|
||||||
"K*.cmp",
|
|
||||||
"*.created",
|
|
||||||
"dig.out*",
|
|
||||||
"keyevent.out.*",
|
|
||||||
"keygen.out.*",
|
|
||||||
"keys",
|
|
||||||
"published.test*",
|
|
||||||
"python.out.*",
|
|
||||||
"retired.test*",
|
|
||||||
"rndc.dnssec.*.out.*",
|
|
||||||
"rndc.zonestatus.out.*",
|
|
||||||
"rrsig.out.*",
|
|
||||||
"created.key-*",
|
|
||||||
"unused.key-*",
|
|
||||||
"verify.out.*",
|
|
||||||
"zone.out.*",
|
|
||||||
"ns*/K*.private",
|
|
||||||
"ns*/K*.key",
|
|
||||||
"ns*/K*.state",
|
|
||||||
"ns*/*.db",
|
|
||||||
"ns*/*.db.infile",
|
|
||||||
"ns*/*.db.signed",
|
|
||||||
"ns*/*.jbk",
|
|
||||||
"ns*/*.jnl",
|
|
||||||
"ns*/dsset-*",
|
|
||||||
"ns*/keygen.out.*",
|
|
||||||
"ns*/keys",
|
|
||||||
"ns*/ksk",
|
|
||||||
"ns*/ksk/K*",
|
|
||||||
"ns*/zsk",
|
|
||||||
"ns*/zsk",
|
|
||||||
"ns*/zsk/K*",
|
|
||||||
"ns*/named-fips.conf",
|
|
||||||
"ns*/settime.out.*",
|
|
||||||
"ns*/signer.out.*",
|
|
||||||
"ns*/zones",
|
|
||||||
"ns*/policies/*.conf",
|
|
||||||
"ns*/*.zsk1",
|
|
||||||
"ns*/*.zsk2",
|
|
||||||
"ns3/legacy-keys.*",
|
|
||||||
"ns3/dynamic-signed-inline-signing.kasp.db.signed.signed",
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_kasp(run_tests_sh):
|
|
||||||
run_tests_sh()
|
|
||||||
Loading…
x
Reference in New Issue
Block a user