upstream/knot-dns
1
0
Fork 0
mirror of https://gitlab.nic.cz/knot/knot-dns.git synced 2026-06-09 08:33:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wildcard_expansion' into 'master'

Browse source 
Correct owner of answered CNAME from wildcard expansion

Closes #715

See merge request knot/knot-dns!1295
This commit is contained in:
Libor Peltan 2021-05-25 16:09:39 +00:00
commit a4b0f0f95d
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/knot/nameserver/process_query.c
View file

@ -883,8 +883,8 @@ int process_query_put_rr(knot_pkt_t *pkt, knotd_qdata_t *qdata,
/* Wildcard expansion applies only for answers. */
bool expand = false;
if (pkt->current == KNOT_ANSWER) {
/* Expand if RR is wildcard & we didn't query for wildcard. */
expand = (knot_dname_is_wildcard(rr->owner) && !knot_dname_is_wildcard(qdata->name));
/* Expand if RR is wildcard. TRICK: if the asterix node is queried directly, we behave like if wildcard would be expanded. It's the same. */
expand = knot_dname_is_wildcard(rr->owner);
}
int ret = KNOT_EOK;

4
tests-extra/data/flags.zone
View file

@ -104,6 +104,10 @@ sub.*.wildcard A 6.7.8.9
; Wildcard to CNAME
*.wildcard-cname CNAME cname
; CNAME to asterix-leading expansion
wild-cname CNAME *.expanded.wildcard-cname2
*.wildcard-cname2 CNAME *.expanded.wildcard-cname
; Wildcard to delegation
*.wildcard-deleg CNAME cname-ns

8
tests-extra/tests/basic/query/test.py
View file

@ -304,6 +304,14 @@ def query_test(knot, bind, dnssec):
else:
resp.cmp(bind, additional=True)
# Wildcard CNAME with asterisk query
resp = knot.dig("*.a.wildcard-cname.flags", "A", udp=True)
resp.cmp(bind)
# Double wildcard expansion
resp = knot.dig("wild-cname.flags", "TXT", udp=True)
resp.cmp(bind)
# Wildcard leading out
resp = knot.dig("a.wildcard-out.flags", "A", udp=True, dnssec=dnssec)
resp.cmp(bind)