mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-31 22:45:39 +00:00
Code Issues Releases Wiki Activity

TSIG signed incoming zone transfer works now.

Browse Source
This commit is contained in:
Brian Wellington
2000-04-08 04:42:42 +00:00
parent dc3fc5830a
commit 17e81b39cd
1 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/dns/xfrin.c
View File

@@ -15,7 +15,7 @@
* SOFTWARE. * SOFTWARE.
*/ */
/* $Id: xfrin.c,v 1.61 2000/04/07 22:30:42 gson Exp $ */ /* $Id: xfrin.c,v 1.62 2000/04/08 04:42:42 bwelling Exp $ */
#include <config.h> #include <config.h>
@@ -518,6 +518,7 @@ dns_xfrin_create(dns_zone_t *zone, isc_sockaddr_t *masteraddr,
dns_db_t *db = NULL; dns_db_t *db = NULL;
dns_rdatatype_t xfrtype; dns_rdatatype_t xfrtype;
dns_tsigkey_t *key = NULL; dns_tsigkey_t *key = NULL;
dns_name_t *keyname = NULL;
isc_netaddr_t masterip; isc_netaddr_t masterip;
dns_peer_t *peer = NULL; dns_peer_t *peer = NULL;
int maxtransfersin, maxtransfersperns; int maxtransfersin, maxtransfersperns;
@@ -597,6 +598,20 @@ dns_xfrin_create(dns_zone_t *zone, isc_sockaddr_t *masteraddr,
(void) dns_peer_gettransfers(peer, &maxtransfersperns); (void) dns_peer_gettransfers(peer, &maxtransfersperns);
} }
/*
* Determine if we should attempt to sign the request with TSIG.
*/
if (peer != NULL && dns_peer_getkey(peer, &keyname) == ISC_R_SUCCESS) {
dns_view_t *view = dns_zone_getview(zone);
result = dns_tsigkey_find(&key, keyname, NULL,
view->statickeys);
if (result == ISC_R_NOTFOUND)
result = dns_tsigkey_find(&key, keyname, NULL,
view->dynamickeys);
if (result != ISC_R_SUCCESS && result != ISC_R_NOTFOUND)
goto failure;
}
transferlist = dns_zonemgr_gettransferlist(dns_zone_getmgr(zone)); transferlist = dns_zonemgr_gettransferlist(dns_zone_getmgr(zone));
LOCK(&transferlist->lock); LOCK(&transferlist->lock);
nxfrsin = nxfrsperns = 0; nxfrsin = nxfrsperns = 0;
@@ -1102,6 +1117,13 @@ xfrin_recv_done(isc_task_t *task, isc_event_t *ev) {
return; return;
} }
result = dns_message_checksig(msg, dns_zone_getview(xfr->zone));
if (result != ISC_R_SUCCESS) {
xfrin_log(xfr, ISC_LOG_DEBUG(3), "TSIG check failed: %s",
isc_result_totext(result));
return;
}
for (result = dns_message_firstname(msg, DNS_SECTION_ANSWER); for (result = dns_message_firstname(msg, DNS_SECTION_ANSWER);
result == ISC_R_SUCCESS; result == ISC_R_SUCCESS;
result = dns_message_nextname(msg, DNS_SECTION_ANSWER)) result = dns_message_nextname(msg, DNS_SECTION_ANSWER))