From 9c1c5d49ddb29cf42a24cdd935742a6634e85797 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Wed, 5 Oct 2016 16:48:00 +0200 Subject: [PATCH] Remove 'kind' param in DNSBackend::getDomainKeys It was unused anyway. Closes #4493 --- docs/markdown/authoritative/backend-remote.md | 2 +- modules/bindbackend/bindbackend2.hh | 2 +- modules/bindbackend/binddnssec.cc | 4 ++-- modules/geoipbackend/geoipbackend.cc | 2 +- modules/geoipbackend/geoipbackend.hh | 2 +- modules/luabackend/dnssec.cc | 10 +++------- modules/luabackend/luabackend.hh | 2 +- modules/luabackend/test2/pdns-luabackend.lua | 4 ++-- modules/oraclebackend/oraclebackend.cc | 2 +- modules/oraclebackend/oraclebackend.hh | 2 +- modules/remotebackend/remotebackend.cc | 5 ++--- modules/remotebackend/remotebackend.hh | 2 +- modules/remotebackend/test-remotebackend.cc | 2 +- pdns/backends/gsql/gsqlbackend.cc | 3 +-- pdns/backends/gsql/gsqlbackend.hh | 2 +- pdns/dbdnsseckeeper.cc | 6 +++--- pdns/dnsbackend.hh | 2 +- pdns/pdnsutil.cc | 8 ++++---- pdns/ueberbackend.cc | 4 ++-- pdns/ueberbackend.hh | 2 +- 20 files changed, 31 insertions(+), 37 deletions(-) diff --git a/docs/markdown/authoritative/backend-remote.md b/docs/markdown/authoritative/backend-remote.md index 6db1382a13..52970c1b82 100644 --- a/docs/markdown/authoritative/backend-remote.md +++ b/docs/markdown/authoritative/backend-remote.md @@ -325,7 +325,7 @@ Retrieves any keys of kind. The id, flags are unsigned integers, and active is b #### Example JSON/RPC Query: ``` -{"method":"getdomainkeys","parameters":{"name":"example.com.","kind":0}} +{"method":"getdomainkeys","parameters":{"name":"example.com."}} ``` Response: diff --git a/modules/bindbackend/bindbackend2.hh b/modules/bindbackend/bindbackend2.hh index ec6b0a444d..c13d75d557 100644 --- a/modules/bindbackend/bindbackend2.hh +++ b/modules/bindbackend/bindbackend2.hh @@ -216,7 +216,7 @@ public: virtual bool getAllDomainMetadata(const DNSName& name, std::map >& meta); virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector& meta); virtual bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector& meta); - virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys); + virtual bool getDomainKeys(const DNSName& name, std::vector& keys); virtual bool removeDomainKey(const DNSName& name, unsigned int id); virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id); virtual bool activateDomainKey(const DNSName& name, unsigned int id); diff --git a/modules/bindbackend/binddnssec.cc b/modules/bindbackend/binddnssec.cc index db3d116df8..47b2a37812 100644 --- a/modules/bindbackend/binddnssec.cc +++ b/modules/bindbackend/binddnssec.cc @@ -50,7 +50,7 @@ bool Bind2Backend::getDomainMetadata(const DNSName& name, const std::string& kin bool Bind2Backend::setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector& meta) { return false; } -bool Bind2Backend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) +bool Bind2Backend::getDomainKeys(const DNSName& name, std::vector& keys) { return false; } bool Bind2Backend::removeDomainKey(const DNSName& name, unsigned int id) @@ -263,7 +263,7 @@ bool Bind2Backend::setDomainMetadata(const DNSName& name, const std::string& kin return true; } -bool Bind2Backend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) +bool Bind2Backend::getDomainKeys(const DNSName& name, std::vector& keys) { if(!d_dnssecdb || d_hybrid) return false; diff --git a/modules/geoipbackend/geoipbackend.cc b/modules/geoipbackend/geoipbackend.cc index 6cde555427..034bb1fde3 100644 --- a/modules/geoipbackend/geoipbackend.cc +++ b/modules/geoipbackend/geoipbackend.cc @@ -796,7 +796,7 @@ bool GeoIPBackend::getDomainMetadata(const DNSName& name, const std::string& kin return false; } -bool GeoIPBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) { +bool GeoIPBackend::getDomainKeys(const DNSName& name, std::vector& keys) { if (!d_dnssec) return false; ReadLock rl(&s_state_lock); for(GeoIPDomain dom : s_domains) { diff --git a/modules/geoipbackend/geoipbackend.hh b/modules/geoipbackend/geoipbackend.hh index 52990770ea..74b2e9bc91 100644 --- a/modules/geoipbackend/geoipbackend.hh +++ b/modules/geoipbackend/geoipbackend.hh @@ -62,7 +62,7 @@ public: virtual bool doesDNSSEC() { return d_dnssec; }; virtual bool getAllDomainMetadata(const DNSName& name, std::map >& meta); virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector& meta); - virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys); + virtual bool getDomainKeys(const DNSName& name, std::vector& keys); virtual bool removeDomainKey(const DNSName& name, unsigned int id); virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id); virtual bool activateDomainKey(const DNSName& name, unsigned int id); diff --git a/modules/luabackend/dnssec.cc b/modules/luabackend/dnssec.cc index 86280e9ecd..6f91bc976f 100644 --- a/modules/luabackend/dnssec.cc +++ b/modules/luabackend/dnssec.cc @@ -363,23 +363,19 @@ bool LUABackend::addDomainKey(const DNSName& name, const KeyData& key, int64_t& return ok >= 0; } -bool LUABackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) { - //what is kind used for? - +bool LUABackend::getDomainKeys(const DNSName& name, std::vector& keys) { if(f_lua_getdomainkeys == 0) return false; if(logging) - L << Logger::Info << backend_name << "(getDomainKeys) BEGIN name: '" << name << "' kind: '" << kind << endl; + L << Logger::Info << backend_name << "(getDomainKeys) BEGIN name: '" << name << endl; lua_rawgeti(lua, LUA_REGISTRYINDEX, f_lua_getdomainkeys); lua_pushstring(lua, name.toString().c_str()); - lua_pushinteger(lua, kind); - if(lua_pcall(lua, 2, 1, f_lua_exec_error) != 0) { + if(lua_pcall(lua, 1, 1, f_lua_exec_error) != 0) { string e = backend_name + lua_tostring(lua, -1); - lua_pop(lua, 1); throw runtime_error(e); return false; diff --git a/modules/luabackend/luabackend.hh b/modules/luabackend/luabackend.hh index c861558a60..6a39059188 100644 --- a/modules/luabackend/luabackend.hh +++ b/modules/luabackend/luabackend.hh @@ -93,7 +93,7 @@ public: bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector& meta) override; bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector& meta) override; - bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) override ; + bool getDomainKeys(const DNSName& name, std::vector& keys) override ; bool removeDomainKey(const DNSName& name, unsigned int id) override ; bool activateDomainKey(const DNSName& name, unsigned int id) override ; bool deactivateDomainKey(const DNSName& name, unsigned int id) override ; diff --git a/modules/luabackend/test2/pdns-luabackend.lua b/modules/luabackend/test2/pdns-luabackend.lua index e13563ce0b..8b8f2bb584 100644 --- a/modules/luabackend/test2/pdns-luabackend.lua +++ b/modules/luabackend/test2/pdns-luabackend.lua @@ -167,8 +167,8 @@ function getdomainmetadata(name, kind) end -function getdomainkeys(name, kind) - logger(log_debug, "(l_getdomainkeys) name:", name, 'kind', kind) +function getdomainkeys(name) + logger(log_debug, "(l_getdomainkeys) name:", name) return keys[name] end diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc index b3ab9fd8ed..dfd855d354 100644 --- a/modules/oraclebackend/oraclebackend.cc +++ b/modules/oraclebackend/oraclebackend.cc @@ -1557,7 +1557,7 @@ OracleBackend::getTSIGKeys(std::vector< struct TSIGKey > &keys) } bool -OracleBackend::getDomainKeys (const DNSName& name, unsigned int kind, vector& keys) +OracleBackend::getDomainKeys (const DNSName& name, vector& keys) { if(!d_dnssecQueries) return -1; diff --git a/modules/oraclebackend/oraclebackend.hh b/modules/oraclebackend/oraclebackend.hh index f2fcc15d3f..0c17257361 100644 --- a/modules/oraclebackend/oraclebackend.hh +++ b/modules/oraclebackend/oraclebackend.hh @@ -104,7 +104,7 @@ public: bool setTSIGKey(const DNSName& name, const DNSName& algorithm, const string& content); bool getTSIGKeys(std::vector< struct TSIGKey > &keys); - bool getDomainKeys(const DNSName& name, unsigned int kind, vector& keys); + bool getDomainKeys(const DNSName& name, vector& keys); bool removeDomainKey(const DNSName& name, unsigned int id); bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id); bool activateDomainKey(const DNSName& name, unsigned int id); diff --git a/modules/remotebackend/remotebackend.cc b/modules/remotebackend/remotebackend.cc index 5f76b4d846..809bfb15af 100644 --- a/modules/remotebackend/remotebackend.cc +++ b/modules/remotebackend/remotebackend.cc @@ -356,15 +356,14 @@ bool RemoteBackend::setDomainMetadata(const DNSName& name, const std::string& ki } -bool RemoteBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) { +bool RemoteBackend::getDomainKeys(const DNSName& name, std::vector& keys) { // no point doing dnssec if it's not supported if (d_dnssec == false) return false; Json query = Json::object{ { "method", "getDomainKeys" }, { "parameters", Json::object{ - { "name", name.toString() }, - { "kind", static_cast(kind) } + { "name", name.toString() } }} }; diff --git a/modules/remotebackend/remotebackend.hh b/modules/remotebackend/remotebackend.hh index 0cf0f39817..1176dff417 100644 --- a/modules/remotebackend/remotebackend.hh +++ b/modules/remotebackend/remotebackend.hh @@ -160,7 +160,7 @@ class RemoteBackend : public DNSBackend virtual bool getAllDomainMetadata(const DNSName& name, std::map >& meta); virtual bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector& meta); - virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys); + virtual bool getDomainKeys(const DNSName& name, std::vector& keys); virtual bool getTSIGKey(const DNSName& name, DNSName* algorithm, std::string* content); virtual bool getBeforeAndAfterNamesAbsolute(uint32_t id, const string& qname, DNSName& unhashed, string& before, string& after); virtual bool setDomainMetadata(const DNSName& name, const string& kind, const std::vector >& meta); diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc index b9ce22de59..2cfd454f3e 100644 --- a/modules/remotebackend/test-remotebackend.cc +++ b/modules/remotebackend/test-remotebackend.cc @@ -126,7 +126,7 @@ BOOST_AUTO_TEST_CASE(test_method_getDomainKeys) { std::vector keys; BOOST_TEST_MESSAGE("Testing getDomainKeys method"); // we expect to get two keys - be->getDomainKeys(DNSName("unit.test."),0,keys); + be->getDomainKeys(DNSName("unit.test."),keys); BOOST_CHECK_EQUAL(keys.size(), 2); // in case we got more than 2 keys, which would be unexpected // but not fatal diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc index da28653d06..dec7207e41 100644 --- a/pdns/backends/gsql/gsqlbackend.cc +++ b/pdns/backends/gsql/gsqlbackend.cc @@ -829,7 +829,7 @@ bool GSQLBackend::getTSIGKeys(std::vector< struct TSIGKey > &keys) return keys.empty(); } -bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) +bool GSQLBackend::getDomainKeys(const DNSName& name, std::vector& keys) { if(!d_dnssecQueries) return false; @@ -840,7 +840,6 @@ bool GSQLBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vec execute(); SSqlStatement::row_t row; - // "select id, kind, active, content from domains, cryptokeys where domain_id=domains.id and name='%s'"; KeyData kd; while(d_ListDomainKeysQuery_stmt->hasNextRow()) { d_ListDomainKeysQuery_stmt->nextRow(row); diff --git a/pdns/backends/gsql/gsqlbackend.hh b/pdns/backends/gsql/gsqlbackend.hh index cfd3ff5420..4bfb925bc4 100644 --- a/pdns/backends/gsql/gsqlbackend.hh +++ b/pdns/backends/gsql/gsqlbackend.hh @@ -218,7 +218,7 @@ public: bool replaceRRSet(uint32_t domain_id, const DNSName& qname, const QType& qt, const vector& rrset); bool listSubZone(const DNSName &zone, int domain_id); bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id); - bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys); + bool getDomainKeys(const DNSName& name, std::vector& keys); bool getAllDomainMetadata(const DNSName& name, std::map >& meta); bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector& meta); bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector& meta); diff --git a/pdns/dbdnsseckeeper.cc b/pdns/dbdnsseckeeper.cc index 8e16900924..70849f12d6 100644 --- a/pdns/dbdnsseckeeper.cc +++ b/pdns/dbdnsseckeeper.cc @@ -144,7 +144,7 @@ static bool keyCompareByKindAndID(const DNSSECKeeper::keyset_t::value_type& a, c DNSSECPrivateKey DNSSECKeeper::getKeyById(const DNSName& zname, unsigned int id) { vector keys; - d_keymetadb->getDomainKeys(zname, 0, keys); + d_keymetadb->getDomainKeys(zname, keys); for(const DNSBackend::KeyData& kd : keys) { if(kd.id != id) continue; @@ -422,7 +422,7 @@ DNSSECKeeper::keyset_t DNSSECKeeper::getKeys(const DNSName& zone, bool useCache) keyset_t retkeyset; vector dbkeyset; - d_keymetadb->getDomainKeys(zone, 0, dbkeyset); + d_keymetadb->getDomainKeys(zone, dbkeyset); // Determine the algorithms that have a KSK/ZSK split set algoSEP, algoNoSEP; @@ -488,7 +488,7 @@ DNSSECKeeper::keyset_t DNSSECKeeper::getKeys(const DNSName& zone, bool useCache) bool DNSSECKeeper::checkKeys(const DNSName& zone) { vector dbkeyset; - d_keymetadb->getDomainKeys(zone, 0, dbkeyset); + d_keymetadb->getDomainKeys(zone, dbkeyset); for(const DNSBackend::KeyData &keydata : dbkeyset) { DNSKEYRecordContent dkrc; diff --git a/pdns/dnsbackend.hh b/pdns/dnsbackend.hh index 2c1adfd07e..a748383e8b 100644 --- a/pdns/dnsbackend.hh +++ b/pdns/dnsbackend.hh @@ -178,7 +178,7 @@ public: bool active; }; - virtual bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) { return false;} + virtual bool getDomainKeys(const DNSName& name, std::vector& keys) { return false;} virtual bool removeDomainKey(const DNSName& name, unsigned int id) { return false; } virtual bool addDomainKey(const DNSName& name, const KeyData& key, int64_t& id){ return false; } virtual bool activateDomainKey(const DNSName& name, unsigned int id) { return false; } diff --git a/pdns/pdnsutil.cc b/pdns/pdnsutil.cc index 15cef6c328..7640dad222 100644 --- a/pdns/pdnsutil.cc +++ b/pdns/pdnsutil.cc @@ -415,7 +415,7 @@ int checkZone(DNSSECKeeper &dk, UeberBackend &B, const DNSName& zone, const vect } vector dbkeyset; - B.getDomainKeys(zone, 0, dbkeyset); + B.getDomainKeys(zone, dbkeyset); for(DNSBackend::KeyData& kd : dbkeyset) { DNSKEYRecordContent dkrc; @@ -3075,7 +3075,7 @@ loadMainConfig(g_vm["config-dir"].as()); dpk.setKey(dke); // make sure this key isn't being reused. - B.getDomainKeys(zone, 0, keys); + B.getDomainKeys(zone, keys); id = -1; for(DNSBackend::KeyData& kd : keys) { @@ -3117,7 +3117,7 @@ loadMainConfig(g_vm["config-dir"].as()); id = pdns_stou(cmds[3]); std::vector keys; - if (!B.getDomainKeys(zone, 0, keys)) { + if (!B.getDomainKeys(zone, keys)) { cerr << "No keys found for zone " << zone << std::endl; return 1; } @@ -3231,7 +3231,7 @@ loadMainConfig(g_vm["config-dir"].as()); // temp var for KeyID int64_t keyID; std::vector keys; - if (src->getDomainKeys(di.zone, 0, keys)) { + if (src->getDomainKeys(di.zone, keys)) { for(const DNSBackend::KeyData& k: keys) { tgt->addDomainKey(di.zone, k, keyID); nk++; diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc index edb1e42ea1..6fbd999fe7 100644 --- a/pdns/ueberbackend.cc +++ b/pdns/ueberbackend.cc @@ -106,10 +106,10 @@ bool UeberBackend::addDomainKey(const DNSName& name, const DNSBackend::KeyData& } return false; } -bool UeberBackend::getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys) +bool UeberBackend::getDomainKeys(const DNSName& name, std::vector& keys) { for(DNSBackend* db : backends) { - if(db->getDomainKeys(name, kind, keys)) + if(db->getDomainKeys(name, keys)) return true; } return false; diff --git a/pdns/ueberbackend.hh b/pdns/ueberbackend.hh index acecf9c8d6..8d615ac30b 100644 --- a/pdns/ueberbackend.hh +++ b/pdns/ueberbackend.hh @@ -115,7 +115,7 @@ public: bool createDomain(const DNSName &domain); bool addDomainKey(const DNSName& name, const DNSBackend::KeyData& key, int64_t& id); - bool getDomainKeys(const DNSName& name, unsigned int kind, std::vector& keys); + bool getDomainKeys(const DNSName& name, std::vector& keys); bool getAllDomainMetadata(const DNSName& name, std::map >& meta); bool getDomainMetadata(const DNSName& name, const std::string& kind, std::vector& meta); bool setDomainMetadata(const DNSName& name, const std::string& kind, const std::vector& meta); -- 2.47.2