From: Diego Fronza <diego@isc.org>
Date: Thu, 13 Feb 2020 23:17:13 +0000 (-0300)
Subject: Fixed rebinding protection bug when using forwarder setups
X-Git-Tag: v9.17.1~8^2~3
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=cf7b0de1eb98df64573002ada3d604a1beac2662;p=thirdparty%2Fbind9.git

Fixed rebinding protection bug when using forwarder setups

BIND wasn't honoring option "deny-answer-aliases" when configured to
forward queries.

Before the fix it was possible for nameservers listed in "forwarders"
option to return CNAME answers pointing to unrelated domains of the
original query, which could be used as a vector for rebinding attacks.

The fix ensures that BIND apply filters even if configured as a forwarder
instance.

(cherry picked from commit af6a4de3d5ad6c1967173facf366e6c86b3ffc28)
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 51bc368bf66..645a3e12cb0 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -7115,8 +7115,13 @@ is_answertarget_allowed(fetchctx_t *fctx, dns_name_t *qname, dns_name_t *rname,
 
 	/*
 	 * If the target name is a subdomain of the search domain, allow it.
+	 *
+	 * Note that if BIND is configured as a forwarding DNS server, the
+	 * search domain will always match the root domain ("."), so we
+	 * must also check whether forwarding is enabled so that filters
+	 * can be applied; see GL #1574.
 	 */
-	if (dns_name_issubdomain(tname, &fctx->domain)) {
+	if (!fctx->forwarding && dns_name_issubdomain(tname, &fctx->domain)) {
 		return (true);
 	}