@@ -102,7 +102,6 @@ static int
102102testframe_init (struct module_env * env , struct cachedb_env * cachedb_env )
103103{
104104 struct testframe_moddata * d ;
105- (void )env ;
106105 verbose (VERB_ALGO , "testframe_init" );
107106 d = (struct testframe_moddata * )calloc (1 ,
108107 sizeof (struct testframe_moddata ));
@@ -111,6 +110,15 @@ testframe_init(struct module_env* env, struct cachedb_env* cachedb_env)
111110 log_err ("out of memory" );
112111 return 0 ;
113112 }
113+ /* Register an EDNS option (65534) to bypass the worker cache lookup
114+ * for testing */
115+ if (!edns_register_option (LDNS_EDNS_UNBOUND_CACHEDB_TESTFRAME_TEST ,
116+ 1 /* bypass cache */ ,
117+ 0 /* no aggregation */ , env )) {
118+ log_err ("testframe_init, could not register test opcode" );
119+ free (d );
120+ return 0 ;
121+ }
114122 lock_basic_init (& d -> lock );
115123 lock_protect (& d -> lock , d , sizeof (* d ));
116124 return 1 ;
@@ -218,6 +226,8 @@ static int
218226cachedb_apply_cfg (struct cachedb_env * cachedb_env , struct config_file * cfg )
219227{
220228 const char * backend_str = cfg -> cachedb_backend ;
229+ if (!backend_str || * backend_str == 0 )
230+ return 1 ;
221231 cachedb_env -> backend = cachedb_find_backend (backend_str );
222232 if (!cachedb_env -> backend ) {
223233 log_err ("cachedb: cannot find backend name '%s'" , backend_str );
@@ -228,7 +238,7 @@ cachedb_apply_cfg(struct cachedb_env* cachedb_env, struct config_file* cfg)
228238 return 1 ;
229239}
230240
231- int
241+ int
232242cachedb_init (struct module_env * env , int id )
233243{
234244 struct cachedb_env * cachedb_env = (struct cachedb_env * )calloc (1 ,
@@ -255,31 +265,28 @@ cachedb_init(struct module_env* env, int id)
255265 return 0 ;
256266 }
257267 cachedb_env -> enabled = 1 ;
258- if (env -> cfg -> serve_expired_reply_ttl )
268+ if (env -> cfg -> serve_expired && env -> cfg -> serve_expired_reply_ttl )
259269 log_warn (
260270 "cachedb: serve-expired-reply-ttl is set but not working for data "
261- "originating from the external cache; 0 TLL is used for those." );
262- if (env -> cfg -> serve_expired_client_timeout )
271+ "originating from the external cache; 0 TTL is used for those." );
272+ if (env -> cfg -> serve_expired && env -> cfg -> serve_expired_client_timeout )
263273 log_warn (
264274 "cachedb: serve-expired-client-timeout is set but not working for "
265275 "data originating from the external cache; expired data are used "
266276 "in the reply without first trying to refresh the data." );
267277 return 1 ;
268278}
269279
270- void
280+ void
271281cachedb_deinit (struct module_env * env , int id )
272282{
273283 struct cachedb_env * cachedb_env ;
274284 if (!env || !env -> modinfo [id ])
275285 return ;
276286 cachedb_env = (struct cachedb_env * )env -> modinfo [id ];
277- /* free contents */
278- /* TODO */
279287 if (cachedb_env -> enabled ) {
280288 (* cachedb_env -> backend -> deinit )(env , cachedb_env );
281289 }
282-
283290 free (cachedb_env );
284291 env -> modinfo [id ] = NULL ;
285292}
@@ -406,6 +413,14 @@ prep_data(struct module_qstate* qstate, struct sldns_buffer* buf)
406413 if (qstate -> return_msg -> rep -> ttl == 0 &&
407414 !qstate -> env -> cfg -> serve_expired )
408415 return 0 ;
416+
417+ /* The EDE is added to the out-list so it is encoded in the cached message */
418+ if (qstate -> env -> cfg -> ede && qstate -> return_msg -> rep -> reason_bogus != LDNS_EDE_NONE ) {
419+ edns_opt_list_append_ede (& edns .opt_list_out , qstate -> env -> scratch ,
420+ qstate -> return_msg -> rep -> reason_bogus ,
421+ qstate -> return_msg -> rep -> reason_bogus_str );
422+ }
423+
409424 if (verbosity >= VERB_ALGO )
410425 log_dns_msg ("cachedb encoding" , & qstate -> return_msg -> qinfo ,
411426 qstate -> return_msg -> rep );
@@ -502,6 +517,7 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf)
502517{
503518 struct msg_parse * prs ;
504519 struct edns_data edns ;
520+ struct edns_option * ede ;
505521 uint64_t timestamp , expiry ;
506522 time_t adjust ;
507523 size_t lim = sldns_buffer_limit (buf );
@@ -539,6 +555,24 @@ parse_data(struct module_qstate* qstate, struct sldns_buffer* buf)
539555 if (!qstate -> return_msg )
540556 return 0 ;
541557
558+ /* We find the EDE in the in-list after parsing */
559+ if (qstate -> env -> cfg -> ede &&
560+ (ede = edns_opt_list_find (edns .opt_list_in , LDNS_EDNS_EDE ))) {
561+ if (ede -> opt_len >= 2 ) {
562+ qstate -> return_msg -> rep -> reason_bogus =
563+ sldns_read_uint16 (ede -> opt_data );
564+ }
565+ /* allocate space and store the error string and it's size */
566+ if (ede -> opt_len > 2 ) {
567+ size_t ede_len = ede -> opt_len - 2 ;
568+ qstate -> return_msg -> rep -> reason_bogus_str = regional_alloc (
569+ qstate -> region , sizeof (char ) * (ede_len + 1 ));
570+ memcpy (qstate -> return_msg -> rep -> reason_bogus_str ,
571+ ede -> opt_data + 2 , ede_len );
572+ qstate -> return_msg -> rep -> reason_bogus_str [ede_len ] = 0 ;
573+ }
574+ }
575+
542576 qstate -> return_rcode = LDNS_RCODE_NOERROR ;
543577
544578 /* see how much of the TTL expired, and remove it */
@@ -630,11 +664,15 @@ cachedb_extcache_store(struct module_qstate* qstate, struct cachedb_env* ie)
630664 * See if unbound's internal cache can answer the query
631665 */
632666static int
633- cachedb_intcache_lookup (struct module_qstate * qstate )
667+ cachedb_intcache_lookup (struct module_qstate * qstate , struct cachedb_env * cde )
634668{
635669 uint8_t * dpname = NULL ;
636670 size_t dpnamelen = 0 ;
637671 struct dns_msg * msg ;
672+ /* for testframe bypass this lookup */
673+ if (cde -> backend == & testframe_backend ) {
674+ return 0 ;
675+ }
638676 if (iter_stub_fwd_no_cache (qstate , & qstate -> qinfo ,
639677 & dpname , & dpnamelen ))
640678 return 0 ; /* no cache for these queries */
@@ -693,6 +731,7 @@ cachedb_handle_query(struct module_qstate* qstate,
693731 struct cachedb_qstate * ATTR_UNUSED (iq ),
694732 struct cachedb_env * ie , int id )
695733{
734+ qstate -> is_cachedb_answer = 0 ;
696735 /* check if we are enabled, and skip if so */
697736 if (!ie -> enabled ) {
698737 /* pass request to next module */
@@ -709,7 +748,7 @@ cachedb_handle_query(struct module_qstate* qstate,
709748
710749 /* lookup inside unbound's internal cache.
711750 * This does not look for expired entries. */
712- if (cachedb_intcache_lookup (qstate )) {
751+ if (cachedb_intcache_lookup (qstate , ie )) {
713752 if (verbosity >= VERB_ALGO ) {
714753 if (qstate -> return_msg -> rep )
715754 log_dns_msg ("cachedb internal cache lookup" ,
@@ -746,6 +785,7 @@ cachedb_handle_query(struct module_qstate* qstate,
746785 qstate -> ext_state [id ] = module_wait_module ;
747786 return ;
748787 }
788+ qstate -> is_cachedb_answer = 1 ;
749789 /* we are done with the query */
750790 qstate -> ext_state [id ] = module_finished ;
751791 return ;
@@ -768,12 +808,18 @@ static void
768808cachedb_handle_response (struct module_qstate * qstate ,
769809 struct cachedb_qstate * ATTR_UNUSED (iq ), struct cachedb_env * ie , int id )
770810{
811+ qstate -> is_cachedb_answer = 0 ;
771812 /* check if we are not enabled or instructed to not cache, and skip */
772813 if (!ie -> enabled || qstate -> no_cache_store ) {
773814 /* we are done with the query */
774815 qstate -> ext_state [id ] = module_finished ;
775816 return ;
776817 }
818+ if (qstate -> env -> cfg -> cachedb_no_store ) {
819+ /* do not store the item in the external cache */
820+ qstate -> ext_state [id ] = module_finished ;
821+ return ;
822+ }
777823
778824 /* store the item into the backend cache */
779825 cachedb_extcache_store (qstate , ie );
0 commit comments