modules/prefill: resigned expired RRSIGS in test zones

Fixes: #496

diff --git a/modules/meson.build b/modules/meson.build
index 9e952cc14d8372d8f086235f2a7537540c187b3c..b0bcc4dbb0efa0b9b8a6a0df8f82e93de8b47c6c 100644 (file)
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -25,7 +25,7 @@ config_tests += [
   ['dns64', files('dns64/dns64.test.lua')],
   ['ta_update', files('ta_update/ta_update.test.lua'), ['snowflake']],
   # NOTE: https://gitlab.labs.nic.cz/knot/knot-resolver/issues/496
-  # ['prefill', files('prefill/prefill.test/prefill.test.lua')],
+  ['prefill', files('prefill/prefill.test/prefill.test.lua')],
 ]
 
 integr_tests += [

diff --git a/modules/prefill/prefill.test/prefill.test.lua b/modules/prefill/prefill.test/prefill.test.lua
index c5c367670cf92c3bc865e9b621f9119f5ce78a68..87df10ece3818ab6bf1c321c20064f9f4002a1f4 100644 (file)
--- a/modules/prefill/prefill.test/prefill.test.lua
+++ b/modules/prefill/prefill.test/prefill.test.lua
@@ -33,7 +33,7 @@ ev = event.after(0, function () return 1 end)
 
 -- Import fake root zone; avoid interference with configured keyfile_default.
 trust_anchors.remove('.')
-trust_anchors.add('.    IN DS 136 8 2 CF6782894E5BD62F0B0B7E9E8126B033FC752909BBE3577E27406FC1 78A9BC27')
+trust_anchors.add('.                   IN DS 18213 7 2 A1D391053583A4BC597DB9588B296060FC55EAC80B3831CA371BA1FA AE997244')
 
 local function check_answer(desc, qname, qtype, expected_rcode)
        qtype_str = kres.tostring.type[qtype]

diff --git a/modules/prefill/prefill.test/testroot.zone b/modules/prefill/prefill.test/testroot.zone
index 5fb418914319a51c8b6045727c0103ea5b7abe5d..faab1d550e094c441275c05e97ae90a6a79cbfc2 100644 (file)
--- a/modules/prefill/prefill.test/testroot.zone
+++ b/modules/prefill/prefill.test/testroot.zone
@@ -1,4 +1,4 @@
-; File written on Tue Jul  9 10:53:17 2019
+; File written on Thu Aug 22 15:47:02 2019
 ; dnssec_signzone version 9.11.3-1ubuntu1.8-Ubuntu
 .                      86400   IN SOA  rootns. you.test. (
                                        2017071102 ; serial
@@ -7,52 +7,52 @@
                                        604800     ; expire (1 week)
                                        86400      ; minimum (1 day)
                                        )
-                       86400   RRSIG   SOA 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       S86QA1UlKYCxzFK1QDYb9ec6DHg59Y+xWREy
-                                       duooWAMYB2gi5xSks9KPs/G0ATnOWrHEO/7q
-                                       HPfgZAUyPR0GEQ== )
+                       86400   RRSIG   SOA 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       QRmlVBvwhkNqmsp4H9zxcPeVg++5g/eR8EPb
+                                       DldazjUIoqbQYarTD+3DDf8tvwJu1aBNvBhm
+                                       cQCauTS5JWzisg== )
                        86400   NS      rootns.
-                       86400   RRSIG   NS 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       cTzIDk1fP13okhc5q3ZFz+Fx2O/xwSuz6gVV
-                                       2CEGGCrS/g1ePXOkk5vEwHkJqR9nIbIxgkao
-                                       nj2mL12zeSY2Sw== )
+                       86400   RRSIG   NS 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       kMiL+id0WrESTSw51qI96kbolLTegn+Uraim
+                                       8GjNr0d2fH8m885ORkr7C4g0RrzfAKNokArF
+                                       rQltwL8sMowgJg== )
                        86400   NSEC    a.b.subtree1. NS SOA RRSIG NSEC DNSKEY
