]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
rollover-csk-roll1: From setup.sh to pytest bootstrap
authorMatthijs Mekking <matthijs@isc.org>
Thu, 27 Nov 2025 13:01:28 +0000 (14:01 +0100)
committerMatthijs Mekking <matthijs@isc.org>
Fri, 19 Dec 2025 10:47:50 +0000 (11:47 +0100)
Symlink ns1 and ns2 to rollover/ns1 and rollover/ns2.
Symlink ns3/template.db.j2.manual to rollover/ns3/template.db.j2.manual.

Since the bootstrapping is done before the templates are rendered
automatically, replace @DEFAULT_ALGORITHM@ in ns3/kasp.conf.j2 to
ecdsa256 and rename to ns3/kasp.conf.

Write a python method to set the key predecessor/successor relationship
into the key state files.

bin/tests/system/rollover-csk-roll1/ns1 [new symlink]
bin/tests/system/rollover-csk-roll1/ns2 [new symlink]
bin/tests/system/rollover-csk-roll1/ns3/kasp.conf [moved from bin/tests/system/rollover-csk-roll1/ns3/kasp.conf.j2 with 90% similarity]
bin/tests/system/rollover-csk-roll1/ns3/template.db.in [deleted symlink]
bin/tests/system/rollover-csk-roll1/ns3/template.db.j2.manual [new symlink]
bin/tests/system/rollover-csk-roll1/ns3/trusted.conf.j2 [new symlink]
bin/tests/system/rollover-csk-roll1/setup.sh [deleted file]
bin/tests/system/rollover-csk-roll1/tests_rollover_csk_roll1.py
bin/tests/system/rollover/setup.py

