WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-11 12:27:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

add step in rpl to verify the updated server cookie and fix bug with unupdated rdlen

Browse Source
This commit is contained in:
TCY16
2022-06-20 15:41:11 +02:00
parent 303aa68b58
commit aebf1db116
4 changed files with 119 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iterator/iterator.c
+25 -17
View File
@@ -3825,25 +3825,33 @@ process_response(struct module_qstate* qstate, struct iter_qstate* iq,
}
/* handle the upstream response cookie if enabled*/
if(qstate->env->cfg->upstream_cookies &&
(cookie = edns_list_get_option(edns.opt_list_in, LDNS_EDNS_COOKIE))) {
/* verify this is a 'complete cookie' (client+server) (RFC9018) with
* the length and store the complete cookie in the infra_cache. Do
* nothing when the cookie is already known and update when the
* server cookie changed*/
if (cookie->opt_len == 24 &&
infra_set_server_cookie(qstate->env->infra_cache,
&qstate->reply->addr, qstate->reply->addrlen,
iq->dp->name, iq->dp->namelen, cookie) >= 0) {
/* log_hex() uses the verbosity levels of verbose() */
log_hex("complete cookie: ", cookie->opt_data,
cookie->opt_len);
if(qstate->env->cfg->upstream_cookies) {
if (edns.opt_list_in &&
(cookie = edns_list_get_option(edns.opt_list_in,
LDNS_EDNS_COOKIE))){
/* verify this is a 'complete cookie' (client+server)
* (RFC9018) with the length and store the complete
* cookie in the infra_cache. Do nothing when the cookie
* is already known and update when the server cookie
* changed */
if (cookie->opt_len == 24 &&
infra_set_server_cookie(qstate->env->infra_cache,
&qstate->reply->addr, qstate->reply->addrlen,
iq->dp->name, iq->dp->namelen, cookie) >= 0) {
/* log_hex() uses the verbosity levels of verbose() */
log_hex("complete cookie: ", cookie->opt_data,
cookie->opt_len);
} else {
log_info("upstream response server cookie is not "
"added to cache; dropping response");
goto handle_it;
}
} else {
log_info("upstream response server cookie is not added to;"
" cache dropping response");
goto handle_it;
//@TODO think about what we do if we did send a cookie
// but did not get one back? for now we log_err()
log_err("upstream has not responded with a cookie");
}
} //@TODO think about what we do if we did send a cookie but did not get one back?
}
/* Copy the edns options we may got from the back end */
if(edns.opt_list_in) {