Merge branch '963-dnstap-check-ra-v9_14-v9_11' into 'v9_11'
dnstap: if recursion is not available, log queries as AQ instead of CQ See merge request isc-projects/bind9!1800
This commit is contained in:
@@ -1,3 +1,9 @@
|
||||
5210. [bug] When dnstap is enabled and recursion is not
|
||||
available, incoming queries are now logged
|
||||
as "auth". Previously, this depended on whether
|
||||
recursion was requested by the client, not on
|
||||
whether recursion was available. [GL #963]
|
||||
|
||||
5208. [test] Run valid rdata wire encodings through totext+fromtext
|
||||
and tofmttext+fromtext methods to check these methods.
|
||||
[GL #899]
|
||||
|
||||
+5
-3
@@ -2825,8 +2825,9 @@ client_request(isc_task_t *task, isc_event_t *event) {
|
||||
true) == ISC_R_SUCCESS)
|
||||
ra = true;
|
||||
|
||||
if (ra == true)
|
||||
if (ra == true) {
|
||||
client->attributes |= NS_CLIENTATTR_RA;
|
||||
}
|
||||
|
||||
ns_client_log(client, DNS_LOGCATEGORY_SECURITY, NS_LOGMODULE_CLIENT,
|
||||
ISC_LOG_DEBUG(3), ra ? "recursion available" :
|
||||
@@ -2852,10 +2853,11 @@ client_request(isc_task_t *task, isc_event_t *event) {
|
||||
case dns_opcode_query:
|
||||
CTRACE("query");
|
||||
#ifdef HAVE_DNSTAP
|
||||
if ((client->message->flags & DNS_MESSAGEFLAG_RD) != 0)
|
||||
if (ra && (client->message->flags & DNS_MESSAGEFLAG_RD) != 0) {
|
||||
dtmsgtype = DNS_DTTYPE_CQ;
|
||||
else
|
||||
} else {
|
||||
dtmsgtype = DNS_DTTYPE_AQ;
|
||||
}
|
||||
|
||||
dns_dt_send(view, dtmsgtype, &client->peeraddr,
|
||||
&client->destsockaddr, TCP_CLIENT(client), NULL,
|
||||
|
||||
@@ -131,16 +131,16 @@ status=`expr $status + $ret`
|
||||
|
||||
echo_i "checking AUTH_QUERY message counts"
|
||||
ret=0
|
||||
[ $aq1 -eq 2 ] || {
|
||||
echo_i "ns1 $aq1 exepcted 2"
|
||||
[ $aq1 -eq 3 ] || {
|
||||
echo_i "ns1 $aq1 exepcted 3"
|
||||
ret=1
|
||||
}
|
||||
[ $aq2 -eq 1 ] || {
|
||||
echo_i "ns2 $aq2 expected 1"
|
||||
[ $aq2 -eq 2 ] || {
|
||||
echo_i "ns2 $aq2 expected 2"
|
||||
ret=1
|
||||
}
|
||||
[ $aq3 -eq 0 ] || {
|
||||
echo_i "ns3 $aq3 expected 0"
|
||||
[ $aq3 -eq 1 ] || {
|
||||
echo_i "ns3 $aq3 expected 1"
|
||||
ret=1
|
||||
}
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
@@ -165,16 +165,16 @@ status=`expr $status + $ret`
|
||||
|
||||
echo_i "checking CLIENT_QUERY message counts"
|
||||
ret=0
|
||||
[ $cq1 -eq 1 ] || {
|
||||
echo_i "ns1 $cq1 expected 1"
|
||||
[ $cq1 -eq 0 ] || {
|
||||
echo_i "ns1 $cq1 expected 0"
|
||||
ret=1
|
||||
}
|
||||
[ $cq2 -eq 1 ] || {
|
||||
echo_i "ns2 $cq2 expected 1"
|
||||
[ $cq2 -eq 0 ] || {
|
||||
echo_i "ns2 $cq2 expected 0"
|
||||
ret=1
|
||||
}
|
||||
[ $cq3 -eq 2 ] || {
|
||||
echo_i "ns3 $cq3 expected 2"
|
||||
[ $cq3 -eq 1 ] || {
|
||||
echo_i "ns3 $cq3 expected 1"
|
||||
ret=1
|
||||
}
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
|
||||
Reference in New Issue
Block a user