diff --git a/bin/tests/system/rollover-csk-roll1/ns1 b/bin/tests/system/rollover-csk-roll1/ns1
new file mode 120000 (symlink)
index 0000000..76608be
--- /dev/null
@@ -0,0 +1 @@
+../rollover/ns1
\ No newline at end of file
diff --git a/bin/tests/system/rollover-csk-roll1/ns2 b/bin/tests/system/rollover-csk-roll1/ns2
new file mode 120000 (symlink)
index 0000000..41a09bb
--- /dev/null
@@ -0,0 +1 @@
+../rollover/ns2
\ No newline at end of file
similarity index 90%
rename from bin/tests/system/rollover-csk-roll1/ns3/kasp.conf.j2
rename to bin/tests/system/rollover-csk-roll1/ns3/kasp.conf
index e6defeded2403f7d124fb6d71ea20c1aaaff1be6..09b0e862b6c02adfdeccd9c88db27f1837acaf90 100644 (file)
@@ -23,7 +23,7 @@ dnssec-policy "csk-roll1-autosign" {
 
        cds-digest-types { "sha-384"; }; // use a different digest type for testing purposes
        keys {
-               csk key-directory lifetime P6M algorithm @DEFAULT_ALGORITHM@;
+               csk key-directory lifetime P6M algorithm ecdsa256;
        };
 
        zone-propagation-delay 1h;
@@ -47,7 +47,7 @@ dnssec-policy "csk-roll1-manual" {
 
        cds-digest-types { "sha-384"; }; // use a different digest type for testing purposes
        keys {
-               csk key-directory lifetime P6M algorithm @DEFAULT_ALGORITHM@;
+               csk key-directory lifetime P6M algorithm ecdsa256;
        };
 
        zone-propagation-delay 1h;
diff --git a/bin/tests/system/rollover-csk-roll1/ns3/template.db.in b/bin/tests/system/rollover-csk-roll1/ns3/template.db.in
deleted file mode 120000 (symlink)
index ce6d526..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../rollover/ns3/template.db.in
\ No newline at end of file
diff --git a/bin/tests/system/rollover-csk-roll1/ns3/template.db.j2.manual b/bin/tests/system/rollover-csk-roll1/ns3/template.db.j2.manual
new file mode 120000 (symlink)
index 0000000..38619a0
--- /dev/null
@@ -0,0 +1 @@
+../../rollover/ns3/template.db.j2.manual
\ No newline at end of file
diff --git a/bin/tests/system/rollover-csk-roll1/ns3/trusted.conf.j2 b/bin/tests/system/rollover-csk-roll1/ns3/trusted.conf.j2
new file mode 120000 (symlink)
index 0000000..cb0be77
--- /dev/null
@@ -0,0 +1 @@
+../../_common/trusted.conf.j2
\ No newline at end of file
diff --git a/bin/tests/system/rollover-csk-roll1/setup.sh b/bin/tests/system/rollover-csk-roll1/setup.sh
deleted file mode 100644 (file)
index 088add4..0000000
+++ /dev/null
@@ -1,314 +0,0 @@
-#!/bin/sh -e
-
-# 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.
-
-# shellcheck source=conf.sh
-. ../conf.sh
-
-cd "ns3"
-
-setup() {
-  zone="$1"
-  echo_i "setting up zone: $zone"
-  zonefile="${zone}.db"
-  infile="${zone}.db.infile"
-  echo "$zone" >>zones
-}
-
-# Set in the key state files the Predecessor/Successor fields.
-# Key $1 is the predecessor of key $2.
-key_successor() {
-  id1=$(keyfile_to_key_id "$1")
-  id2=$(keyfile_to_key_id "$2")
-  echo "Predecessor: ${id1}" >>"${2}.state"
-  echo "Successor: ${id2}" >>"${1}.state"
-}
-
-# Make lines shorter by storing key states in environment variables.
-H="HIDDEN"
-R="RUMOURED"
-O="OMNIPRESENT"
-U="UNRETENTIVE"
-
-#
-# The zones at csk-roll1.$tld represent the various steps of a CSK rollover
-# (which is essentially a ZSK Pre-Publication / KSK Double-KSK rollover).
-#
-
-for tld in autosign manual; do
-  # Step 1:
-  # Introduce the first key. This will immediately be active.
-  setup step1.csk-roll1.$tld
-  TactN="now-7d"
-  keytimes="-P ${TactN} -A ${TactN}"
-  CSK=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  $SETTIME -s -g $O -k $O $TactN -r $O $TactN -d $O $TactN -z $O $TactN "$CSK" >settime.out.$zone.1 2>&1
-  cat template.db.in "${CSK}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 2:
-  # It is time to introduce the new CSK.
-  setup step2.csk-roll1.$tld
-  # According to RFC 7583:
-  # KSK: Tpub(N+1) <= Tact(N) + Lksk - IpubC
-  # ZSK: Tpub(N+1) <= Tact(N) + Lzsk - Ipub
-  # IpubC = DprpC + TTLkey (+publish-safety)
-  # Ipub  = IpubC
-  # Lcsk = Lksk = Lzsk
-  #
-  # Lcsk:           6mo (186d, 4464h)
-  # Dreg:           N/A
-  # DprpC:          1h
-  # TTLkey:         1h
-  # publish-safety: 1h
-  # Ipub:           3h
-  #
-  # Tact(N) = now - Lcsk + Ipub = now - 186d + 3h
-  #         = now - 4464h + 3h  = now - 4461h
-  TactN="now-4461h"
-  keytimes="-P ${TactN} -A ${TactN}"
-  CSK=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  $SETTIME -s -g $O -k $O $TactN -r $O $TactN -d $O $TactN -z $O $TactN "$CSK" >settime.out.$zone.1 2>&1
-  cat template.db.in "${CSK}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 3:
-  # It is time to submit the DS and to roll signatures.
-  setup step3.csk-roll1.$tld
-  # According to RFC 7583:
-  #
-  # Tsbm(N+1) >= Trdy(N+1)
-  # KSK: Tact(N+1) = Tsbm(N+1)
-  # ZSK: Tact(N+1) = Tpub(N+1) + Ipub = Tsbm(N+1)
-  # KSK: Iret  = DprpP + TTLds (+retire-safety)
-  # ZSK: IretZ = Dsgn + Dprp + TTLsig (+retire-safety)
-  #
-  # Lcsk:           186d
-  # Dprp:           1h
-  # DprpP:          1h
-  # Dreg:           N/A
-  # Dsgn:           25d
-  # TTLds:          1h
-  # TTLsig:         1d
-  # retire-safety:  2h
-  # Iret:           4h
-  # IretZ:          26d3h
-  # Ipub:           3h
-  #
-  # Tpub(N)   = now - Lcsk = now - 186d
-  # Tact(N)   = now - Lcsk + Dprp + TTLsig = now - 4439h
-  # Tret(N)   = now
-  # Trem(N)   = now + IretZ = now + 26d3h = now + 627h
-  # Tpub(N+1) = now - Ipub = now - 3h
-  # Tact(N+1) = Tret(N)
-  # Tret(N+1) = now + Lcsk = now + 186d = now + 186d
-  # Trem(N+1) = now + Lcsk + IretZ = now + 186d + 26d3h =
-  #           = now + 5091h
-  TpubN="now-186d"
-  TactN="now-4439h"
-  TretN="now"
-  TremN="now+627h"
-  TpubN1="now-3h"
-  TactN1="${TretN}"
-  TretN1="now+186d"
-  TremN1="now+5091h"
-  keytimes="-P ${TpubN}  -P sync ${TactN}  -A ${TpubN}  -I ${TretN}  -D ${TremN} -D sync ${TactN1}"
-  newtimes="-P ${TpubN1} -P sync ${TactN1} -A ${TactN1} -I ${TretN1} -D ${TremN1}"
-  CSK1=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  CSK2=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $newtimes $zone 2>keygen.out.$zone.2)
-  $SETTIME -s -g $H -k $O $TactN -r $O $TactN -d $O $TactN -z $O $TactN "$CSK1" >settime.out.$zone.1 2>&1
-  $SETTIME -s -g $O -k $R $TpubN1 -r $R $TpubN1 -d $H $TpubN1 -z $H $TpubN1 "$CSK2" >settime.out.$zone.2 2>&1
-  # Set key rollover relationship.
-  key_successor $CSK1 $CSK2
-  # Sign zone.
-  cat template.db.in "${CSK1}.key" "${CSK2}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK1" >>"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK2" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 4:
-  # Some time later all the ZRRSIG records should be from the new CSK, and the
-  # DS should be swapped.  The ZRRSIG records are all replaced after IretZ
-  # (which is 26d3h).  The DS is swapped after Iret (which is 4h).
-  # In other words, the DS is swapped before all zone signatures are replaced.
-  setup step4.csk-roll1.$tld
-  # According to RFC 7583:
-  # Trem(N)    = Tret(N) - Iret + IretZ
-  # now       = Tsbm(N+1) + Iret
-  #
-  # Lcsk:   186d
-  # Iret:   4h
-  # IretZ:  26d3h
-  #
-  # Tpub(N)   = now - Iret - Lcsk = now - 4h - 186d = now - 4468h
-  # Tret(N)   = now - Iret = now - 4h = now - 4h
-  # Trem(N)   = now - Iret + IretZ = now - 4h + 26d3h
-  #           = now + 623h
-  # Tpub(N+1) = now - Iret - IpubC = now - 4h - 3h = now - 7h
-  # Tact(N+1) = Tret(N)
-  # Tret(N+1) = now - Iret + Lcsk = now - 4h + 186d = now + 4460h
-  # Trem(N+1) = now - Iret + Lcsk + IretZ = now - 4h + 186d + 26d3h
-  #           = now + 5087h
-  TpubN="now-4468h"
-  TactN="now-4443h"
-  TretN="now-4h"
-  TremN="now+623h"
-  TpubN1="now-7h"
-  TactN1="${TretN}"
-  TretN1="now+4460h"
-  TremN1="now+5087h"
-  keytimes="-P ${TpubN}  -P sync ${TactN}  -A ${TpubN}  -I ${TretN}  -D ${TremN} -D sync ${TactN1}"
-  newtimes="-P ${TpubN1} -P sync ${TactN1} -A ${TactN1} -I ${TretN1} -D ${TremN1}"
-  CSK1=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  CSK2=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $newtimes $zone 2>keygen.out.$zone.2)
-  $SETTIME -s -g $H -k $O $TactN -r $O $TactN -d $U $TactN1 -z $U $TactN1 -D ds $TactN1 "$CSK1" >settime.out.$zone.1 2>&1
-  $SETTIME -s -g $O -k $O $TactN1 -r $O $TactN1 -d $R $TactN1 -z $R $TactN1 -P ds $TactN1 "$CSK2" >settime.out.$zone.2 2>&1
-  # Set key rollover relationship.
-  key_successor $CSK1 $CSK2
-  # Sign zone.
-  cat template.db.in "${CSK1}.key" "${CSK2}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK1" >>"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK2" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 5:
-  # After the DS is swapped in step 4, also the KRRSIG records can be removed.
-  # At this time these have all become hidden.
-  setup step5.csk-roll1.$tld
-  # Subtract DNSKEY TTL plus zone propagation delay from all the times (2h).
-  TpubN="now-4470h"
-  TactN="now-4445h"
-  TretN="now-6h"
-  TremN="now+621h"
-  TpubN1="now-9h"
-  TactN1="${TretN}"
-  TretN1="now+4458h"
-  TremN1="now+5085h"
-  keytimes="-P ${TpubN}  -P sync ${TactN}  -A ${TpubN}  -I ${TretN}  -D ${TremN} -D sync ${TactN1}"
-  newtimes="-P ${TpubN1} -P sync ${TactN1} -A ${TactN1} -I ${TretN1} -D ${TremN1}"
-  CSK1=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  CSK2=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $newtimes $zone 2>keygen.out.$zone.2)
-  $SETTIME -s -g $H -k $O $TactN -r $U now-2h -d $H now-2h -z $U $TactN1 "$CSK1" >settime.out.$zone.1 2>&1
-  $SETTIME -s -g $O -k $O $TactN1 -r $O $TactN1 -d $O now-2h -z $R $TactN1 "$CSK2" >settime.out.$zone.2 2>&1
-  # Set key rollover relationship.
-  key_successor $CSK1 $CSK2
-  # Sign zone.
-  cat template.db.in "${CSK1}.key" "${CSK2}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK1" >>"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK2" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 6:
-  # After the retire interval has passed the predecessor DNSKEY can be
-  # removed from the zone.
-  setup step6.csk-roll1.$tld
-  # According to RFC 7583:
-  # Trem(N) = Tret(N) + IretZ
-  # Tret(N) = Tact(N) + Lcsk
-  #
-  # Lcsk:   186d
-  # Iret:   4h
-  # IretZ:  26d3h
-  #
-  # Tpub(N)   = now - IretZ - Lcsk = now - 627h - 186d
-  #           = now - 627h - 4464h = now - 5091h
-  # Tact(N)   = now - 627h - 186d
-  # Tret(N)   = now - IretZ = now - 627h
-  # Trem(N)   = now
-  # Tpub(N+1) = now - IretZ - Ipub = now - 627h - 3h = now - 630h
-  # Tact(N+1) = Tret(N)
-  # Tret(N+1) = now - IretZ + Lcsk = now - 627h + 186d = now + 3837h
-  # Trem(N+1) = now + Lcsk = now + 186d
-  TpubN="now-5091h"
-  TactN="now-5066h"
-  TretN="now-627h"
-  TremN="now"
-  TpubN1="now-630h"
-  TactN1="${TretN}"
-  TretN1="now+3837h"
-  TremN1="now+186d"
-  keytimes="-P ${TpubN}  -P sync ${TactN}  -A ${TpubN}  -I ${TretN}  -D ${TremN} -D sync ${TactN1}"
-  newtimes="-P ${TpubN1} -P sync ${TactN1} -A ${TactN1} -I ${TretN1} -D ${TremN1}"
-  CSK1=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  CSK2=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $newtimes $zone 2>keygen.out.$zone.2)
-  $SETTIME -s -g $H -k $O $TactN -r $H $TremN -d $H $TremN -z $U $TactN1 "$CSK1" >settime.out.$zone.1 2>&1
-  $SETTIME -s -g $O -k $O $TactN1 -r $O $TactN1 -d $O $TremN -z $R $TactN1 "$CSK2" >settime.out.$zone.2 2>&1
-  # Set key rollover relationship.
-  key_successor $CSK1 $CSK2
-  # Sign zone.
-  cat template.db.in "${CSK1}.key" "${CSK2}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK1" >>"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK2" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 7:
-  # Some time later the predecessor DNSKEY enters the HIDDEN state.
-  setup step7.csk-roll1.$tld
-  # Subtract DNSKEY TTL plus zone propagation delay from all the times (2h).
-  TpubN="now-5093h"
-  TactN="now-5068h"
-  TretN="now-629h"
-  TremN="now-2h"
-  TpubN1="now-632h"
-  TactN1="${TretN}"
-  TretN1="now+3835h"
-  TremN1="now+4462h"
-  keytimes="-P ${TpubN}  -P sync ${TactN}  -A ${TpubN}  -I ${TretN}  -D ${TremN} -D sync ${TactN1}"
-  newtimes="-P ${TpubN1} -P sync ${TactN1} -A ${TactN1} -I ${TretN1} -D ${TremN1}"
-  CSK1=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  CSK2=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $newtimes $zone 2>keygen.out.$zone.2)
-  $SETTIME -s -g $H -k $U $TremN -r $H $TremN -d $H $TremN -z $H $TactN1 "$CSK1" >settime.out.$zone.1 2>&1
-  $SETTIME -s -g $O -k $O $TactN1 -r $O $TactN1 -d $O $TactN1 -z $O $TactN1 "$CSK2" >settime.out.$zone.2 2>&1
-  # Set key rollover relationship.
-  key_successor $CSK1 $CSK2
-  # Sign zone.
-  cat template.db.in "${CSK1}.key" "${CSK2}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK1" >>"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK2" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-
-  # Step 8:
-  # The predecessor DNSKEY can be purged.
-  setup step8.csk-roll1.$tld
-  TpubN="now-5094h"
-  TactN="now-5069h"
-  TretN="now-630h"
-  TremN="now-3h"
-  TpubN1="now-633h"
-  TactN1="${TretN}"
-  TretN1="now+3834h"
-  TremN1="now+4461h"
-  # Subtract purge-keys interval from all the times (1h).
-  keytimes="-P ${TpubN}  -P sync ${TactN}  -A ${TpubN}  -I ${TretN}  -D ${TremN} -D sync ${TactN1}"
-  newtimes="-P ${TpubN1} -P sync ${TactN1} -A ${TactN1} -I ${TretN1} -D ${TremN1}"
-  CSK1=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $keytimes $zone 2>keygen.out.$zone.1)
-  CSK2=$($KEYGEN -k csk-roll1-$tld -l kasp.conf $newtimes $zone 2>keygen.out.$zone.2)
-  $SETTIME -s -g $H -k $H $TremN -r $H $TremN -d $H $TremN -z $H $TactN1 "$CSK1" >settime.out.$zone.1 2>&1
-  $SETTIME -s -g $O -k $O $TactN1 -r $O $TactN1 -d $O $TactN1 -z $O $TactN1 "$CSK2" >settime.out.$zone.2 2>&1
-  # Set key rollover relationship.
-  key_successor $CSK1 $CSK2
-  # Sign zone.
-  cat template.db.in "${CSK1}.key" "${CSK2}.key" >"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK1" >>"$infile"
-  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK2" >>"$infile"
-  cp $infile $zonefile
-  $SIGNER -S -z -x -G "cdnskey,cds:sha-384" -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
-done
index fcf4876b905da6b8e39facfca47fff6b259af9ec..5e496dbff686646543ebd5a229df83b1413dfd43 100644 (file)
@@ -24,7 +24,11 @@ from rollover.common import (
     size,
     TIMEDELTA,
 )
-
+from rollover.setup import (
+    configure_root,
+    configure_tld,
+    configure_cskroll1,
+)
 
 CDSS = ["CDNSKEY", "CDS (SHA-384)"]
 CONFIG = {
@@ -65,6 +69,30 @@ OFFSETS["step8-p"] = OFFSETS["step7-p"] - int(CONFIG["purge-keys"].total_seconds
 OFFSETS["step8-s"] = OFFSETS["step7-s"] - int(CONFIG["purge-keys"].total_seconds())
 
 
+def bootstrap():
+    data = {
+        "tlds": [],
+        "trust_anchors": [],
+    }
+
+    tlds = []
+    for tld_name in [
+        "autosign",
+        "manual",
+    ]:
+        delegations = configure_cskroll1(tld_name, f"{POLICY}-{tld_name}")
+
+        tld = configure_tld(tld_name, delegations)
+        tlds.append(tld)
+
+        data["tlds"].append(tld_name)
+
+    ta = configure_root(tlds)
+    data["trust_anchors"].append(ta)
+
+    return data
+
+
 @pytest.mark.parametrize(
     "tld",
     [
@@ -72,7 +100,7 @@ OFFSETS["step8-s"] = OFFSETS["step7-s"] - int(CONFIG["purge-keys"].total_seconds
         param("manual"),
     ],
 )
-def test_csk_roll1_step1(tld, alg, size, ns3):
+def test_csk_roll1_step1(tld, ns3, alg, size):
     zone = f"step1.csk-roll1.{tld}"
     policy = f"{POLICY}-{tld}"
 
index f52135a83db3abd648b6899d808eaa1c1385d35b..c2cacdb2009cb6d1a95ca6561e111c50edc452b4 100644 (file)
@@ -99,6 +99,20 @@ def fake_lifetime(keys: List[str]):
             statefile.write("Lifetime: 0\n")
 
 
+def set_key_relationship(key1: str, key2: str):
+    """
+    Set in the key state files the Predecessor/Successor fields.
+    """
+    predecessor = isctest.kasp.Key(key1, keydir="ns3")
+    successor = isctest.kasp.Key(key2, keydir="ns3")
+
+    with open(f"ns3/{key1}.state", "a", encoding="utf-8") as statefile:
+        statefile.write(f"Successor: {successor.tag}\n")
+
+    with open(f"ns3/{key2}.state", "a", encoding="utf-8") as statefile:
+        statefile.write(f"Predecessor: {predecessor.tag}\n")
+
+
 def render_and_sign_zone(zonename: str, keys: List[str], extra_options: str = ""):
     dnskeys = []
     privaterrs = []
@@ -507,3 +521,343 @@ def configure_algo_ksk_zsk(tld: str, reconfig: bool = False) -> List[Zone]:
         render_and_sign_zone(zonename, [ksk1_name, zsk1_name, ksk2_name, zsk2_name])
 
     return zones
+
+
+def configure_cskroll1(tld: str, policy: str) -> List[Zone]:
+    # The zones at csk-roll1.$tld represent the various steps of a CSK rollover
+    # (which is essentially a ZSK Pre-Publication / KSK Double-KSK rollover).
+    zones = []
+    zone = f"csk-roll1.{tld}"
+    keygen = CmdHelper("KEYGEN", f"-k {policy} -l kasp.conf")
+    settime = CmdHelper("SETTIME", "-s")
+
+    # Step 1:
+    # Introduce the first key. This will immediately be active.
+    zonename = f"step1.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    TactN = "now-7d"
+    keytimes = f"-P {TactN} -A {TactN}"
+    # Key generation.
+    csk_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN} -r OMNIPRESENT {TactN} -z OMNIPRESENT {TactN} -d OMNIPRESENT {TactN} {csk_name}",
+        cwd="ns3",
+    )
+    # Signing.
+    render_and_sign_zone(zonename, [csk_name], extra_options="-z -G cdnskey,cds:sha384")
+
+    # Step 2:
+    # It is time to introduce the new CSK.
+    zonename = f"step2.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # According to RFC 7583:
+    # KSK: Tpub(N+1) <= Tact(N) + Lksk - IpubC
+    # ZSK: Tpub(N+1) <= Tact(N) + Lzsk - Ipub
+    # IpubC = DprpC + TTLkey (+publish-safety)
+    # Ipub  = IpubC
+    # Lcsk = Lksk = Lzsk
+    #
+    # Lcsk:           6mo (186d, 4464h)
+    # Dreg:           N/A
+    # DprpC:          1h
+    # TTLkey:         1h
+    # publish-safety: 1h
+    # Ipub:           3h
+    #
+    # Tact(N) = now - Lcsk + Ipub = now - 186d + 3h
+    #         = now - 4464h + 3h  = now - 4461h
+    TactN = "now-4461h"
+    keytimes = f"-P {TactN} -A {TactN}"
+    # Key generation.
+    csk_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN} -r OMNIPRESENT {TactN} -z OMNIPRESENT {TactN} -d OMNIPRESENT {TactN} {csk_name}",
+        cwd="ns3",
+    )
+    # Signing.
+    render_and_sign_zone(zonename, [csk_name], extra_options="-z -G cdnskey,cds:sha384")
+
+    # Step 3:
+    # It is time to submit the DS and to roll signatures.
+    zonename = f"step3.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # According to RFC 7583:
+    #
+    # Tsbm(N+1) >= Trdy(N+1)
+    # KSK: Tact(N+1) = Tsbm(N+1)
+    # ZSK: Tact(N+1) = Tpub(N+1) + Ipub = Tsbm(N+1)
+    # KSK: Iret  = DprpP + TTLds (+retire-safety)
+    # ZSK: IretZ = Dsgn + Dprp + TTLsig (+retire-safety)
+    #
+    # Lcsk:           186d
+    # Dprp:           1h
+    # DprpP:          1h
+    # Dreg:           N/A
+    # Dsgn:           25d
+    # TTLds:          1h
+    # TTLsig:         1d
+    # retire-safety:  2h
+    # Iret:           4h
+    # IretZ:          26d3h
+    # Ipub:           3h
+    #
+    # Tpub(N)   = now - Lcsk = now - 186d
+    # Tact(N)   = now - Lcsk + Dprp + TTLsig = now - 4439h
+    # Tret(N)   = now
+    # Trem(N)   = now + IretZ = now + 26d3h = now + 627h
+    # Tpub(N+1) = now - Ipub = now - 3h
+    # Tact(N+1) = Tret(N)
+    # Tret(N+1) = now + Lcsk = now + 186d = now + 186d
+    # Trem(N+1) = now + Lcsk + IretZ = now + 186d + 26d3h =
+    #           = now + 5091h
+    TpubN = "now-186d"
+    TactN = "now-4439h"
+    TretN = "now"
+    TremN = "now+627h"
+    TpubN1 = "now-3h"
+    TactN1 = TretN
+    TretN1 = "now+186d"
+    TremN1 = "now+5091h"
+    keytimes = (
+        f"-P {TpubN} -P sync {TactN} -A {TpubN} -I {TretN} -D {TremN} -D sync {TactN1}"
+    )
+    newtimes = f"-P {TpubN1} -P sync {TactN1} -A {TactN1} -I {TretN1} -D {TremN1}"
+    # Key generation.
+    csk1_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    csk2_name = keygen(f"{newtimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g HIDDEN -k OMNIPRESENT {TactN} -r OMNIPRESENT {TactN} -z OMNIPRESENT {TactN} -d OMNIPRESENT {TactN} {csk1_name}",
+        cwd="ns3",
+    )
+    settime(
+        f"-g OMNIPRESENT -k RUMOURED {TpubN1} -r RUMOURED {TpubN1} -z HIDDEN {TpubN1} -d HIDDEN {TpubN1} {csk2_name}",
+        cwd="ns3",
+    )
+    # Set key rollover relationship.
+    set_key_relationship(csk1_name, csk2_name)
+    # Signing.
+    render_and_sign_zone(
+        zonename, [csk1_name, csk2_name], extra_options="-z -G cdnskey,cds:sha384"
+    )
+
+    # Step 4:
+    # Some time later all the ZRRSIG records should be from the new CSK, and the
+    # DS should be swapped.  The ZRRSIG records are all replaced after IretZ
+    # (which is 26d3h).  The DS is swapped after Iret (which is 4h).
+    # In other words, the DS is swapped before all zone signatures are replaced.
+    zonename = f"step4.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # According to RFC 7583:
+    # Trem(N)    = Tret(N) - Iret + IretZ
+    # now       = Tsbm(N+1) + Iret
+    #
+    # Lcsk:   186d
+    # Iret:   4h
+    # IretZ:  26d3h
+    #
+    # Tpub(N)   = now - Iret - Lcsk = now - 4h - 186d = now - 4468h
+    # Tret(N)   = now - Iret = now - 4h = now - 4h
+    # Trem(N)   = now - Iret + IretZ = now - 4h + 26d3h
+    #           = now + 623h
+    # Tpub(N+1) = now - Iret - IpubC = now - 4h - 3h = now - 7h
+    # Tact(N+1) = Tret(N)
+    # Tret(N+1) = now - Iret + Lcsk = now - 4h + 186d = now + 4460h
+    # Trem(N+1) = now - Iret + Lcsk + IretZ = now - 4h + 186d + 26d3h
+    #           = now + 5087h
+    TpubN = "now-4468h"
+    TactN = "now-4443h"
+    TretN = "now-4h"
+    TremN = "now+623h"
+    TpubN1 = "now-7h"
+    TactN1 = TretN
+    TretN1 = "now+4460h"
+    TremN1 = "now+5087h"
+    keytimes = (
+        f"-P {TpubN} -P sync {TactN} -A {TpubN} -I {TretN} -D {TremN} -D sync {TactN1}"
+    )
+    newtimes = f"-P {TpubN1} -P sync {TactN1} -A {TactN1} -I {TretN1} -D {TremN1}"
+    # Key generation.
+    csk1_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    csk2_name = keygen(f"{newtimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g HIDDEN -k OMNIPRESENT {TactN} -r OMNIPRESENT {TactN} -z UNRETENTIVE {TactN1} -d UNRETENTIVE {TactN1} -D ds {TactN1} {csk1_name}",
+        cwd="ns3",
+    )
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN1} -r OMNIPRESENT {TactN1} -z RUMOURED {TactN1} -d RUMOURED {TactN1} -P ds {TactN1} {csk2_name}",
+        cwd="ns3",
+    )
+    # Set key rollover relationship.
+    set_key_relationship(csk1_name, csk2_name)
+    # Signing.
+    render_and_sign_zone(
+        zonename, [csk1_name, csk2_name], extra_options="-z -G cdnskey,cds:sha384"
+    )
+
+    # Step 5:
+    # After the DS is swapped in step 4, also the KRRSIG records can be removed.
+    # At this time these have all become hidden.
+    zonename = f"step5.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # Subtract DNSKEY TTL plus zone propagation delay from all the times (2h).
+    TpubN = "now-4470h"
+    TactN = "now-4445h"
+    TretN = "now-6h"
+    TremN = "now+621h"
+    TpubN1 = "now-9h"
+    TactN1 = TretN
+    TretN1 = "now+4458h"
+    TremN1 = "now+5085h"
+    keytimes = (
+        f"-P {TpubN} -P sync {TactN} -A {TpubN} -I {TretN} -D {TremN} -D sync {TactN1}"
+    )
+    newtimes = f"-P {TpubN1} -P sync {TactN1} -A {TactN1} -I {TretN1} -D {TremN1}"
+    # Key generation.
+    csk1_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    csk2_name = keygen(f"{newtimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g HIDDEN -k OMNIPRESENT {TactN} -r UNRETENTIVE now-2h -z UNRETENTIVE {TactN1} -d HIDDEN now-2h {csk1_name}",
+        cwd="ns3",
+    )
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN1} -r OMNIPRESENT {TactN1} -z RUMOURED {TactN1} -d OMNIPRESENT now-2h {csk2_name}",
+        cwd="ns3",
+    )
+    # Set key rollover relationship.
+    set_key_relationship(csk1_name, csk2_name)
+    # Signing.
+    render_and_sign_zone(
+        zonename, [csk1_name, csk2_name], extra_options="-z -G cdnskey,cds:sha384"
+    )
+
+    # Step 6:
+    # After the retire interval has passed the predecessor DNSKEY can be
+    # removed from the zone.
+    zonename = f"step6.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # According to RFC 7583:
+    # Trem(N) = Tret(N) + IretZ
+    # Tret(N) = Tact(N) + Lcsk
+    #
+    # Lcsk:   186d
+    # Iret:   4h
+    # IretZ:  26d3h
+    #
+    # Tpub(N)   = now - IretZ - Lcsk = now - 627h - 186d
+    #           = now - 627h - 4464h = now - 5091h
+    # Tact(N)   = now - 627h - 186d
+    # Tret(N)   = now - IretZ = now - 627h
+    # Trem(N)   = now
+    # Tpub(N+1) = now - IretZ - Ipub = now - 627h - 3h = now - 630h
+    # Tact(N+1) = Tret(N)
+    # Tret(N+1) = now - IretZ + Lcsk = now - 627h + 186d = now + 3837h
+    # Trem(N+1) = now + Lcsk = now + 186d
+    TpubN = "now-5091h"
+    TactN = "now-5066h"
+    TretN = "now-627h"
+    TremN = "now"
+    TpubN1 = "now-630h"
+    TactN1 = TretN
+    TretN1 = "now+3837h"
+    TremN1 = "now+186d"
+    keytimes = (
+        f"-P {TpubN} -P sync {TactN} -A {TpubN} -I {TretN} -D {TremN} -D sync {TactN1}"
+    )
+    newtimes = f"-P {TpubN1} -P sync {TactN1} -A {TactN1} -I {TretN1} -D {TremN1}"
+    # Key generation.
+    csk1_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    csk2_name = keygen(f"{newtimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g HIDDEN -k OMNIPRESENT {TactN} -r HIDDEN {TremN} -z UNRETENTIVE {TactN1} -d HIDDEN {TremN} {csk1_name}",
+        cwd="ns3",
+    )
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN1} -r OMNIPRESENT {TactN1} -z RUMOURED {TactN1} -d OMNIPRESENT {TremN} {csk2_name}",
+        cwd="ns3",
+    )
+    # Set key rollover relationship.
+    set_key_relationship(csk1_name, csk2_name)
+    # Signing.
+    render_and_sign_zone(
+        zonename, [csk1_name, csk2_name], extra_options="-z -G cdnskey,cds:sha384"
+    )
+
+    # Step 7:
+    # Some time later the predecessor DNSKEY enters the HIDDEN state.
+    zonename = f"step7.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # Subtract DNSKEY TTL plus zone propagation delay from all the times (2h).
+    TpubN = "now-5093h"
+    TactN = "now-5068h"
+    TretN = "now-629h"
+    TremN = "now-2h"
+    TpubN1 = "now-632h"
+    TactN1 = TretN
+    TretN1 = "now+3835h"
+    TremN1 = "now+4462h"
+    keytimes = (
+        f"-P {TpubN} -P sync {TactN} -A {TpubN} -I {TretN} -D {TremN} -D sync {TactN1}"
+    )
+    newtimes = f"-P {TpubN1} -P sync {TactN1} -A {TactN1} -I {TretN1} -D {TremN1}"
+    # Key generation.
+    csk1_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    csk2_name = keygen(f"{newtimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g HIDDEN -k UNRETENTIVE {TremN} -r HIDDEN {TremN} -z HIDDEN {TactN1} -d HIDDEN {TremN} {csk1_name}",
+        cwd="ns3",
+    )
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN1} -r OMNIPRESENT {TactN1} -z OMNIPRESENT {TactN1} -d OMNIPRESENT {TactN1} {csk2_name}",
+        cwd="ns3",
+    )
+    # Set key rollover relationship.
+    set_key_relationship(csk1_name, csk2_name)
+    # Signing.
+    render_and_sign_zone(
+        zonename, [csk1_name, csk2_name], extra_options="-z -G cdnskey,cds:sha384"
+    )
+
+    # Step 8:
+    # The predecessor DNSKEY can be purged.
+    zonename = f"step8.{zone}"
+    zones.append(Zone(zonename, f"{zonename}.db", Nameserver("ns3", "10.53.0.3")))
+    isctest.log.info(f"setup {zonename}")
+    # Subtract purge-keys interval from all the times (1h).
+    TpubN = "now-5094h"
+    TactN = "now-5069h"
+    TretN = "now-630h"
+    TremN = "now-3h"
+    TpubN1 = "now-633h"
+    TactN1 = TretN
+    TretN1 = "now+3834h"
+    TremN1 = "now+4461h"
+    keytimes = (
+        f"-P {TpubN} -P sync {TactN} -A {TpubN} -I {TretN} -D {TremN} -D sync {TactN1}"
+    )
+    newtimes = f"-P {TpubN1} -P sync {TactN1} -A {TactN1} -I {TretN1} -D {TremN1}"
+    # Key generation.
+    csk1_name = keygen(f"{keytimes} {zonename}", cwd="ns3").strip()
+    csk2_name = keygen(f"{newtimes} {zonename}", cwd="ns3").strip()
+    settime(
+        f"-g HIDDEN -k HIDDEN {TremN} -r HIDDEN {TremN} -z HIDDEN {TactN1} -d HIDDEN {TremN} {csk1_name}",
+        cwd="ns3",
+    )
+    settime(
+        f"-g OMNIPRESENT -k OMNIPRESENT {TactN1} -r OMNIPRESENT {TactN1} -z OMNIPRESENT {TactN1} -d OMNIPRESENT {TactN1} {csk2_name}",
+        cwd="ns3",
+    )
+    # Set key rollover relationship.
+    set_key_relationship(csk1_name, csk2_name)
+    # Signing.
+    render_and_sign_zone(
+        zonename, [csk1_name, csk2_name], extra_options="-z -G cdnskey,cds:sha384"
+    )
+
+    return zones