nameserver: correct owner of answered CNAME from wildcard expansion

fixes #715

diff --git a/src/knot/nameserver/process_query.c b/src/knot/nameserver/process_query.c
index 03a8152b56d85dcba0085078b62b0f4bdd2df862..87da3b2884679b26c7d3bdc1ecc076feb388357e 100644 (file)
--- a/src/knot/nameserver/process_query.c
+++ b/src/knot/nameserver/process_query.c
@@ -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;

diff --git a/tests-extra/data/flags.zone b/tests-extra/data/flags.zone
index a243803189b414cedd469fc03fc5e3c5ead82a43..92b69700072b3d90d32895411696a3518e6b2c2a 100644 (file)
--- a/tests-extra/data/flags.zone
+++ b/tests-extra/data/flags.zone
@@ -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
 

diff --git a/tests-extra/tests/basic/query/test.py b/tests-extra/tests/basic/query/test.py
index 4543d7460161e8f71dec09b69ace6c70d9890f05..19f8c963126618ff76aafdd89ad9b99051e15873 100644 (file)
--- a/tests-extra/tests/basic/query/test.py
+++ b/tests-extra/tests/basic/query/test.py
@@ -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)