clones/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2024-09-21 06:37:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fix RPZ IP responses with trigger rpz-drop on cache entries, that

Browse Source 
they are dropped.
This commit is contained in:
W.C.A. Wijngaards 2023-05-01 09:26:17 +02:00
parent a50ddd7ab9
commit 70c2b587fc
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/worker.c
View File

@ -566,9 +566,10 @@ apply_respip_action(struct worker* worker, const struct query_info* qinfo,
/* xxx_deny actions mean dropping the reply, unless the original reply
* was redirected to response-ip data. */
if((actinfo.action == respip_deny ||
if(actinfo.action == respip_always_deny ||
((actinfo.action == respip_deny ||
actinfo.action == respip_inform_deny) &&
*encode_repp == rep)
*encode_repp == rep))
*encode_repp = NULL;
/* If address info is returned, it means the action should be an

4
doc/Changelog
View File

@ -1,3 +1,7 @@
1 May 2023: Wouter
- Fix RPZ IP responses with trigger rpz-drop on cache entries, that
they are dropped.
26 April 2023: Philip
- Fix issue #860: Bad interaction with 0 TTL records and serve-expired

17
testdata/rpz_respip.rpl vendored
View File

@ -458,14 +458,29 @@ e. IN AAAA
ENTRY_END
STEP 29 TIME_PASSES ELAPSE 12
; should be dropped, with cache entry too.
STEP 30 QUERY
ENTRY_BEGIN
REPLY RD
SECTION QUESTION
e. IN A
ENTRY_END
STEP 31 QUERY
ENTRY_BEGIN
REPLY RD
SECTION QUESTION
e. IN AAAA
ENTRY_END
STEP 32 TIME_PASSES ELAPSE 12
STEP 33 QUERY
ENTRY_BEGIN
REPLY RD
SECTION QUESTION
y. IN A
ENTRY_END
STEP 31 CHECK_ANSWER
STEP 34 CHECK_ANSWER
ENTRY_BEGIN
MATCH all
REPLY QR TC RD RA NOERROR