-                       86400   RRSIG   NSEC 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       E5fbgQXbNcBfSDrryxim5to8Thavqkkj2JK3
-                                       wT0gHd8Uz8op2hImWzKmkvX6NZkd7HBdtsWg
-                                       1a38Y0GySh5nTQ== )
-                       86400   DNSKEY  256 3 8 (
-                                       AwEAAbSwbjkbn1oPDNdIUjdRhaUeODrQdwfb
-                                       EI0upUGEYqQV2LO7iXH5Nvvds9EQmFo9g+Xw
-                                       nhOimjcuQG9YYGZuG6c=
-                                       ) ; ZSK; alg = RSASHA256 ; key id = 62034
-                       86400   DNSKEY  257 3 8 (
-                                       AwEAAbSV3HkhePQXQNSJUx2wKiVwdwvMFdeY
-                                       Zfn/jNWe77usNjFmJB1T6Jz0Gyu0b95j686H
-                                       U3/8jqQ0vB4/ugFr3v8=
-                                       ) ; KSK; alg = RSASHA256 ; key id = 136
-                       86400   RRSIG   DNSKEY 8 0 86400 (
-                                       20190808075316 20190709075316 136 .
-                                       HmH/IEMRWFarlsxDQ4sD8byhCcuklhDKC+Vi
-                                       59+4tcP34rJ+gDsdfVfEY4Hs03UF7tXQiyhv
-                                       4ut02AZFJMangg== )
-                       86400   RRSIG   DNSKEY 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       Hk4HEUmALb98i0XNn7ZwOZeuLYrv+mEoX9Do
-                                       6YI1XqFcIRaY7vBCyQEpbRRs+DXPXBbi3EHc
-                                       PDtyu1VjN9xEJA== )
+                       86400   RRSIG   NSEC 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       zv+f8FELPfYeWn7Ryy/+rBR+qASu4QC6gAka
+                                       vpeWRgybUQh50LrJIxINuf0YLCpqxjsX6zkK
+                                       zwbt0BgPHjfRHA== )
+                       86400   DNSKEY  256 3 7 (
+                                       AwEAAc9BtlREycexYH5az+dIbhI6sM56F+kd
+                                       SI43ZTGNT/Bam5vGrXju0uTHCJ2+KBwOSz7d
+                                       ZVchX0ulIJOUV9MteT0=
+                                       ) ; ZSK; alg = NSEC3RSASHA1 ; key id = 46349
+                       86400   DNSKEY  257 3 7 (
+                                       AwEAAcEFKHPyE1JMfRLhJK9mgcBZ+TR0Pj6u
+                                       shF6YbLkQoRs6Uzm458ErCcAdukJsTckqCzq
+                                       PFEqGLRztzyAJ7Z3G0k=
+                                       ) ; KSK; alg = NSEC3RSASHA1 ; key id = 18213
+                       86400   RRSIG   DNSKEY 7 0 86400 (
+                                       20500101000000 20190822124702 18213 .
+                                       ih4ScNqt9muT/Dqc05oO5T/xAyRK1/LblHph
+                                       GHedPHW7mC6IzsDBbqjD/P1nVK5RkM2Q+ozV
+                                       Ltbtmt2CafXsLA== )
+                       86400   RRSIG   DNSKEY 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       Lqle63cGoJdZA4CHHUq3ZqFxsbYATelzj5Dl
+                                       lDcc7vLbn2Qy9AVUC5I6UdZqMK2UDyO+DWCG
+                                       Cmq5705eAQlcsQ== )
 a.b.subtree1.          86400   IN AAAA 2001:db8::
