Merge branch '367-dnssec-system-test-failing' into 'master'

Resolve "dnssec system test failing"

Closes #367

See merge request isc-projects/bind9!438
This commit is contained in:
Ondřej Surý 2018-06-27 07:35:32 -04:00
commit 45722aa4f7
2 changed files with 9 additions and 2 deletions

View file

@ -13,6 +13,7 @@ zone "siginterval.example" {
type master;
allow-update { any; };
sig-validity-interval 1 23;
dnskey-sig-validity 90;
auto-dnssec maintain;
file "siginterval.example.db";
};

View file

@ -3035,8 +3035,14 @@ if [ -x "$PYTHON" ]; then
# convert expiry date to a comma-separated list of integers python can
# use as input to date(). strip leading 0s in months and days so
# python3 will recognize them as integers.
soaexpire=`$DIG +dnssec +short -p ${PORT} @10.53.0.3 soa siginterval.example | awk '$1 ~ /SOA/ { print $5 }' | sed 's/\(....\)\(..\)\(..\).*/\1, \2, \3/' | sed 's/ 0/ /g'`
dnskeyexpire=`$DIG +dnssec +short -p ${PORT} @10.53.0.3 dnskey siginterval.example | awk '$1 ~ /DNSKEY/ { print $5; exit 0 }' | sed 's/\(....\)\(..\)\(..\).*/\1, \2, \3/' | sed 's/ 0/ /g'`
$DIG +dnssec +short -p ${PORT} @10.53.0.3 soa siginterval.example > dig.out.soa.test$n
soaexpire=`awk '$1 ~ /SOA/ { print $5 }' dig.out.soa.test$n |
sed 's/\(....\)\(..\)\(..\).*/\1, \2, \3/' |
sed 's/ 0/ /g'`
$DIG +dnssec +short -p ${PORT} @10.53.0.3 dnskey siginterval.example > dig.out.dnskey.test$n
dnskeyexpire=`awk '$1 ~ /DNSKEY/ { print $5; exit 0 }' dig.out.dnskey.test$n |
sed 's/\(....\)\(..\)\(..\).*/\1, \2, \3/' |
sed 's/ 0/ /g'`
$PYTHON > python.out.$n <<EOF
from datetime import date;
ke=date($dnskeyexpire)