From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 3 Jul 2025 12:05:05 +0000 (+0200)
Subject: Merge pull request #15780 from rgacogne/ddist20-backport-15751
X-Git-Tag: dnsdist-2.0.0-rc1~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f800e786463e38071934d0bfc9ed705945948b5f;p=thirdparty%2Fpdns.git

Merge pull request #15780 from rgacogne/ddist20-backport-15751

dnsdist-2.0.x: Backport to 15751 - Error on unsupported backend protocols from YAML
---

f800e786463e38071934d0bfc9ed705945948b5f
diff --cc pdns/dnsdistdist/dnsdist-configuration-yaml.cc
index 0f1ebd5a85,3cb801547d..3b27cd5d4b
--- a/pdns/dnsdistdist/dnsdist-configuration-yaml.cc
+++ b/pdns/dnsdistdist/dnsdist-configuration-yaml.cc
@@@ -448,8 -448,18 +448,19 @@@ static std::shared_ptr<DownstreamState
    const auto& tlsConf = config.tls;
    auto protocol = boost::to_lower_copy(std::string(config.protocol));
    if (protocol == "dot" || protocol == "doh") {
+ #if !defined(HAVE_DNS_OVER_TLS)
+     if (protocol == "dot") {
+       throw std::runtime_error("Backend " + std::string(config.address) + " is configured to use DNS over TLS but DoT support is not available");
+     }
+ #endif /* HAVE_DNS_OVER_TLS */
+ #if !defined(HAVE_DNS_OVER_HTTPS)
+     if (protocol == "doh") {
+       throw std::runtime_error("Backend " + std::string(config.address) + " is configured to use DNS over HTTPS but DoH support is not available");
+     }
+ #endif /* HAVE_DNS_OVER_HTTPS */
+ 
      backendConfig.d_tlsParams.d_provider = std::string(tlsConf.provider);
 +    boost::algorithm::to_lower(backendConfig.d_tlsParams.d_provider);
      backendConfig.d_tlsParams.d_ciphers = std::string(tlsConf.ciphers);
      backendConfig.d_tlsParams.d_ciphers13 = std::string(tlsConf.ciphers_tls_13);
      backendConfig.d_tlsParams.d_caStore = std::string(tlsConf.ca_store);