-                       86400   RRSIG   AAAA 8 3 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       MAisFZ8EU/NdNenJKvmlqZhxBx8K6Io69Cgg
-                                       Ux15CI4EozX5i2T/pPDpjp2Oe3Xxxj1TcegE
-                                       VgNzaayBj9fKbw== )
+                       86400   RRSIG   AAAA 7 3 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       Hq6CUu3CVN/90b1Sozv0uIgH5ePxY3olc3eq
+                                       PoeyfdS+3HjSgb+Ji+GjYAAOMaVDS0APwwMe
+                                       pHxhdgO/zpKHRQ== )
                        86400   NSEC    . AAAA RRSIG NSEC
-                       86400   RRSIG   NSEC 8 3 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       ZJT5KzQS/1I8gZl5J/QYpa35jrjBtNoAYxC1
-                                       +vOhgFB/iLVVdiTtWpY23+Uv5buxSxlweBuh
-                                       AoMwrFGk76K0EQ== )
+                       86400   RRSIG   NSEC 7 3 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       lcJ7xdzxgTTvj2JiwzhDRyxTx2ZJ5zwzx0hC
+                                       ttTrSfG+2GyMnPzJ9MFid5S2w0WbWOWWLaKH
+                                       O0ucI8xvYInNAA== )

diff --git a/modules/prefill/prefill.test/testroot_no_soa.zone b/modules/prefill/prefill.test/testroot_no_soa.zone
index b99bb51cfed0c41a6edb382fe36a584fe8b3a022..82c839e0b83fe62879a83294e22eb7e4fcf7c6cc 100644 (file)
--- a/modules/prefill/prefill.test/testroot_no_soa.zone
+++ b/modules/prefill/prefill.test/testroot_no_soa.zone
@@ -1,47 +1,51 @@
-; File written on Tue Jul  9 10:53:17 2019
+; File written on Thu Aug 22 15:47:02 2019
 ; dnssec_signzone version 9.11.3-1ubuntu1.8-Ubuntu
-
-.                      86400   NS      rootns.
-                       86400   RRSIG   NS 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       cTzIDk1fP13okhc5q3ZFz+Fx2O/xwSuz6gVV
-                                       2CEGGCrS/g1ePXOkk5vEwHkJqR9nIbIxgkao
-                                       nj2mL12zeSY2Sw== )
+.                      86400   RRSIG   SOA 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       QRmlVBvwhkNqmsp4H9zxcPeVg++5g/eR8EPb
+                                       DldazjUIoqbQYarTD+3DDf8tvwJu1aBNvBhm
+                                       cQCauTS5JWzisg== )
+                       86400   NS      rootns.
+                       86400   RRSIG   NS 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       kMiL+id0WrESTSw51qI96kbolLTegn+Uraim
+                                       8GjNr0d2fH8m885ORkr7C4g0RrzfAKNokArF
+                                       rQltwL8sMowgJg== )
                        86400   NSEC    a.b.subtree1. NS SOA RRSIG NSEC DNSKEY
