From ea093692c250aed5a1b0939dd77c9c2825fd7c7d Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 2 Jul 2024 22:18:55 +0200 Subject: [PATCH 1/6] Fix config.h include in opensslsigners --- pdns/opensslsigners.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pdns/opensslsigners.cc b/pdns/opensslsigners.cc index 9b593aa2da7c..91d438dab67b 100644 --- a/pdns/opensslsigners.cc +++ b/pdns/opensslsigners.cc @@ -19,14 +19,13 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ + +#include "config.h" #include "misc.hh" #include #include #include #include -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif #include #ifdef HAVE_LIBCRYPTO_ECDSA #include From c9390aaaf0aa18e994d64c09b166b5b4d83b5f3b Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 2 Jul 2024 22:19:17 +0200 Subject: [PATCH 2/6] Formatting and minor fix in misc.hh --- pdns/misc.cc | 2 +- pdns/misc.hh | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pdns/misc.cc b/pdns/misc.cc index 8b206295177d..29adfc51fa1c 100644 --- a/pdns/misc.cc +++ b/pdns/misc.cc @@ -284,7 +284,7 @@ auto pdns::OpenSSL::error(const std::string& errorMessage) -> std::runtime_error } } #endif - return std::runtime_error(fullErrorMessage); + return std::runtime_error{fullErrorMessage}; } auto pdns::OpenSSL::error(const std::string& componentName, const std::string& errorMessage) -> std::runtime_error diff --git a/pdns/misc.hh b/pdns/misc.hh index 86e620b8f99c..39fdb6c08680 100644 --- a/pdns/misc.hh +++ b/pdns/misc.hh @@ -46,7 +46,17 @@ class DNSName; // Do not change to "using TSIGHashEnum ..." until you know CodeQL does not choke on it -typedef enum { TSIG_MD5, TSIG_SHA1, TSIG_SHA224, TSIG_SHA256, TSIG_SHA384, TSIG_SHA512, TSIG_GSS } TSIGHashEnum; +typedef enum +{ + TSIG_MD5, + TSIG_SHA1, + TSIG_SHA224, + TSIG_SHA256, + TSIG_SHA384, + TSIG_SHA512, + TSIG_GSS, +} TSIGHashEnum; + namespace pdns { /** From e6af64817f2f25fdb2115fa838a7fb5ca6e9fbe9 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 2 Jul 2024 22:19:34 +0200 Subject: [PATCH 3/6] Cleanup dnspacket.cc --- pdns/dnspacket.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pdns/dnspacket.cc b/pdns/dnspacket.cc index b18da82c7b01..471af2a46ef0 100644 --- a/pdns/dnspacket.cc +++ b/pdns/dnspacket.cc @@ -112,9 +112,7 @@ ComboAddress DNSPacket::getRemote() const ComboAddress DNSPacket::getInnerRemote() const { - if (d_inner_remote) - return *d_inner_remote; - return d_remote; + return d_inner_remote ? *d_inner_remote : d_remote; } uint16_t DNSPacket::getRemotePort() const @@ -708,14 +706,12 @@ bool DNSPacket::hasValidEDNSCookie() const Netmask DNSPacket::getRealRemote() const { - if(d_haveednssubnet) - return d_eso.source; - return Netmask(getInnerRemote()); + return d_haveednssubnet ? d_eso.source : Netmask{getInnerRemote()}; } void DNSPacket::setSocket(Utility::sock_t sock) { - d_socket=sock; + d_socket = sock; } void DNSPacket::commitD() From 36a581a91d7dd33926353d1755d8da5505981b67 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 2 Jul 2024 22:20:04 +0200 Subject: [PATCH 4/6] Cleanup geoipbackend.cc --- modules/geoipbackend/geoipbackend.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc index 5d06d2f6cc44..7a87bf48f988 100644 --- a/modules/geoipbackend/geoipbackend.cc +++ b/modules/geoipbackend/geoipbackend.cc @@ -512,8 +512,9 @@ void GeoIPBackend::lookup(const QType& qtype, const DNSName& qdomain, int zoneId } Netmask addr{"0.0.0.0/0"}; - if (pkt_p != nullptr) + if (pkt_p != nullptr) { addr = Netmask(pkt_p->getRealRemote()); + } gl.netmask = 0; @@ -582,8 +583,9 @@ void GeoIPBackend::lookup(const QType& qtype, const DNSName& qdomain, int zoneId bool GeoIPBackend::get(DNSResourceRecord& r) { - if (d_result.empty()) + if (d_result.empty()) { return false; + } r = d_result.back(); d_result.pop_back(); From f912bcde0b942e2482351144f4639c9c1c3af5d1 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 2 Jul 2024 22:20:33 +0200 Subject: [PATCH 5/6] Fix missing includes in lua2api2.hh --- modules/lua2backend/lua2api2.hh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/lua2backend/lua2api2.hh b/modules/lua2backend/lua2api2.hh index 8f5683e3b20f..b2f298cfcec4 100644 --- a/modules/lua2backend/lua2api2.hh +++ b/modules/lua2backend/lua2api2.hh @@ -24,6 +24,9 @@ #include "boost/algorithm/string/join.hpp" #include "pdns/arguments.hh" +#include "pdns/dnsbackend.hh" +#include "pdns/lua-auth4.hh" + class Lua2BackendAPIv2 : public DNSBackend, AuthLua4 { private: From d262b848fa7c7369732098fc07b50d09aad4f28d Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Tue, 2 Jul 2024 22:21:28 +0200 Subject: [PATCH 6/6] Some formatting of pdnsutil.cc --- pdns/pdnsutil.cc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc index c02b295d7aac..aa890d9dc2b8 100644 --- a/pdns/pdnsutil.cc +++ b/pdns/pdnsutil.cc @@ -4231,16 +4231,15 @@ try } return 0; } -catch(PDNSException& ae) { - cerr<<"Error: "<