From: Otto Moerbeek Date: Fri, 23 Feb 2024 07:58:11 +0000 (+0100) Subject: Tidy X-Git-Tag: rec-5.1.0-alpha1~9^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60434ad5c9df4b143ba0b95d3c4cd6156b4c2988;p=thirdparty%2Fpdns.git Tidy --- diff --git a/pdns/recursordist/rec-lua-conf.cc b/pdns/recursordist/rec-lua-conf.cc index 97d6430245..c03b403ff6 100644 --- a/pdns/recursordist/rec-lua-conf.cc +++ b/pdns/recursordist/rec-lua-conf.cc @@ -99,17 +99,17 @@ typename C::value_type::second_type constGet(const C& c, const std::string& name typedef std::unordered_map>>> rpzOptions_t; -static void parseRPZParameters(rpzOptions_t& have, RPZTrackerParams& params) +static void parseRPZParameters(const rpzOptions_t& have, RPZTrackerParams& params) { if (have.count("policyName") != 0) { - params.polName = boost::get(have["policyName"]); + params.polName = boost::get(have.at("policyName")); } if (have.count("defpol") != 0) { params.defpol = DNSFilterEngine::Policy(); - params.defpol->d_kind = (DNSFilterEngine::PolicyKind)boost::get(have["defpol"]); + params.defcontent = boost::get(have.at("defcontent")); + params.defpol->d_kind = (DNSFilterEngine::PolicyKind)boost::get(have.at("defpol")); params.defpol->setName(params.polName); if (params.defpol->d_kind == DNSFilterEngine::PolicyKind::Custom) { - params.defcontent = boost::get(have["defcontent"]); if (!params.defpol->d_custom) { params.defpol->d_custom = make_unique(); } @@ -117,7 +117,7 @@ static void parseRPZParameters(rpzOptions_t& have, RPZTrackerParams& params) params.defcontent)); if (have.count("defttl") != 0) { - params.defpol->d_ttl = static_cast(boost::get(have["defttl"])); + params.defpol->d_ttl = static_cast(boost::get(have.at("defttl"))); } else { params.defpol->d_ttl = -1; // get it from the zone @@ -125,17 +125,17 @@ static void parseRPZParameters(rpzOptions_t& have, RPZTrackerParams& params) } if (have.count("defpolOverrideLocalData") != 0) { - params.defpolOverrideLocal = boost::get(have["defpolOverrideLocalData"]); + params.defpolOverrideLocal = boost::get(have.at("defpolOverrideLocalData")); } } if (have.count("maxTTL") != 0) { - params.maxTTL = boost::get(have["maxTTL"]); + params.maxTTL = boost::get(have.at("maxTTL")); } if (have.count("zoneSizeHint") != 0) { - params.zoneSizeHint = static_cast(boost::get(have["zoneSizeHint"])); + params.zoneSizeHint = static_cast(boost::get(have.at("zoneSizeHint"))); } if (have.count("tags") != 0) { - const auto& tagsTable = boost::get>>(have["tags"]); + const auto& tagsTable = boost::get>>(have.at("tags")); std::unordered_set tags; for (const auto& tag : tagsTable) { tags.insert(tag.second); @@ -143,70 +143,71 @@ static void parseRPZParameters(rpzOptions_t& have, RPZTrackerParams& params) } } if (have.count("overridesGettag") != 0) { - params.defpolOverrideLocal = boost::get(have["overridesGettag"]); + params.defpolOverrideLocal = boost::get(have.at("overridesGettag")); } if (have.count("extendedErrorCode") != 0) { - auto code = boost::get(have["extendedErrorCode"]); + auto code = boost::get(have.at("extendedErrorCode")); if (code > std::numeric_limits::max()) { throw std::runtime_error("Invalid extendedErrorCode value " + std::to_string(code) + " in RPZ configuration"); } params.extendedErrorCode = code; if (have.count("extendedErrorExtra") != 0) { - params.extendedErrorExtra = boost::get(have["extendedErrorExtra"]); + params.extendedErrorExtra = boost::get(have.at("extendedErrorExtra")); } } if (have.count("includeSOA") != 0) { - params.includeSOA = boost::get(have["includeSOA"]); + params.includeSOA = boost::get(have.at("includeSOA")); } if (have.count("ignoreDuplicates") != 0) { - params.ignoreDuplicates = boost::get(have["ignoreDuplicates"]); + params.ignoreDuplicates = boost::get(have.at("ignoreDuplicates")); } } typedef std::unordered_map>>> protobufOptions_t; -static void parseProtobufOptions(boost::optional vars, ProtobufExportConfig& config) +static void parseProtobufOptions(const boost::optional& vars, ProtobufExportConfig& config) { if (!vars) { return; } + const auto& have = *vars; - if (vars->count("timeout")) { - config.timeout = boost::get((*vars)["timeout"]); + if (have.count("timeout") != 0) { + config.timeout = boost::get(have.at("timeout")); } - if (vars->count("maxQueuedEntries")) { - config.maxQueuedEntries = boost::get((*vars)["maxQueuedEntries"]); + if (have.count("maxQueuedEntries") != 0) { + config.maxQueuedEntries = boost::get(have.at("maxQueuedEntries")); } - if (vars->count("reconnectWaitTime")) { - config.reconnectWaitTime = boost::get((*vars)["reconnectWaitTime"]); + if (have.count("reconnectWaitTime") != 0) { + config.reconnectWaitTime = boost::get(have.at("reconnectWaitTime")); } - if (vars->count("asyncConnect")) { - config.asyncConnect = boost::get((*vars)["asyncConnect"]); + if (have.count("asyncConnect") != 0) { + config.asyncConnect = boost::get(have.at("asyncConnect")); } - if (vars->count("taggedOnly")) { - config.taggedOnly = boost::get((*vars)["taggedOnly"]); + if (have.count("taggedOnly") != 0) { + config.taggedOnly = boost::get(have.at("taggedOnly")); } - if (vars->count("logQueries")) { - config.logQueries = boost::get((*vars)["logQueries"]); + if (have.count("logQueries") != 0) { + config.logQueries = boost::get(have.at("logQueries")); } - if (vars->count("logResponses")) { - config.logResponses = boost::get((*vars)["logResponses"]); + if (have.count("logResponses") != 0) { + config.logResponses = boost::get(have.at("logResponses")); } - if (vars->count("logMappedFrom")) { - config.logMappedFrom = boost::get((*vars)["logMappedFrom"]); + if (have.count("logMappedFrom") != 0) { + config.logMappedFrom = boost::get(have.at("logMappedFrom")); } - if (vars->count("exportTypes")) { + if (have.count("exportTypes") != 0) { config.exportTypes.clear(); - auto types = boost::get>>((*vars)["exportTypes"]); + auto types = boost::get>>(have.at("exportTypes")); for (const auto& pair : types) { const auto& type = pair.second; @@ -228,47 +229,48 @@ static void parseProtobufOptions(boost::optional vars, Protob #ifdef HAVE_FSTRM typedef std::unordered_map>>> frameStreamOptions_t; -static void parseFrameStreamOptions(boost::optional vars, FrameStreamExportConfig& config) +static void parseFrameStreamOptions(const boost::optional& vars, FrameStreamExportConfig& config) { if (!vars) { return; } + const auto& have = *vars; - if (vars->count("logQueries")) { - config.logQueries = boost::get((*vars)["logQueries"]); + if (have.count("logQueries") != 0) { + config.logQueries = boost::get(have.at("logQueries")); } - if (vars->count("logResponses")) { - config.logResponses = boost::get((*vars)["logResponses"]); + if (have.count("logResponses") != 0) { + config.logResponses = boost::get(have.at("logResponses")); } - if (vars->count("logNODs")) { - config.logNODs = boost::get((*vars)["logNODs"]); + if (have.count("logNODs") != 0) { + config.logNODs = boost::get(have.at("logNODs")); } - if (vars->count("logUDRs")) { - config.logUDRs = boost::get((*vars)["logUDRs"]); + if (have.count("logUDRs") != 0) { + config.logUDRs = boost::get(have.at("logUDRs")); } - if (vars->count("bufferHint")) { - config.bufferHint = boost::get((*vars)["bufferHint"]); + if (have.count("bufferHint") != 0) { + config.bufferHint = boost::get(have.at("bufferHint")); } - if (vars->count("flushTimeout")) { - config.flushTimeout = boost::get((*vars)["flushTimeout"]); + if (have.count("flushTimeout") != 0) { + config.flushTimeout = boost::get(have.at("flushTimeout")); } - if (vars->count("inputQueueSize")) { - config.inputQueueSize = boost::get((*vars)["inputQueueSize"]); + if (have.count("inputQueueSize") != 0) { + config.inputQueueSize = boost::get(have.at("inputQueueSize")); } - if (vars->count("outputQueueSize")) { - config.outputQueueSize = boost::get((*vars)["outputQueueSize"]); + if (have.count("outputQueueSize") != 0) { + config.outputQueueSize = boost::get(have.at("outputQueueSize")); } - if (vars->count("queueNotifyThreshold")) { - config.queueNotifyThreshold = boost::get((*vars)["queueNotifyThreshold"]); + if (have.count("queueNotifyThreshold") != 0) { + config.queueNotifyThreshold = boost::get(have.at("queueNotifyThreshold")); } - if (vars->count("reopenInterval")) { - config.reopenInterval = boost::get((*vars)["reopenInterval"]); + if (have.count("reopenInterval") != 0) { + config.reopenInterval = boost::get(have.at("reopenInterval")); } } #endif /* HAVE_FSTRM */ -static void rpzPrimary(LuaConfigItems& lci, const boost::variant>>& primaries_, const string& zoneName, boost::optional options) +static void rpzPrimary(LuaConfigItems& lci, const boost::variant>>& primaries_, const string& zoneName, const boost::optional& options) { RPZTrackerParams params; params.name = zoneName; @@ -290,14 +292,14 @@ static void rpzPrimary(LuaConfigItems& lci, const boost::variant(have["tsigname"]))); - params.tsigtriplet.algo = DNSName(toLower(boost::get(have["tsigalgo"]))); - if (B64Decode(boost::get(have["tsigsecret"]), params.tsigtriplet.secret)) { + params.tsigtriplet.name = DNSName(toLower(boost::get(have.at("tsigname")))); + params.tsigtriplet.algo = DNSName(toLower(boost::get(have.at("tsigalgo")))); + if (B64Decode(boost::get(have.at("tsigsecret")), params.tsigtriplet.secret) != 0) { throw std::runtime_error("TSIG secret is not valid Base-64 encoded"); } } if (have.count("refresh") != 0) { - params.refreshFromConf = boost::get(have["refresh"]); + params.refreshFromConf = boost::get(have.at("refresh")); if (params.refreshFromConf == 0) { SLOG(g_log << Logger::Warning << "rpzPrimary refresh value of 0 ignored" << endl, lci.d_slog->info(Logr::Warning, "rpzPrimary refresh value of 0 ignored")); @@ -305,23 +307,23 @@ static void rpzPrimary(LuaConfigItems& lci, const boost::variant(boost::get(have["maxReceivedMBytes"])); + params.maxReceivedMBytes = static_cast(boost::get(have.at("maxReceivedMBytes"))); } if (have.count("localAddress") != 0) { - params.localAddress = ComboAddress(boost::get(have["localAddress"])); + params.localAddress = ComboAddress(boost::get(have.at("localAddress"))); } if (have.count("axfrTimeout") != 0) { - params.xfrTimeout = static_cast(boost::get(have["axfrTimeout"])); + params.xfrTimeout = static_cast(boost::get(have.at("axfrTimeout"))); } if (have.count("seedFile") != 0) { - params.seedFileName = boost::get(have["seedFile"]); + params.seedFileName = boost::get(have.at("seedFile")); } if (have.count("dumpFile") != 0) { - params.dumpZoneFileName = boost::get(have["dumpFile"]); + params.dumpZoneFileName = boost::get(have.at("dumpFile")); } } @@ -373,7 +375,7 @@ public: } }; -void loadRecursorLuaConfig(const std::string& fname, ProxyMapping& proxyMapping, LuaConfigItems& newLuaConfig) +void loadRecursorLuaConfig(const std::string& fname, ProxyMapping& proxyMapping, LuaConfigItems& newLuaConfig) // NOLINT(readability-function-cognitive-complexity) { LuaConfigItems lci; if (g_slog) { @@ -417,12 +419,12 @@ void loadRecursorLuaConfig(const std::string& fname, ProxyMapping& proxyMapping, lci.rpzs.emplace_back(params); }); - Lua->writeFunction("rpzMaster", [&lci](const boost::variant>>& primaries_, const string& zoneName, boost::optional options) { + Lua->writeFunction("rpzMaster", [&lci](const boost::variant>>& primaries_, const string& zoneName, const boost::optional& options) { SLOG(g_log << Logger::Warning << "'rpzMaster' is deprecated and will be removed in a future release, use 'rpzPrimary' instead" << endl, lci.d_slog->info(Logr::Warning, "'rpzMaster' is deprecated and will be removed in a future release, use 'rpzPrimary' instead")); rpzPrimary(lci, primaries_, zoneName, options); }); - Lua->writeFunction("rpzPrimary", [&lci](const boost::variant>>& primaries_, const string& zoneName, boost::optional options) { + Lua->writeFunction("rpzPrimary", [&lci](const boost::variant>>& primaries_, const string& zoneName, const boost::optional& options) { rpzPrimary(lci, primaries_, zoneName, options); }); diff --git a/pdns/recursordist/rec-lua-conf.hh b/pdns/recursordist/rec-lua-conf.hh index 7e595715b0..203877e92b 100644 --- a/pdns/recursordist/rec-lua-conf.hh +++ b/pdns/recursordist/rec-lua-conf.hh @@ -128,4 +128,4 @@ public: extern GlobalStateHolder g_luaconfs; -void loadRecursorLuaConfig(const std::string& fname, ProxyMapping&, LuaConfigItems& newConfig); +void loadRecursorLuaConfig(const std::string& fname, ProxyMapping&, LuaConfigItems& newLuaConfig); diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc index d3b64f8509..b47c57169f 100644 --- a/pdns/recursordist/rec-main.cc +++ b/pdns/recursordist/rec-main.cc @@ -3330,12 +3330,12 @@ void startLuaConfigDelayedThreads(const vector& rpzs, uint64_t catch (const std::exception& e) { SLOG(g_log << Logger::Error << "Problem starting RPZIXFRTracker thread: " << e.what() << endl, g_slog->withName("rpz")->error(Logr::Error, e.what(), "Exception starting RPZIXFRTracker thread", "exception", Logging::Loggable("std::exception"))); - exit(1); + exit(1); // NOLINT(concurrency-mt-unsafe) } catch (const PDNSException& e) { SLOG(g_log << Logger::Error << "Problem starting RPZIXFRTracker thread: " << e.reason << endl, g_slog->withName("rpz")->error(Logr::Error, e.reason, "Exception starting RPZIXFRTracker thread", "exception", Logging::Loggable("PDNSException"))); - exit(1); + exit(1); // NOLINT(concurrency-mt-unsafe) } } } @@ -3415,7 +3415,7 @@ static void activateRPZs(LuaConfigItems& lci) if (params.primaries.empty()) { activateRPZFile(params, lci, zone); - lci.dfe.addZone(std::move(zone)); + lci.dfe.addZone(zone); } else { DNSName domain(params.name); diff --git a/pdns/recursordist/rec_control.cc b/pdns/recursordist/rec_control.cc index 0561b5ac14..6b2937cf44 100644 --- a/pdns/recursordist/rec_control.cc +++ b/pdns/recursordist/rec_control.cc @@ -111,7 +111,7 @@ static void initArguments(int argc, char** argv, Logr::log_t log) } } -static std::string showLuaYAML(const ::rust::string rfile) +static std::string showLuaYAML(const ::rust::string& rfile) { std::string msg; if (rfile.empty()) { diff --git a/pdns/recursordist/settings/cxxsupport.cc b/pdns/recursordist/settings/cxxsupport.cc index e114c33f22..d34cbca4e5 100644 --- a/pdns/recursordist/settings/cxxsupport.cc +++ b/pdns/recursordist/settings/cxxsupport.cc @@ -1304,11 +1304,11 @@ bool pdns::settings::rec::luaItemSet(const pdns::rust::settings::rec::Recursorse if (trustanchor.dsrecords.size() != rootDSs.size()) { alldefault = false; break; - for (const auto& dsRecord : trustanchor.dsrecords) { - if (std::find(rootDSs.begin(), rootDSs.end(), std::string(dsRecord)) == rootDSs.end()) { - alldefault = false; - break; - } + } + for (const auto& dsRecord : trustanchor.dsrecords) { + if (std::find(rootDSs.begin(), rootDSs.end(), std::string(dsRecord)) == rootDSs.end()) { + alldefault = false; + break; } } } diff --git a/pdns/recursordist/test-syncres_cc9.cc b/pdns/recursordist/test-syncres_cc9.cc index d33bf184b4..eae64d6d1b 100644 --- a/pdns/recursordist/test-syncres_cc9.cc +++ b/pdns/recursordist/test-syncres_cc9.cc @@ -766,12 +766,12 @@ BOOST_AUTO_TEST_CASE(test_getDSRecords_multialgo) return LWResult::Result::Timeout; }); - dsset_t ds; - auto state = sr->getDSRecords(target, ds, false, 0, "", false); + dsset_t dsSet; + auto state = sr->getDSRecords(target, dsSet, false, 0, "", false); BOOST_CHECK_EQUAL(state, vState::Secure); - BOOST_REQUIRE_EQUAL(ds.size(), 1U); - for (const auto& i : ds) { - BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::DIGEST_SHA256); + BOOST_REQUIRE_EQUAL(dsSet.size(), 1U); + for (const auto& dsRecord : dsSet) { + BOOST_CHECK_EQUAL(dsRecord.d_digesttype, DNSSECKeeper::DIGEST_SHA256); } } @@ -819,12 +819,12 @@ BOOST_AUTO_TEST_CASE(test_getDSRecords_multialgo_all_sha) return LWResult::Result::Timeout; }); - dsset_t ds; - auto state = sr->getDSRecords(target, ds, false, 0, "", false); + dsset_t dsSet; + auto state = sr->getDSRecords(target, dsSet, false, 0, "", false); BOOST_CHECK_EQUAL(state, vState::Secure); - BOOST_REQUIRE_EQUAL(ds.size(), 2U); - for (const auto& i : ds) { - BOOST_CHECK(i.d_digesttype == DNSSECKeeper::DIGEST_SHA384 || i.d_digesttype == DNSSECKeeper::DIGEST_SHA256); + BOOST_REQUIRE_EQUAL(dsSet.size(), 2U); + for (const auto& dsRecord : dsSet) { + BOOST_CHECK(dsRecord.d_digesttype == DNSSECKeeper::DIGEST_SHA384 || dsRecord.d_digesttype == DNSSECKeeper::DIGEST_SHA256); } } @@ -872,12 +872,12 @@ BOOST_AUTO_TEST_CASE(test_getDSRecords_multialgo_two_highest) return LWResult::Result::Timeout; }); - dsset_t ds; - auto state = sr->getDSRecords(target, ds, false, 0, "", false); + dsset_t dsSet; + auto state = sr->getDSRecords(target, dsSet, false, 0, "", false); BOOST_CHECK_EQUAL(state, vState::Secure); - BOOST_REQUIRE_EQUAL(ds.size(), 2U); - for (const auto& i : ds) { - BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::DIGEST_SHA256); + BOOST_REQUIRE_EQUAL(dsSet.size(), 2U); + for (const auto& dsRecord : dsSet) { + BOOST_CHECK_EQUAL(dsRecord.d_digesttype, DNSSECKeeper::DIGEST_SHA256); } } diff --git a/pdns/validate.cc b/pdns/validate.cc index cc9dc40515..81d0327a40 100644 --- a/pdns/validate.cc +++ b/pdns/validate.cc @@ -1130,7 +1130,7 @@ bool haveNegativeTrustAnchor(const map& negAnchors, const D return true; } -vState validateDNSKeysAgainstDS(time_t now, const DNSName& zone, const dsset_t& dsset, const skeyset_t& tkeys, const sortedRecords_t& toSign, const vector >& sigs, skeyset_t& validkeys, const OptLog& log, pdns::validation::ValidationContext& context) +vState validateDNSKeysAgainstDS(time_t now, const DNSName& zone, const dsset_t& dsset, const skeyset_t& tkeys, const sortedRecords_t& toSign, const vector >& sigs, skeyset_t& validkeys, const OptLog& log, pdns::validation::ValidationContext& context) // NOLINT(readability-function-cognitive-complexity) { /* * Check all DNSKEY records against all DS records and place all DNSKEY records