-                       86400   RRSIG   NSEC 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       E5fbgQXbNcBfSDrryxim5to8Thavqkkj2JK3
-                                       wT0gHd8Uz8op2hImWzKmkvX6NZkd7HBdtsWg
-                                       1a38Y0GySh5nTQ== )
-                       86400   DNSKEY  256 3 8 (
-                                       AwEAAbSwbjkbn1oPDNdIUjdRhaUeODrQdwfb
-                                       EI0upUGEYqQV2LO7iXH5Nvvds9EQmFo9g+Xw
-                                       nhOimjcuQG9YYGZuG6c=
-                                       ) ; ZSK; alg = RSASHA256 ; key id = 62034
-                       86400   DNSKEY  257 3 8 (
-                                       AwEAAbSV3HkhePQXQNSJUx2wKiVwdwvMFdeY
-                                       Zfn/jNWe77usNjFmJB1T6Jz0Gyu0b95j686H
-                                       U3/8jqQ0vB4/ugFr3v8=
-                                       ) ; KSK; alg = RSASHA256 ; key id = 136
-                       86400   RRSIG   DNSKEY 8 0 86400 (
-                                       20190808075316 20190709075316 136 .
-                                       HmH/IEMRWFarlsxDQ4sD8byhCcuklhDKC+Vi
-                                       59+4tcP34rJ+gDsdfVfEY4Hs03UF7tXQiyhv
-                                       4ut02AZFJMangg== )
-                       86400   RRSIG   DNSKEY 8 0 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       Hk4HEUmALb98i0XNn7ZwOZeuLYrv+mEoX9Do
-                                       6YI1XqFcIRaY7vBCyQEpbRRs+DXPXBbi3EHc
-                                       PDtyu1VjN9xEJA== )
+                       86400   RRSIG   NSEC 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       zv+f8FELPfYeWn7Ryy/+rBR+qASu4QC6gAka
+                                       vpeWRgybUQh50LrJIxINuf0YLCpqxjsX6zkK
+                                       zwbt0BgPHjfRHA== )
+                       86400   DNSKEY  256 3 7 (
+                                       AwEAAc9BtlREycexYH5az+dIbhI6sM56F+kd
+                                       SI43ZTGNT/Bam5vGrXju0uTHCJ2+KBwOSz7d
+                                       ZVchX0ulIJOUV9MteT0=
+                                       ) ; ZSK; alg = NSEC3RSASHA1 ; key id = 46349
+                       86400   DNSKEY  257 3 7 (
+                                       AwEAAcEFKHPyE1JMfRLhJK9mgcBZ+TR0Pj6u
+                                       shF6YbLkQoRs6Uzm458ErCcAdukJsTckqCzq
+                                       PFEqGLRztzyAJ7Z3G0k=
+                                       ) ; KSK; alg = NSEC3RSASHA1 ; key id = 18213
+                       86400   RRSIG   DNSKEY 7 0 86400 (
+                                       20500101000000 20190822124702 18213 .
+                                       ih4ScNqt9muT/Dqc05oO5T/xAyRK1/LblHph
+                                       GHedPHW7mC6IzsDBbqjD/P1nVK5RkM2Q+ozV
+                                       Ltbtmt2CafXsLA== )
+                       86400   RRSIG   DNSKEY 7 0 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       Lqle63cGoJdZA4CHHUq3ZqFxsbYATelzj5Dl
+                                       lDcc7vLbn2Qy9AVUC5I6UdZqMK2UDyO+DWCG
+                                       Cmq5705eAQlcsQ== )
 a.b.subtree1.          86400   IN AAAA 2001:db8::
-                       86400   RRSIG   AAAA 8 3 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       MAisFZ8EU/NdNenJKvmlqZhxBx8K6Io69Cgg
-                                       Ux15CI4EozX5i2T/pPDpjp2Oe3Xxxj1TcegE
-                                       VgNzaayBj9fKbw== )
+                       86400   RRSIG   AAAA 7 3 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       Hq6CUu3CVN/90b1Sozv0uIgH5ePxY3olc3eq
+                                       PoeyfdS+3HjSgb+Ji+GjYAAOMaVDS0APwwMe
+                                       pHxhdgO/zpKHRQ== )
                        86400   NSEC    . AAAA RRSIG NSEC
-                       86400   RRSIG   NSEC 8 3 86400 (
-                                       20190808075316 20190709075316 62034 .
-                                       ZJT5KzQS/1I8gZl5J/QYpa35jrjBtNoAYxC1
-                                       +vOhgFB/iLVVdiTtWpY23+Uv5buxSxlweBuh
-                                       AoMwrFGk76K0EQ== )
+                       86400   RRSIG   NSEC 7 3 86400 (
+                                       20500101000000 20190822124702 46349 .
+                                       lcJ7xdzxgTTvj2JiwzhDRyxTx2ZJ5zwzx0hC
+                                       ttTrSfG+2GyMnPzJ9MFid5S2w0WbWOWWLaKH
+                                       O0ucI8xvYInNAA== )