mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-20 23:00:56 -05:00
Failure handling for 5011.
git-svn-id: file:///svn/unbound/trunk@1848 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards
parent
44e2f9b0d9
commit
ee1c4c1cce
8 changed files with 648 additions and 5 deletions
|
|
@ -1,3 +1,7 @@
|
||||||
|
23 September 2009: Wouter
|
||||||
|
- 5011 query failed counts verification failures, not lookup failures.
|
||||||
|
- 5011 probe failure handling fixup.
|
||||||
|
|
||||||
22 September 2009: Wouter
|
22 September 2009: Wouter
|
||||||
- autotrust test with algorithm rollover, new ordering of checks
|
- autotrust test with algorithm rollover, new ordering of checks
|
||||||
assists in orderly rollover.
|
assists in orderly rollover.
|
||||||
|
|
|
||||||
|
|
@ -941,6 +941,7 @@ processInitRequest(struct module_qstate* qstate, struct iter_qstate* iq,
|
||||||
else dname_remove_label(&delname, &delnamelen);
|
else dname_remove_label(&delname, &delnamelen);
|
||||||
iq->refetch_glue = 0; /* if CNAME causes restart, no refetch */
|
iq->refetch_glue = 0; /* if CNAME causes restart, no refetch */
|
||||||
}
|
}
|
||||||
|
/* delname is the name to lookup a delegation for. If NULL rootprime */
|
||||||
while(1) {
|
while(1) {
|
||||||
|
|
||||||
/* Lookup the delegation in the cache. If null, then the
|
/* Lookup the delegation in the cache. If null, then the
|
||||||
|
|
|
||||||
164
testdata/autotrust_init_fail.rpl
vendored
Normal file
164
testdata/autotrust_init_fail.rpl
vendored
Normal file
|
|
@ -0,0 +1,164 @@
|
||||||
|
; config options
|
||||||
|
server:
|
||||||
|
target-fetch-policy: "0 0 0 0 0"
|
||||||
|
log-time-ascii: yes
|
||||||
|
stub-zone:
|
||||||
|
name: "."
|
||||||
|
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
|
||||||
|
; initial content (say from dig example.com DNSKEY > example.com.key)
|
||||||
|
AUTOTRUST_FILE example.com
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
AUTOTRUST_END
|
||||||
|
CONFIG_END
|
||||||
|
|
||||||
|
SCENARIO_BEGIN Test autotrust with failed initial trust anchor
|
||||||
|
|
||||||
|
; K-ROOT
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 193.0.14.129
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
. IN NS
|
||||||
|
SECTION ANSWER
|
||||||
|
. IN NS k.root-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
k.root-servers.net IN A 193.0.14.129
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
com. IN NS a.gtld-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
a.gtld-servers.net. IN A 192.5.6.30
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; a.gtld-servers.net.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 192.5.6.30
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. IN NS ns.example.com.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ns.example.com. IN A 1.2.3.4
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; ns.example.com.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 1.2.3.4
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
ns.example.com. IN AAAA
|
||||||
|
SECTION ANSWER
|
||||||
|
ns.example.com. IN NSEC nugget.example.com. A NSEC RRSIG
|
||||||
|
ns.example.com. 3600 IN RRSIG NSEC 5 3 3600 20090924111500 20090821111500 30899 example.com. WRUQ5d5aBO5AXbvnfCd0AWfKGvQIuAjT2qydGkUIaLZaiP4nj+JdquEy1nGvBwYQ9gWyP7b6C6UGrUnVcNBpcw== ;{id = 30899}
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. 3600 IN NS ns.example.com.
|
||||||
|
example.com. 3600 IN RRSIG NS 5 2 3600 20090924111500 20090821111500 30899 example.com. J5wxRq0jgwQL6yy530kvo9cHqNAUHV8IF4dvaYZL0bNraO2Oe6dVXqlJl4+cxNHI2TMsstwFPr2Zz8tv6Az2mQ== ;{id = 30899}
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
www.example.com. 3600 IN A 10.20.30.40
|
||||||
|
www.example.com. 3600 IN RRSIG A 5 3 3600 20090924111500 20090821111500 30899 example.com. pYGxVLsWUvOp1wSf0iwPap+JnECfC5GAm1lRqy3YEqecNGld7U7x/5Imo3CerbdZrVptUQs2oH0lcjwYJXMnsw== ;{id = 30899}
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. 3600 IN NS ns.example.com.
|
||||||
|
example.com. 3600 IN RRSIG NS 5 2 3600 20090924111500 20090821111500 30899 example.com. J5wxRq0jgwQL6yy530kvo9cHqNAUHV8IF4dvaYZL0bNraO2Oe6dVXqlJl4+cxNHI2TMsstwFPr2Zz8tv6Az2mQ== ;{id = 30899}
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ns.example.com. 3600 IN A 1.2.3.4
|
||||||
|
ns.example.com. 3600 IN RRSIG A 5 3 3600 20090924111500 20090821111500 30899 example.com. JsXbS18oyc0zkVaOWGSFdIQuOsZKflT0GraT9afDPoWLCgH4ApF7jNgfJV7Pqy1sTBRajME5IUAhpANwGBuW4A== ;{id = 30899}
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN DNSKEY
|
||||||
|
SECTION ANSWER
|
||||||
|
; KSK 1
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
; ZSK 1
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (ksk), size = 512b}
|
||||||
|
; signatures
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20090924111500 20090821111500 30899 example.com. b/HK231jIQLX8IhlZfup3r0yhpXaasbPE6LzxoEVVvWaTZWcLmeV8jDIcn0qO7Yvs7bIJN20lwVAV0GcHH3hWQ== ;{id = 30899}
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20090924111500 20090821111500 55582 example.com. PCHme1QLoULxqjhg5tMlpR0qJlBfstEUVq18TtNoKQe9le1YhJ9caheXcTWoK+boLhXxg9u6Yyvq8FboQh0OjA== ;{id = 55582}
|
||||||
|
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; set date/time to Aug 24 09:46:40 (2009).
|
||||||
|
STEP 5 TIME_PASSES ELAPSE 1251100000
|
||||||
|
STEP 6 ASSIGN t0 = ${time}
|
||||||
|
STEP 7 ASSIGN probe = ${range 3200 ${timeout} 3600}
|
||||||
|
|
||||||
|
; the auto probing should have been done now.
|
||||||
|
STEP 8 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
|
||||||
|
STEP 10 QUERY
|
||||||
|
ENTRY_BEGIN
|
||||||
|
REPLY RD DO
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
STEP 20 CHECK_ANSWER
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH all
|
||||||
|
REPLY QR RD RA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
; The autotrust anchor was probed due to the query.
|
||||||
|
|
||||||
|
STEP 30 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
; wait and see if autotrust probes (the unchanged) domain again.
|
||||||
|
STEP 40 TIME_PASSES EVAL ${$probe}
|
||||||
|
|
||||||
|
STEP 50 TRAFFIC
|
||||||
|
|
||||||
|
STEP 65 ASSIGN probe2 = ${range 3200 ${timeout} 3600}
|
||||||
|
|
||||||
|
STEP 70 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
SCENARIO_END
|
||||||
166
testdata/autotrust_init_failsig.rpl
vendored
Normal file
166
testdata/autotrust_init_failsig.rpl
vendored
Normal file
|
|
@ -0,0 +1,166 @@
|
||||||
|
; config options
|
||||||
|
server:
|
||||||
|
target-fetch-policy: "0 0 0 0 0"
|
||||||
|
log-time-ascii: yes
|
||||||
|
stub-zone:
|
||||||
|
name: "."
|
||||||
|
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
|
||||||
|
; initial content (say from dig example.com DNSKEY > example.com.key)
|
||||||
|
AUTOTRUST_FILE example.com
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
AUTOTRUST_END
|
||||||
|
CONFIG_END
|
||||||
|
|
||||||
|
SCENARIO_BEGIN Test autotrust with failed signature initial trust anchor
|
||||||
|
|
||||||
|
; K-ROOT
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 193.0.14.129
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
. IN NS
|
||||||
|
SECTION ANSWER
|
||||||
|
. IN NS k.root-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
k.root-servers.net IN A 193.0.14.129
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
com. IN NS a.gtld-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
a.gtld-servers.net. IN A 192.5.6.30
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; a.gtld-servers.net.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 192.5.6.30
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. IN NS ns.example.com.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ns.example.com. IN A 1.2.3.4
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; ns.example.com.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 1.2.3.4
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
ns.example.com. IN AAAA
|
||||||
|
SECTION ANSWER
|
||||||
|
ns.example.com. IN NSEC nugget.example.com. A NSEC RRSIG
|
||||||
|
ns.example.com. 3600 IN RRSIG NSEC 5 3 3600 20090924111500 20090821111500 30899 example.com. WRUQ5d5aBO5AXbvnfCd0AWfKGvQIuAjT2qydGkUIaLZaiP4nj+JdquEy1nGvBwYQ9gWyP7b6C6UGrUnVcNBpcw== ;{id = 30899}
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. 3600 IN NS ns.example.com.
|
||||||
|
example.com. 3600 IN RRSIG NS 5 2 3600 20090924111500 20090821111500 30899 example.com. J5wxRq0jgwQL6yy530kvo9cHqNAUHV8IF4dvaYZL0bNraO2Oe6dVXqlJl4+cxNHI2TMsstwFPr2Zz8tv6Az2mQ== ;{id = 30899}
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
www.example.com. 3600 IN A 10.20.30.40
|
||||||
|
www.example.com. 3600 IN RRSIG A 5 3 3600 20090924111500 20090821111500 30899 example.com. pYGxVLsWUvOp1wSf0iwPap+JnECfC5GAm1lRqy3YEqecNGld7U7x/5Imo3CerbdZrVptUQs2oH0lcjwYJXMnsw== ;{id = 30899}
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. 3600 IN NS ns.example.com.
|
||||||
|
example.com. 3600 IN RRSIG NS 5 2 3600 20090924111500 20090821111500 30899 example.com. J5wxRq0jgwQL6yy530kvo9cHqNAUHV8IF4dvaYZL0bNraO2Oe6dVXqlJl4+cxNHI2TMsstwFPr2Zz8tv6Az2mQ== ;{id = 30899}
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ns.example.com. 3600 IN A 1.2.3.4
|
||||||
|
ns.example.com. 3600 IN RRSIG A 5 3 3600 20090924111500 20090821111500 30899 example.com. JsXbS18oyc0zkVaOWGSFdIQuOsZKflT0GraT9afDPoWLCgH4ApF7jNgfJV7Pqy1sTBRajME5IUAhpANwGBuW4A== ;{id = 30899}
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN DNSKEY
|
||||||
|
SECTION ANSWER
|
||||||
|
; KSK 1
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
; ZSK 1
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (ksk), size = 512b}
|
||||||
|
; signatures
|
||||||
|
; changed the date in signatures from 20090924111500 20090821111500
|
||||||
|
; to make them fail.
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20090101010000 20090101010000 30899 example.com. b/HK231jIQLX8IhlZfup3r0yhpXaasbPE6LzxoEVVvWaTZWcLmeV8jDIcn0qO7Yvs7bIJN20lwVAV0GcHH3hWQ== ;{id = 30899}
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20090101010000 20090101010000 55582 example.com. PCHme1QLoULxqjhg5tMlpR0qJlBfstEUVq18TtNoKQe9le1YhJ9caheXcTWoK+boLhXxg9u6Yyvq8FboQh0OjA== ;{id = 55582}
|
||||||
|
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; set date/time to Aug 24 09:46:40 (2009).
|
||||||
|
STEP 5 TIME_PASSES ELAPSE 1251100000
|
||||||
|
STEP 6 ASSIGN t0 = ${time}
|
||||||
|
STEP 7 ASSIGN probe = ${range 3200 ${timeout} 3600}
|
||||||
|
|
||||||
|
; the auto probing should have been done now.
|
||||||
|
STEP 8 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
|
||||||
|
STEP 10 QUERY
|
||||||
|
ENTRY_BEGIN
|
||||||
|
REPLY RD DO
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
STEP 20 CHECK_ANSWER
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH all
|
||||||
|
REPLY QR RD RA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
; The autotrust anchor was probed due to the query.
|
||||||
|
|
||||||
|
STEP 30 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
; wait and see if autotrust probes (the unchanged) domain again.
|
||||||
|
STEP 40 TIME_PASSES EVAL ${$probe}
|
||||||
|
|
||||||
|
STEP 50 TRAFFIC
|
||||||
|
|
||||||
|
STEP 65 ASSIGN probe2 = ${range 3200 ${timeout} 3600}
|
||||||
|
|
||||||
|
STEP 70 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 256 3 5 AQPQ41chR9DEHt/aIzIFAqanbDlRflJoRs5yz1jFsoRIT7dWf0r+PeDuewdxkszNH6wnU4QL8pfKFRh5PIYVBLK3 ;{id = 30899 (zsk), size = 512b}
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
SCENARIO_END
|
||||||
148
testdata/autotrust_probefail.rpl
vendored
Normal file
148
testdata/autotrust_probefail.rpl
vendored
Normal file
|
|
@ -0,0 +1,148 @@
|
||||||
|
; config options
|
||||||
|
server:
|
||||||
|
target-fetch-policy: "0 0 0 0 0"
|
||||||
|
log-time-ascii: yes
|
||||||
|
stub-zone:
|
||||||
|
name: "."
|
||||||
|
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
|
||||||
|
AUTOTRUST_FILE example.com
|
||||||
|
; autotrust trust anchor file
|
||||||
|
;;id: example.com. 1
|
||||||
|
;;last_queried: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;last_success: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;next_probe_time: 1258967360 ;;Mon Nov 23 10:09:20 2009
|
||||||
|
;;query_failed: 0
|
||||||
|
;;query_interval: 5400
|
||||||
|
;;retry_time: 3600
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8= ;{id = 16486 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
AUTOTRUST_END
|
||||||
|
CONFIG_END
|
||||||
|
|
||||||
|
SCENARIO_BEGIN Test autotrust with probe failure
|
||||||
|
|
||||||
|
; K-ROOT
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 193.0.14.129
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
. IN NS
|
||||||
|
SECTION ANSWER
|
||||||
|
. IN NS k.root-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
k.root-servers.net IN A 193.0.14.129
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
com. IN NS a.gtld-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
a.gtld-servers.net. IN A 192.5.6.30
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; a.gtld-servers.net.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 192.5.6.30
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. IN NS ns.example.com.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ns.example.com. IN A 1.2.3.4
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; ns.example.com.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 1.2.3.4
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
ns.example.com. IN AAAA
|
||||||
|
SECTION ANSWER
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN DNSKEY
|
||||||
|
SECTION ANSWER
|
||||||
|
|
||||||
|
; revoked keys
|
||||||
|
example.com. 10800 IN DNSKEY 385 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55710 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 385 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8= ;{id = 16614 (ksk), size = 512b}
|
||||||
|
; signatures
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20091124111500 20091018111500 55710 example.com. zOSlB1iwtlP2lum1RK0WoDQrMVj0JKwk2E5Mu1okzV38hAx3Xm9IGMK6WrNkVVLmx4OkhYmdPVA95jVsFpwLMw== ;{id = 55710}
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20091124111500 20091018111500 16614 example.com. qP49cCYP3lvNnLBYty/JxAwHqBIGjpup5zQ7qpjPnaZpBb/TlpOhY17LBZrqD86VvBbEVz5tkxC9UrCy85ePDQ== ;{id = 16614}
|
||||||
|
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
www.example.com. IN A 10.20.30.40
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; set date/time to Mon Nov 23 10:46:40 2009
|
||||||
|
STEP 5 TIME_PASSES EVAL ${1258962400 + 7200}
|
||||||
|
STEP 6 TRAFFIC ; do the probe
|
||||||
|
STEP 7 ASSIGN t0 = ${time}
|
||||||
|
STEP 8 ASSIGN probe0 = ${range 3200 ${timeout} 3600}
|
||||||
|
STEP 9 ASSIGN tp = ${1258962400}
|
||||||
|
|
||||||
|
; the auto probing should have been done now.
|
||||||
|
STEP 11 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
; autotrust trust anchor file
|
||||||
|
;;id: example.com. 1
|
||||||
|
;;last_queried: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;last_success: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;next_probe_time: 1258967360 ;;Mon Nov 23 10:09:20 2009
|
||||||
|
;;query_failed: 0
|
||||||
|
;;query_interval: 5400
|
||||||
|
;;retry_time: 3600
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8= ;{id = 16486 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
STEP 20 QUERY
|
||||||
|
ENTRY_BEGIN
|
||||||
|
REPLY RD DO
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
STEP 30 CHECK_ANSWER
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH all
|
||||||
|
REPLY QR RD RA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
SCENARIO_END
|
||||||
149
testdata/autotrust_probefailsig.rpl
vendored
Normal file
149
testdata/autotrust_probefailsig.rpl
vendored
Normal file
|
|
@ -0,0 +1,149 @@
|
||||||
|
; config options
|
||||||
|
server:
|
||||||
|
target-fetch-policy: "0 0 0 0 0"
|
||||||
|
log-time-ascii: yes
|
||||||
|
stub-zone:
|
||||||
|
name: "."
|
||||||
|
stub-addr: 193.0.14.129 # K.ROOT-SERVERS.NET.
|
||||||
|
AUTOTRUST_FILE example.com
|
||||||
|
; autotrust trust anchor file
|
||||||
|
;;id: example.com. 1
|
||||||
|
;;last_queried: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;last_success: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;next_probe_time: 1258967360 ;;Mon Nov 23 10:09:20 2009
|
||||||
|
;;query_failed: 0
|
||||||
|
;;query_interval: 5400
|
||||||
|
;;retry_time: 3600
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8= ;{id = 16486 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
AUTOTRUST_END
|
||||||
|
CONFIG_END
|
||||||
|
|
||||||
|
SCENARIO_BEGIN Test autotrust with probe signature failure
|
||||||
|
|
||||||
|
; K-ROOT
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 193.0.14.129
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
. IN NS
|
||||||
|
SECTION ANSWER
|
||||||
|
. IN NS k.root-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
k.root-servers.net IN A 193.0.14.129
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
com. IN NS a.gtld-servers.net.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
a.gtld-servers.net. IN A 192.5.6.30
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; a.gtld-servers.net.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 192.5.6.30
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN NS
|
||||||
|
SECTION AUTHORITY
|
||||||
|
example.com. IN NS ns.example.com.
|
||||||
|
SECTION ADDITIONAL
|
||||||
|
ns.example.com. IN A 1.2.3.4
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; ns.example.com.
|
||||||
|
RANGE_BEGIN 0 100
|
||||||
|
ADDRESS 1.2.3.4
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
ns.example.com. IN AAAA
|
||||||
|
SECTION ANSWER
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode qname qtype
|
||||||
|
ADJUST copy_id
|
||||||
|
REPLY QR AA
|
||||||
|
SECTION QUESTION
|
||||||
|
example.com. IN DNSKEY
|
||||||
|
SECTION ANSWER
|
||||||
|
|
||||||
|
; revoked keys
|
||||||
|
example.com. 10800 IN DNSKEY 385 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55710 (ksk), size = 512b}
|
||||||
|
example.com. 10800 IN DNSKEY 385 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8= ;{id = 16614 (ksk), size = 512b}
|
||||||
|
; signatures
|
||||||
|
; were edited from 20091124111500 20091018111500 to make them fail.
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20090101011500 20090101011500 55710 example.com. zOSlB1iwtlP2lum1RK0WoDQrMVj0JKwk2E5Mu1okzV38hAx3Xm9IGMK6WrNkVVLmx4OkhYmdPVA95jVsFpwLMw== ;{id = 55710}
|
||||||
|
example.com. 10800 IN RRSIG DNSKEY 5 2 10800 20090101011500 20090101011500 16614 example.com. qP49cCYP3lvNnLBYty/JxAwHqBIGjpup5zQ7qpjPnaZpBb/TlpOhY17LBZrqD86VvBbEVz5tkxC9UrCy85ePDQ== ;{id = 16614}
|
||||||
|
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH opcode subdomain
|
||||||
|
ADJUST copy_id copy_query
|
||||||
|
REPLY QR
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
www.example.com. IN A 10.20.30.40
|
||||||
|
ENTRY_END
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
RANGE_END
|
||||||
|
|
||||||
|
; set date/time to Mon Nov 23 10:46:40 2009
|
||||||
|
STEP 5 TIME_PASSES EVAL ${1258962400 + 7200}
|
||||||
|
STEP 6 TRAFFIC ; do the probe
|
||||||
|
STEP 7 ASSIGN t0 = ${time}
|
||||||
|
STEP 8 ASSIGN probe0 = ${range 3200 ${timeout} 3600}
|
||||||
|
STEP 9 ASSIGN tp = ${1258962400}
|
||||||
|
|
||||||
|
; the auto probing should have been done now.
|
||||||
|
STEP 11 CHECK_AUTOTRUST example.com
|
||||||
|
FILE_BEGIN
|
||||||
|
; autotrust trust anchor file
|
||||||
|
;;id: example.com. 1
|
||||||
|
;;last_queried: ${$t0} ;;${ctime $t0}
|
||||||
|
;;last_success: 1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
;;next_probe_time: ${$t0+$probe0} ;;${ctime $t0+$probe0}
|
||||||
|
;;query_failed: 1
|
||||||
|
;;query_interval: 5400
|
||||||
|
;;retry_time: 3600
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAc3Z5DQDJpH4oPdNtC4BUQHk50XMD+dHr4r8psHmivIa83hxR5CRgCtd9sENCW9Ae8OIO19xw9t/RPaEAqQa+OE= ;{id = 55582 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
example.com. 10800 IN DNSKEY 257 3 5 AwEAAas/cAhCFXvBUgTSNZCvQp0pLx1dY+7rXR0hH4/3EUgWmsmbYUpI1qD0xhwKD/oYGEwAm291fyWJ9c0oVxXDEK8= ;{id = 16486 (ksk), size = 512b} ;;state=2 [ VALID ] ;;count=0 ;;lastchange=1258962400 ;;Mon Nov 23 08:46:40 2009
|
||||||
|
FILE_END
|
||||||
|
|
||||||
|
STEP 20 QUERY
|
||||||
|
ENTRY_BEGIN
|
||||||
|
REPLY RD DO
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
STEP 30 CHECK_ANSWER
|
||||||
|
ENTRY_BEGIN
|
||||||
|
MATCH all
|
||||||
|
REPLY QR RD RA SERVFAIL
|
||||||
|
SECTION QUESTION
|
||||||
|
www.example.com. IN A
|
||||||
|
SECTION ANSWER
|
||||||
|
ENTRY_END
|
||||||
|
|
||||||
|
SCENARIO_END
|
||||||
|
|
@ -1664,6 +1664,7 @@ int autr_process_prime(struct module_env* env, struct val_env* ve,
|
||||||
/* see if time alone makes some keys valid */
|
/* see if time alone makes some keys valid */
|
||||||
autr_holddown_exceed(env, tp, &changed);
|
autr_holddown_exceed(env, tp, &changed);
|
||||||
if(changed) {
|
if(changed) {
|
||||||
|
verbose(VERB_ALGO, "autotrust: morekeys, reassemble");
|
||||||
if(!autr_assemble(tp)) {
|
if(!autr_assemble(tp)) {
|
||||||
log_err("malloc failure assembling autotrust keys");
|
log_err("malloc failure assembling autotrust keys");
|
||||||
return 1; /* unchanged */
|
return 1; /* unchanged */
|
||||||
|
|
@ -1672,13 +1673,16 @@ int autr_process_prime(struct module_env* env, struct val_env* ve,
|
||||||
/* did we get any data? */
|
/* did we get any data? */
|
||||||
if(!dnskey_rrset) {
|
if(!dnskey_rrset) {
|
||||||
verbose(VERB_ALGO, "autotrust: no dnskey rrset");
|
verbose(VERB_ALGO, "autotrust: no dnskey rrset");
|
||||||
tp->autr->query_failed += 1;
|
/* no update of query_failed, because then we would have
|
||||||
autr_write_file(env, tp);
|
* to write to disk. But we cannot because we maybe are
|
||||||
|
* still 'initialising' with DS records, that we cannot write
|
||||||
|
* in the full format (which only contains KSKs). */
|
||||||
return 1; /* trust point exists */
|
return 1; /* trust point exists */
|
||||||
}
|
}
|
||||||
/* check for revoked keys to remove immediately */
|
/* check for revoked keys to remove immediately */
|
||||||
check_contains_revoked(env, ve, tp, dnskey_rrset, &changed);
|
check_contains_revoked(env, ve, tp, dnskey_rrset, &changed);
|
||||||
if(changed) {
|
if(changed) {
|
||||||
|
verbose(VERB_ALGO, "autotrust: revokedkeys, reassemble");
|
||||||
if(!autr_assemble(tp)) {
|
if(!autr_assemble(tp)) {
|
||||||
log_err("malloc failure assembling autotrust keys");
|
log_err("malloc failure assembling autotrust keys");
|
||||||
return 1; /* unchanged */
|
return 1; /* unchanged */
|
||||||
|
|
@ -1694,8 +1698,12 @@ int autr_process_prime(struct module_env* env, struct val_env* ve,
|
||||||
/* verify the dnskey rrset and see if it is valid. */
|
/* verify the dnskey rrset and see if it is valid. */
|
||||||
if(!verify_dnskey(env, ve, tp, dnskey_rrset)) {
|
if(!verify_dnskey(env, ve, tp, dnskey_rrset)) {
|
||||||
verbose(VERB_ALGO, "autotrust: dnskey did not verify.");
|
verbose(VERB_ALGO, "autotrust: dnskey did not verify.");
|
||||||
|
/* only increase failure count if this is not the first prime,
|
||||||
|
* this means there was a previous succesful probe */
|
||||||
|
if(tp->autr->last_success) {
|
||||||
tp->autr->query_failed += 1;
|
tp->autr->query_failed += 1;
|
||||||
autr_write_file(env, tp);
|
autr_write_file(env, tp);
|
||||||
|
}
|
||||||
if(changed) {
|
if(changed) {
|
||||||
verbose(VERB_ALGO, "autotrust: changed, reassemble");
|
verbose(VERB_ALGO, "autotrust: changed, reassemble");
|
||||||
if(!autr_assemble(tp)) {
|
if(!autr_assemble(tp)) {
|
||||||
|
|
|
||||||
|
|
@ -108,7 +108,10 @@ struct autr_point_data {
|
||||||
/** when to retry if failed */
|
/** when to retry if failed */
|
||||||
uint32_t retry_time;
|
uint32_t retry_time;
|
||||||
|
|
||||||
/** how many times did it fail */
|
/**
|
||||||
|
* How many times did it fail. diagnostic only (has no effect).
|
||||||
|
* Only updated if there was a dnskey rrset that failed to verify.
|
||||||
|
*/
|
||||||
uint8_t query_failed;
|
uint8_t query_failed;
|
||||||
/** true if the trust point has been revoked */
|
/** true if the trust point has been revoked */
|
||||||
uint8_t revoked;
|
uint8_t revoked;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue