- run:
name: configure
command: |
- CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
- CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+ CFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security" \
+ CXXFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
./configure \
--disable-lua-records \
--with-modules='bind lmdb ldap gmysql gsqlite3 gpgsql godbc mydns random tinydns' \
- run:
name: configure
command: |
- CFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security" \
- CXXFLAGS="-O1 -Werror=vla -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
+ CFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security" \
+ CXXFLAGS="-O1 -Werror=vla -Werror=shadow -Wformat=2 -Werror=format-security -Wp,-D_GLIBCXX_ASSERTIONS" \
./configure \
--enable-unit-tests \
--enable-nod \
AC_CANONICAL_HOST
# Add some default CFLAGS and CXXFLAGS, can be appended to using the environment variables
-CFLAGS="-Wall -g -O2 $CFLAGS"
-CXXFLAGS="-Wall -g -O2 $CXXFLAGS"
+CFLAGS="-g -O2 -Wall -Wextra -Wshadow -Wno-unused-parameter $CFLAGS"
+CXXFLAGS="-g -O2 -Wall -Wextra -Wshadow -Wno-unused-parameter $CXXFLAGS"
AC_PROG_CC
AM_PROG_CC_C_O
lua_setglobal(lua, "QTypes");
}
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, string& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, string& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = lua_tostring(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = lua_tostring(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, DNSName& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, DNSName& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = DNSName(lua_tostring(lua, -1));
+ if(!lua_isnil(lua_state, -1)) {
+ value = DNSName(lua_tostring(lua_state, -1));
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
-bool LUABackend::getValueFromTable(lua_State *lua, uint32_t key, string& value) {
- lua_pushinteger(lua, key);
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, uint32_t key, string& value) {
+ lua_pushinteger(lua_state, key);
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = lua_tostring(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = lua_tostring(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
#if !(defined(__i386__) && defined(__FreeBSD__))
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, time_t& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, time_t& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = (time_t)lua_tonumber(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = (time_t)lua_tonumber(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
#endif
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint32_t& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, uint32_t& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = (uint32_t)lua_tointeger(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = (uint32_t)lua_tointeger(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint16_t& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, uint16_t& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = (uint16_t)lua_tointeger(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = (uint16_t)lua_tointeger(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, uint8_t& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, uint8_t& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = (uint8_t)lua_tointeger(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = (uint8_t)lua_tointeger(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, int& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, int& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = (int)lua_tointeger(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = (int)lua_tointeger(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
-bool LUABackend::getValueFromTable(lua_State *lua, const std::string& key, bool& value) {
- lua_pushstring(lua, key.c_str());
- lua_gettable(lua, -2);
+bool LUABackend::getValueFromTable(lua_State *lua_state, const std::string& key, bool& value) {
+ lua_pushstring(lua_state, key.c_str());
+ lua_gettable(lua_state, -2);
bool ret = false;
- if(!lua_isnil(lua, -1)) {
- value = lua_toboolean(lua, -1);
+ if(!lua_isnil(lua_state, -1)) {
+ value = lua_toboolean(lua_state, -1);
ret = true;
}
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
return ret;
}
}
-void LUABackend::dnsrr_to_table(lua_State *lua, const DNSResourceRecord *rr) {
+void LUABackend::dnsrr_to_table(lua_State *lua_state, const DNSResourceRecord *rr) {
- lua_newtable(lua);
+ lua_newtable(lua_state);
- lua_pushliteral(lua, "qtype");
- lua_pushstring(lua, rr->qtype.getName().c_str());
- lua_settable(lua, -3);
+ lua_pushliteral(lua_state, "qtype");
+ lua_pushstring(lua_state, rr->qtype.getName().c_str());
+ lua_settable(lua_state, -3);
- lua_pushliteral(lua, "qclass");
- lua_pushinteger(lua, rr->qclass);
- lua_settable(lua, -3);
+ lua_pushliteral(lua_state, "qclass");
+ lua_pushinteger(lua_state, rr->qclass);
+ lua_settable(lua_state, -3);
- lua_pushliteral(lua, "ttl");
- lua_pushinteger(lua, rr->ttl);
- lua_settable(lua, -3);
+ lua_pushliteral(lua_state, "ttl");
+ lua_pushinteger(lua_state, rr->ttl);
+ lua_settable(lua_state, -3);
- lua_pushliteral(lua, "auth");
- lua_pushboolean(lua, rr->auth);
- lua_settable(lua, -3);
+ lua_pushliteral(lua_state, "auth");
+ lua_pushboolean(lua_state, rr->auth);
+ lua_settable(lua_state, -3);
- lua_pushliteral(lua, "content");
- lua_pushstring(lua, rr->content.c_str());
- lua_settable(lua, -3);
+ lua_pushliteral(lua_state, "content");
+ lua_pushstring(lua_state, rr->content.c_str());
+ lua_settable(lua_state, -3);
}
-bool LUABackend::dnsrr_from_table(lua_State *lua, DNSResourceRecord &rr) {
+bool LUABackend::dnsrr_from_table(lua_State *lua_state, DNSResourceRecord &rr) {
bool got_content = false;
string qt_name;
// look for qname key first
// try name key if qname wasn't set
- if (!getValueFromTable(lua, "qname", rr.qname))
- getValueFromTable(lua, "name", rr.qname);
+ if (!getValueFromTable(lua_state, "qname", rr.qname))
+ getValueFromTable(lua_state, "name", rr.qname);
// qtype is either a table, string or number
// when it's a table prefer the code key
- lua_pushliteral(lua, "qtype");
- lua_gettable(lua, -2);
- size_t returnedwhat = lua_type(lua, -1);
+ lua_pushliteral(lua_state, "qtype");
+ lua_gettable(lua_state, -2);
+ size_t returnedwhat = lua_type(lua_state, -1);
if (LUA_TTABLE == returnedwhat) {
- if (getValueFromTable(lua, "code", qt_code))
+ if (getValueFromTable(lua_state, "code", qt_code))
rr.qtype = qt_code;
else
- if (getValueFromTable(lua, "name", qt_name))
+ if (getValueFromTable(lua_state, "name", qt_name))
rr.qtype = qt_name;
- lua_pop(lua, 1);
+ lua_pop(lua_state, 1);
} else if (LUA_TNUMBER == returnedwhat) {
- lua_pop(lua, 1);
- if (getValueFromTable(lua, "qtype", qt_code))
+ lua_pop(lua_state, 1);
+ if (getValueFromTable(lua_state, "qtype", qt_code))
rr.qtype = qt_code;
} else {
- lua_pop(lua, 1);
- if (getValueFromTable(lua, "qtype", qt_name))
+ lua_pop(lua_state, 1);
+ if (getValueFromTable(lua_state, "qtype", qt_name))
rr.qtype = qt_name;
else // fallback to old key for tests to pass
- if (getValueFromTable(lua, "type", qt_name))
+ if (getValueFromTable(lua_state, "type", qt_name))
rr.qtype = qt_name;
}
- getValueFromTable(lua, "qclass", rr.qclass);
- getValueFromTable(lua, "domain_id", rr.domain_id);
- getValueFromTable(lua, "auth", rr.auth);
- getValueFromTable(lua, "last_modified", rr.last_modified);
+ getValueFromTable(lua_state, "qclass", rr.qclass);
+ getValueFromTable(lua_state, "domain_id", rr.domain_id);
+ getValueFromTable(lua_state, "auth", rr.auth);
+ getValueFromTable(lua_state, "last_modified", rr.last_modified);
- getValueFromTable(lua, "ttl", rr.ttl);
- got_content = getValueFromTable(lua, "content", rr.content);
- getValueFromTable(lua, "scopeMask", rr.scopeMask);
+ getValueFromTable(lua_state, "ttl", rr.ttl);
+ got_content = getValueFromTable(lua_state, "content", rr.content);
+ getValueFromTable(lua_state, "scopeMask", rr.scopeMask);
return got_content;
#include "lua_functions.hh"
-void LUABackend::get_lua_function(lua_State *lua, const char *name, int *function) {
+void LUABackend::get_lua_function(lua_State *lua_state, const char *name, int *function) {
*function = 0;
string f = "f_";
if (!::arg().isEmpty(string(LUABACKEND_PREFIX)+"-"+f))
arg = getArg(f);
- lua_getglobal(lua, arg == "" ? name : arg.c_str());
- if (!lua_isnil(lua, -1)) {
- lua_pushvalue(lua, -1);
- *function = luaL_ref(lua, LUA_REGISTRYINDEX);
+ lua_getglobal(lua_state, arg == "" ? name : arg.c_str());
+ if (!lua_isnil(lua_state, -1)) {
+ lua_pushvalue(lua_state, -1);
+ *function = luaL_ref(lua_state, LUA_REGISTRYINDEX);
}
}
else {
ret = snprintf(filename, sizeof(filename), "%s/%s", bind_directory, yytext+1);
}
- if (ret == -1 || ret >= sizeof(filename)) {
+ if (ret == -1 || ret >= (int)sizeof(filename)) {
fprintf( stderr, "Filename '%s' is too long\n",yytext+1);
exit( 1 );
}
continue;
}
g_recvcounter++;
- for (int i = 0; i < buf.msg_iovlen; i++)
+ for (unsigned int i = 0; i < buf.msg_iovlen; i++)
g_recvbytes += buf.msg_iov[i].iov_len;
#endif
}
LT_PREREQ([2.2.2])
LT_INIT([disable-static])
-CFLAGS="-Wall -g -O3 $CFLAGS -Wall -Wextra -Wshadow -Wno-unused-parameter"
-CXXFLAGS="-Wall -g -O3 $CXXFLAGS -Wall -Wextra -Wshadow -Wno-unused-parameter"
+CFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter $CFLAGS"
+CXXFLAGS="-g -O3 -Wall -Wextra -Wshadow -Wno-unused-parameter $CXXFLAGS"
PDNS_WITH_LIBSODIUM
PDNS_CHECK_DNSTAP([auto])
this should not trigger the rule */
size_t numberOfQueries = 45 * numberOfSeconds;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
this should trigger the rule this time */
size_t numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, false);
}
this should not trigger the rule */
size_t numberOfQueries = 45 * numberOfSeconds;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
but for the wrong QType */
size_t numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
// this should trigger the rule this time
size_t numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, false);
}
this should not trigger the rule */
size_t numberOfResponses = 45 * numberOfSeconds;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
dh.rcode = rcode;
BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), numberOfResponses);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
/* insert just above 50 FormErr/s from a given client in the last 10s */
size_t numberOfResponses = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
dh.rcode = RCode::FormErr;
BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), numberOfResponses);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
this should trigger the rule this time */
size_t numberOfResponses = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
dh.rcode = rcode;
BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), numberOfResponses);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, false);
}
this should not trigger the rule */
size_t numberOfResponses = 99 * numberOfSeconds;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
dh.rcode = rcode;
BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), numberOfResponses);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
/* insert just above 100 answers of 100 bytes per second from a given client in the last 10s */
size_t numberOfResponses = 100 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
dh.rcode = rcode;
BOOST_CHECK_EQUAL(g_rings.getNumberOfResponseEntries(), numberOfResponses);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, false);
}
this should not trigger the rule */
size_t numberOfQueries = 20 * numberOfSeconds;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 0U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) == nullptr);
}
this should trigger the warning rule this time */
size_t numberOfQueries = 20 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
{
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == DNSAction::Action::NoOp);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, true);
/* let's increment the number of blocks so we can check that the counter
is preserved when the block is upgraded to a non-warning one */
/* now inserts 50 qps for the same duration, we should reach the blocking threshold */
numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
g_rings.insertQuery(now, requestor1, qname, qtype, size, dh);
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
{
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
/* this hsould have been preserved */
- BOOST_CHECK_EQUAL(block.blocks, 1);
+ BOOST_CHECK_EQUAL(block.blocks, 1U);
BOOST_CHECK_EQUAL(block.warning, false);
block.blocks++;
}
now.tv_sec += 30;
numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
g_rings.insertQuery(now, requestor1, qname, qtype, size, dh);
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
/* should have been updated */
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
/* this hsould have been preserved */
- BOOST_CHECK_EQUAL(block.blocks, 2);
+ BOOST_CHECK_EQUAL(block.blocks, 2U);
BOOST_CHECK_EQUAL(block.warning, false);
}
}
this should trigger the blocking rule right away this time */
size_t numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
{
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, false);
}
}
this should trigger the rule for the first one but not the second one */
size_t numberOfQueries = 50 * numberOfSeconds + 1;
g_rings.clear();
- BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0);
+ BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), 0U);
g_dynblockNMG.setState(emptyNMG);
for (size_t idx = 0; idx < numberOfQueries; idx++) {
BOOST_CHECK_EQUAL(g_rings.getNumberOfQueryEntries(), numberOfQueries * 2);
dbrg.apply(now);
- BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1);
+ BOOST_CHECK_EQUAL(g_dynblockNMG.getLocal()->size(), 1U);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor1) != nullptr);
BOOST_CHECK(g_dynblockNMG.getLocal()->lookup(requestor2) == nullptr);
const auto& block = g_dynblockNMG.getLocal()->lookup(requestor1)->second;
BOOST_CHECK_EQUAL(block.reason, reason);
- BOOST_CHECK_EQUAL(block.until.tv_sec, now.tv_sec + blockDuration);
+ BOOST_CHECK_EQUAL(static_cast<size_t>(block.until.tv_sec), now.tv_sec + blockDuration);
BOOST_CHECK(block.domain.empty());
BOOST_CHECK(block.action == action);
- BOOST_CHECK_EQUAL(block.blocks, 0);
+ BOOST_CHECK_EQUAL(block.blocks, 0U);
BOOST_CHECK_EQUAL(block.warning, false);
}
BOOST_CHECK(kvs->keyExists(std::string(reinterpret_cast<const char*>(&dq.remote->sin4.sin_addr.s_addr), sizeof(dq.remote->sin4.sin_addr.s_addr))));
auto keys = lookupKey->getKeys(dq);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), true);
std::string value;
auto lookupKey = make_unique<KeyValueLookupKeyQName>(true);
auto keys = lookupKey->getKeys(dq);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), true);
/* other domain, should not match */
keys = lookupKey->getKeys(notPDNS);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), false);
/* subdomain, should not match */
keys = lookupKey->getKeys(subdomain);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), false);
/* this domain was inserted in plaintext, the wire format lookup should not match */
keys = lookupKey->getKeys(plaintextDomain);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), false);
std::string value;
auto lookupKey = make_unique<KeyValueLookupKeyQName>(false);
auto keys = lookupKey->getKeys(dq);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), false);
/* other domain, should not match */
keys = lookupKey->getKeys(notPDNS);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), false);
/* subdomain, should not match */
keys = lookupKey->getKeys(subdomain);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), false);
/* this domain was inserted in plaintext, so it should match */
keys = lookupKey->getKeys(plaintextDomain);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
for (const auto& key : keys) {
value.clear();
BOOST_CHECK_EQUAL(kvs->getValue(key, value), true);
{
auto lookupKey = make_unique<KeyValueLookupKeySuffix>(2, true);
auto keys = lookupKey->getKeys(dq);
- BOOST_CHECK_EQUAL(keys.size(), 1);
+ BOOST_CHECK_EQUAL(keys.size(), 1U);
BOOST_REQUIRE(!keys.empty());
BOOST_CHECK_EQUAL(keys.at(0), dq.qname->toDNSStringLC());
std::string value;
/* subdomain */
keys = lookupKey->getKeys(subdomain);
- BOOST_REQUIRE_EQUAL(keys.size(), 2);
+ BOOST_REQUIRE_EQUAL(keys.size(), 2U);
BOOST_CHECK_EQUAL(kvs->getValue(keys.at(0), value), false);
BOOST_CHECK_EQUAL(kvs->getValue(keys.at(1), value), true);
BOOST_CHECK_EQUAL(value, "this is the value for the qname");
size_t entriesPerShard = maxEntries / numberOfShards;
BOOST_CHECK_EQUAL(rings.getNumberOfShards(), numberOfShards);
- BOOST_CHECK_EQUAL(rings.getNumberOfQueryEntries(), 0);
- BOOST_CHECK_EQUAL(rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(rings.getNumberOfQueryEntries(), 0U);
+ BOOST_CHECK_EQUAL(rings.getNumberOfResponseEntries(), 0U);
BOOST_CHECK_EQUAL(rings.d_shards.size(), rings.getNumberOfShards());
for (const auto& shard : rings.d_shards) {
BOOST_CHECK(shard != nullptr);
rings.insertQuery(now, requestor1, qname, qtype, size, dh);
}
BOOST_CHECK_EQUAL(rings.getNumberOfQueryEntries(), maxEntries);
- BOOST_CHECK_EQUAL(rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(rings.getNumberOfResponseEntries(), 0U);
for (const auto& shard : rings.d_shards) {
BOOST_CHECK_EQUAL(shard->queryRing.size(), entriesPerShard);
for (const auto& entry : shard->queryRing) {
rings.insertQuery(now, requestor2, qname, qtype, size, dh);
}
BOOST_CHECK_EQUAL(rings.getNumberOfQueryEntries(), maxEntries);
- BOOST_CHECK_EQUAL(rings.getNumberOfResponseEntries(), 0);
+ BOOST_CHECK_EQUAL(rings.getNumberOfResponseEntries(), 0U);
for (const auto& shard : rings.d_shards) {
BOOST_CHECK_EQUAL(shard->queryRing.size(), entriesPerShard);
for (const auto& entry : shard->queryRing) {
usleep(10000);
}
- BOOST_CHECK_GT(iterationsDone, 1);
+ BOOST_CHECK_GT(iterationsDone, 1U);
#if 0
cerr<<"Done "<<iterationsDone<<" reading iterations"<<endl;
#endif
/* let's use different source ports, it shouldn't matter */
rem = ComboAddress("192.0.2.1:" + std::to_string(idx));
BOOST_CHECK_EQUAL(rule.matches(&dq), false);
- BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1);
+ BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1U);
}
/* maxQPS + 1, we should be blocked */
BOOST_CHECK_EQUAL(rule.matches(&dq), true);
- BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1);
+ BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1U);
/* remove all entries that have not been updated since 'now' + 1,
so all of them */
rule.cleanup(expiredTime);
/* we should have been cleaned up */
- BOOST_CHECK_EQUAL(rule.getEntriesCount(), 0);
+ BOOST_CHECK_EQUAL(rule.getEntriesCount(), 0U);
struct timespec beginInsertionTime;
gettime(&beginInsertionTime);
/* we should not be blocked anymore */
BOOST_CHECK_EQUAL(rule.matches(&dq), false);
/* and we be back */
- BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1);
+ BOOST_CHECK_EQUAL(rule.getEntriesCount(), 1U);
/* Let's insert a lot of different sources now */
size_t scanned = 0;
auto removed = rule.cleanup(notExpiredTime, &scanned);
- BOOST_CHECK_EQUAL(removed, 0);
+ BOOST_CHECK_EQUAL(removed, 0U);
/* the first entry should still have been valid, we should not have scanned more */
- BOOST_CHECK_EQUAL(scanned, 1);
+ BOOST_CHECK_EQUAL(scanned, 1U);
BOOST_CHECK_EQUAL(rule.getEntriesCount(), total);
/* make sure all entries are _not_ valid anymore */
BOOST_CHECK_EQUAL(rule.getEntriesCount(), total - removed);
rule.clear();
- BOOST_CHECK_EQUAL(rule.getEntriesCount(), 0);
+ BOOST_CHECK_EQUAL(rule.getEntriesCount(), 0U);
removed = rule.cleanup(expiredTime, &scanned);
- BOOST_CHECK_EQUAL(removed, 0);
- BOOST_CHECK_EQUAL(scanned, 0);
+ BOOST_CHECK_EQUAL(removed, 0U);
+ BOOST_CHECK_EQUAL(scanned, 0U);
}
static unsigned int digestToAlgorithmNumber(uint8_t digest)
{
switch(digest) {
- case DNSSECKeeper::SHA1:
+ case DNSSECKeeper::DIGEST_SHA1:
return DNSSECKeeper::RSASHA1;
- case DNSSECKeeper::SHA256:
+ case DNSSECKeeper::DIGEST_SHA256:
return DNSSECKeeper::RSASHA256;
- case DNSSECKeeper::GOST:
+ case DNSSECKeeper::DIGEST_GOST:
return DNSSECKeeper::ECCGOST;
- case DNSSECKeeper::SHA384:
+ case DNSSECKeeper::DIGEST_SHA384:
return DNSSECKeeper::ECDSA384;
default:
throw std::runtime_error("Unknown digest type " + std::to_string(digest));
};
enum dsdigestalgorithm_t : uint8_t {
- SHA1=1,
- SHA256=2,
- GOST=3,
- SHA384=4
+ DIGEST_SHA1=1,
+ DIGEST_SHA256=2,
+ DIGEST_GOST=3,
+ DIGEST_SHA384=4
};
struct KeyMetaData
bool DNSFilterEngine::Zone::rmQNameTrigger(const DNSName& n, const Policy& pol)
{
- auto it = d_qpolName.find(n);
- if (it == d_qpolName.end()) {
+ auto found = d_qpolName.find(n);
+ if (found == d_qpolName.end()) {
return false;
}
- auto& existing = it->second;
+ auto& existing = found->second;
if (existing.d_kind != DNSFilterEngine::PolicyKind::Custom) {
- d_qpolName.erase(it);
+ d_qpolName.erase(found);
return true;
}
/* for custom types, we might have more than one type,
and then we need to remove only the right ones. */
if (existing.d_custom.size() <= 1) {
- d_qpolName.erase(it);
+ d_qpolName.erase(found);
return true;
}
for(const auto& c : boost::get<vector<pair<int,string>>>(content))
contents.push_back(c.second);
- for(const auto& content: contents) {
+ for(const auto& content_it: contents) {
if(qtype==QType::TXT)
- ret.push_back(DNSRecordContent::mastermake(qtype, QClass::IN, '"'+content+'"' ));
+ ret.push_back(DNSRecordContent::mastermake(qtype, QClass::IN, '"'+content_it+'"' ));
else
- ret.push_back(DNSRecordContent::mastermake(qtype, QClass::IN, content ));
+ ret.push_back(DNSRecordContent::mastermake(qtype, QClass::IN, content_it ));
}
} catch(std::exception &e) {
g_log<<Logger::Error<<"Lua record reported: "<<e.what();
if (exists(p) && is_directory(p)) {
try {
std::ofstream ofile;
- std::stringstream ss;
+ std::stringstream iss;
ofile.open(f.string(), std::ios::out | std::ios::binary);
{
// only lock while dumping to a stringstream
std::lock_guard<std::mutex> lock(d_sbf_mutex);
- d_sbf.dump(ss);
+ d_sbf.dump(iss);
}
// Now write it out to the file
- ofile << ss.str();
+ ofile << iss.str();
if (ofile.fail())
throw std::runtime_error("Failed to write to file:" + f.string());
try {
auto recvec=luaSynth(rec->getCode(), target, sd.qname, sd.domain_id, p, rec->d_type);
if(!recvec.empty()) {
- for(const auto& r : recvec) {
+ for(const auto& r_it : recvec) {
rr.dr.d_type = rec->d_type; // might be CNAME
- rr.dr.d_content = r;
+ rr.dr.d_content = r_it;
rr.scopeMask = p.getRealRemote().getBits(); // this makes sure answer is a specific as your question
rrset.push_back(rr);
}
}
const std::string prefix(exportDS ? "" : "DS = ");
- cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::SHA1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
- cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::SHA256).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
+ cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_SHA1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
+ cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_SHA256).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
try {
- string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::GOST).getZoneRepresentation();
+ string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_GOST).getZoneRepresentation();
cout<<prefix<<zone.toString()<<" IN DS "<<output<< " ; ( GOST R 34.11-94 digest )" << endl;
}
catch(...)
{}
try {
- string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::SHA384).getZoneRepresentation();
+ string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_SHA384).getZoneRepresentation();
cout<<prefix<<zone.toString()<<" IN DS "<<output<< " ; ( SHA-384 digest )" << endl;
}
catch(...)
if (value.second.keyType == DNSSECKeeper::KSK || value.second.keyType == DNSSECKeeper::CSK) {
const auto &key = value.first.getDNSKEY();
const std::string prefix(exportDS ? "" : "DS = ");
- cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::SHA1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
- cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::SHA256).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
+ cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_SHA1).getZoneRepresentation() << " ; ( SHA1 digest )" << endl;
+ cout<<prefix<<zone.toString()<<" IN DS "<<makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_SHA256).getZoneRepresentation() << " ; ( SHA256 digest )" << endl;
try {
- string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::GOST).getZoneRepresentation();
+ string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_GOST).getZoneRepresentation();
cout<<prefix<<zone.toString()<<" IN DS "<<output<< " ; ( GOST R 34.11-94 digest )" << endl;
}
catch(...)
{}
try {
- string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::SHA384).getZoneRepresentation();
+ string output=makeDSFromDNSKey(zone, key, DNSSECKeeper::DIGEST_SHA384).getZoneRepresentation();
cout<<prefix<<zone.toString()<<" IN DS "<<output<< " ; ( SHA-384 digest )" << endl;
}
catch(...)
ret = (ru.ru_utime.tv_sec*1000ULL + ru.ru_utime.tv_usec/1000);
ret += (ru.ru_stime.tv_sec*1000ULL + ru.ru_stime.tv_usec/1000);
#endif
- return new ThreadTimes{ret};
+ return new ThreadTimes{ret, vector<uint64_t>()};
}
/* Next up, when you want msec data for a specific thread, we check
AC_CANONICAL_HOST
# Add some default CFLAGS and CXXFLAGS, can be appended to using the environment variables
-CFLAGS="-Wall -g -O2 $CFLAGS"
-CXXFLAGS="-Wall -g -O2 $CXXFLAGS"
+CFLAGS="-Wall -Wextra -Wshadow -Wno-unused-parameter -g -O2 $CFLAGS"
+CXXFLAGS="-Wall -Wextra -Wshadow -Wno-unused-parameter -g -O2 $CXXFLAGS"
AC_SUBST([pdns_configure_args],["$ac_configure_args"])
AC_DEFINE_UNQUOTED([PDNS_CONFIG_ARGS],
BOOST_REQUIRE_EQUAL(res, 0);
/* 3 EDNS options but two of them are EDNS Cookie, so we only have two entries in the map */
- BOOST_CHECK_EQUAL(options.size(), 2);
+ BOOST_CHECK_EQUAL(options.size(), 2U);
auto it = options.find(EDNSOptionCode::ECS);
BOOST_REQUIRE(it != options.end());
- BOOST_REQUIRE_EQUAL(it->second.values.size(), 1);
+ BOOST_REQUIRE_EQUAL(it->second.values.size(), 1U);
BOOST_REQUIRE(it->second.values.at(0).content != nullptr);
- BOOST_REQUIRE_GT(it->second.values.at(0).size, 0);
+ BOOST_REQUIRE_GT(it->second.values.at(0).size, 0U);
EDNSSubnetOpts eso;
BOOST_REQUIRE(getEDNSSubnetOptsFromString(it->second.values.at(0).content, it->second.values.at(0).size, &eso));
it = options.find(EDNSOptionCode::COOKIE);
BOOST_REQUIRE(it != options.end());
- BOOST_REQUIRE_EQUAL(it->second.values.size(), 2);
+ BOOST_REQUIRE_EQUAL(it->second.values.size(), 2U);
BOOST_REQUIRE(it->second.values.at(0).content != nullptr);
- BOOST_REQUIRE_GT(it->second.values.at(0).size, 0);
+ BOOST_REQUIRE_GT(it->second.values.at(0).size, 0U);
BOOST_REQUIRE(it->second.values.at(1).content != nullptr);
- BOOST_REQUIRE_GT(it->second.values.at(1).size, 0);
+ BOOST_REQUIRE_GT(it->second.values.at(1).size, 0U);
}
static void checkECSOptionValidity(const std::string& sourceStr, uint8_t sourceMask, uint8_t scopeMask)
zone->setDomain(DNSName("powerdns.com."));
BOOST_CHECK_EQUAL(zone->getDomain(), DNSName("powerdns.com."));
zone->setSerial(42);
- BOOST_CHECK_EQUAL(zone->getSerial(), 42);
+ BOOST_CHECK_EQUAL(zone->getSerial(), 42U);
zone->setRefresh(99);
- BOOST_CHECK_EQUAL(zone->getRefresh(), 99);
+ BOOST_CHECK_EQUAL(zone->getRefresh(), 99U);
const ComboAddress nsIP("192.0.2.1");
const DNSName nsName("ns.bad.wolf.");
const DNSName blockedName("blocked.");
const DNSName blockedWildcardName("*.wildcard-blocked.");
const ComboAddress responseIP("192.0.2.254");
- BOOST_CHECK_EQUAL(zone->size(), 0);
+ BOOST_CHECK_EQUAL(zone->size(), 0U);
zone->addClientTrigger(Netmask(clientIP, 32), DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::ClientIP));
- BOOST_CHECK_EQUAL(zone->size(), 1);
+ BOOST_CHECK_EQUAL(zone->size(), 1U);
zone->addQNameTrigger(blockedName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::QName));
- BOOST_CHECK_EQUAL(zone->size(), 2);
+ BOOST_CHECK_EQUAL(zone->size(), 2U);
zone->addQNameTrigger(blockedWildcardName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::QName));
- BOOST_CHECK_EQUAL(zone->size(), 3);
+ BOOST_CHECK_EQUAL(zone->size(), 3U);
zone->addNSIPTrigger(Netmask(nsIP, 32), DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::NSIP));
- BOOST_CHECK_EQUAL(zone->size(), 4);
+ BOOST_CHECK_EQUAL(zone->size(), 4U);
zone->addNSTrigger(nsName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::NSDName));
- BOOST_CHECK_EQUAL(zone->size(), 5);
+ BOOST_CHECK_EQUAL(zone->size(), 5U);
zone->addNSTrigger(nsWildcardName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::NSDName));
- BOOST_CHECK_EQUAL(zone->size(), 6);
+ BOOST_CHECK_EQUAL(zone->size(), 6U);
zone->addResponseTrigger(Netmask(responseIP, 32), DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::ResponseIP));
- BOOST_CHECK_EQUAL(zone->size(), 7);
+ BOOST_CHECK_EQUAL(zone->size(), 7U);
size_t zoneIdx = dfe.addZone(zone);
- BOOST_CHECK_EQUAL(dfe.size(), 1);
+ BOOST_CHECK_EQUAL(dfe.size(), 1U);
BOOST_CHECK(dfe.getZone(zoneName) == zone);
BOOST_CHECK(dfe.getZone(zoneIdx) == zone);
dfe.setZone(zoneIdx, zone);
- BOOST_CHECK_EQUAL(dfe.size(), 1);
+ BOOST_CHECK_EQUAL(dfe.size(), 1U);
BOOST_CHECK(dfe.getZone(zoneName) == zone);
BOOST_CHECK(dfe.getZone(zoneIdx) == zone);
BOOST_CHECK(zone->findResponsePolicy(ComboAddress("192.0.2.142"), zonePolicy) == false);
}
- BOOST_CHECK_EQUAL(zone->size(), 7);
+ BOOST_CHECK_EQUAL(zone->size(), 7U);
zone->rmClientTrigger(Netmask(clientIP, 32), DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::ClientIP));
- BOOST_CHECK_EQUAL(zone->size(), 6);
+ BOOST_CHECK_EQUAL(zone->size(), 6U);
zone->rmQNameTrigger(blockedName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::QName));
- BOOST_CHECK_EQUAL(zone->size(), 5);
+ BOOST_CHECK_EQUAL(zone->size(), 5U);
zone->rmQNameTrigger(blockedWildcardName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::QName));
- BOOST_CHECK_EQUAL(zone->size(), 4);
+ BOOST_CHECK_EQUAL(zone->size(), 4U);
zone->rmNSIPTrigger(Netmask(nsIP, 32), DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::NSIP));
- BOOST_CHECK_EQUAL(zone->size(), 3);
+ BOOST_CHECK_EQUAL(zone->size(), 3U);
zone->rmNSTrigger(nsName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::NSDName));
- BOOST_CHECK_EQUAL(zone->size(), 2);
+ BOOST_CHECK_EQUAL(zone->size(), 2U);
zone->rmNSTrigger(nsWildcardName, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::NSDName));
- BOOST_CHECK_EQUAL(zone->size(), 1);
+ BOOST_CHECK_EQUAL(zone->size(), 1U);
zone->rmResponseTrigger(Netmask(responseIP, 32), DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Drop, DNSFilterEngine::PolicyType::ResponseIP));
- BOOST_CHECK_EQUAL(zone->size(), 0);
+ BOOST_CHECK_EQUAL(zone->size(), 0U);
/* DNSFilterEngine::clear() calls clear() on all zones, but keeps the zones */
dfe.clear();
- BOOST_CHECK_EQUAL(dfe.size(), 1);
+ BOOST_CHECK_EQUAL(dfe.size(), 1U);
BOOST_CHECK(dfe.getZone(zoneName) == zone);
BOOST_CHECK(dfe.getZone(zoneIdx) == zone);
}
const DNSName bad2("bad2.example.com.");
zone->addQNameTrigger(bad1, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Custom, DNSFilterEngine::PolicyType::QName, 0, nullptr, { DNSRecordContent::mastermake(QType::CNAME, QClass::IN, "garden.example.net.") } ));
- BOOST_CHECK_EQUAL(zone->size(), 1);
+ BOOST_CHECK_EQUAL(zone->size(), 1U);
zone->addQNameTrigger(bad2, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Custom, DNSFilterEngine::PolicyType::QName, 0, nullptr, { DNSRecordContent::mastermake(QType::A, QClass::IN, "192.0.2.1") } ));
- BOOST_CHECK_EQUAL(zone->size(), 2);
+ BOOST_CHECK_EQUAL(zone->size(), 2U);
zone->addQNameTrigger(bad2, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Custom, DNSFilterEngine::PolicyType::QName, 0, nullptr, { DNSRecordContent::mastermake(QType::A, QClass::IN, "192.0.2.2") } ));
- BOOST_CHECK_EQUAL(zone->size(), 2);
+ BOOST_CHECK_EQUAL(zone->size(), 2U);
zone->addQNameTrigger(bad2, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Custom, DNSFilterEngine::PolicyType::QName, 0, nullptr, { DNSRecordContent::mastermake(QType::MX, QClass::IN, "10 garden-mail.example.net.") } ));
- BOOST_CHECK_EQUAL(zone->size(), 2);
+ BOOST_CHECK_EQUAL(zone->size(), 2U);
dfe.addZone(zone);
BOOST_CHECK(matchingPolicy.d_type == DNSFilterEngine::PolicyType::QName);
BOOST_CHECK(matchingPolicy.d_kind == DNSFilterEngine::PolicyKind::Custom);
auto records = matchingPolicy.getCustomRecords(bad1, QType::A);
- BOOST_CHECK_EQUAL(records.size(), 1);
+ BOOST_CHECK_EQUAL(records.size(), 1U);
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::CNAME);
BOOST_CHECK(record.d_class == QClass::IN);
{
auto records = matchingPolicy.getCustomRecords(bad2, QType::A);
- BOOST_REQUIRE_EQUAL(records.size(), 2);
+ BOOST_REQUIRE_EQUAL(records.size(), 2U);
{
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::A);
{
auto records = matchingPolicy.getCustomRecords(bad2, QType::MX);
- BOOST_CHECK_EQUAL(records.size(), 1);
+ BOOST_CHECK_EQUAL(records.size(), 1U);
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::MX);
BOOST_CHECK(record.d_class == QClass::IN);
{
/* the name exists but there is no CNAME nor matching type, so NODATA */
auto records = matchingPolicy.getCustomRecords(bad2, QType::AAAA);
- BOOST_CHECK_EQUAL(records.size(), 0);
+ BOOST_CHECK_EQUAL(records.size(), 0U);
}
}
/* remove only one entry, one of the A local records */
zone->rmQNameTrigger(bad2, DNSFilterEngine::Policy(DNSFilterEngine::PolicyKind::Custom, DNSFilterEngine::PolicyType::QName, 0, nullptr, { DNSRecordContent::mastermake(QType::A, QClass::IN, "192.0.2.1") } ));
- BOOST_CHECK_EQUAL(zone->size(), 2);
+ BOOST_CHECK_EQUAL(zone->size(), 2U);
{
/* exact type exists */
{
auto records = matchingPolicy.getCustomRecords(bad2, QType::A);
- BOOST_REQUIRE_EQUAL(records.size(), 1);
+ BOOST_REQUIRE_EQUAL(records.size(), 1U);
{
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::A);
{
auto records = matchingPolicy.getCustomRecords(bad2, QType::MX);
- BOOST_CHECK_EQUAL(records.size(), 1);
+ BOOST_CHECK_EQUAL(records.size(), 1U);
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::MX);
BOOST_CHECK(record.d_class == QClass::IN);
{
/* the name exists but there is no CNAME nor matching type, so NODATA */
auto records = matchingPolicy.getCustomRecords(bad2, QType::AAAA);
- BOOST_CHECK_EQUAL(records.size(), 0);
+ BOOST_CHECK_EQUAL(records.size(), 0U);
}
}
}
BOOST_CHECK(matchingPolicy.d_type == DNSFilterEngine::PolicyType::QName);
BOOST_CHECK(matchingPolicy.d_kind == DNSFilterEngine::PolicyKind::Custom);
auto records = matchingPolicy.getCustomRecords(bad, QType::A);
- BOOST_CHECK_EQUAL(records.size(), 1);
+ BOOST_CHECK_EQUAL(records.size(), 1U);
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::CNAME);
BOOST_CHECK(record.d_class == QClass::IN);
BOOST_CHECK(matchingPolicy.d_type == DNSFilterEngine::PolicyType::QName);
BOOST_CHECK(matchingPolicy.d_kind == DNSFilterEngine::PolicyKind::Custom);
auto records = matchingPolicy.getCustomRecords(bad, QType::A);
- BOOST_CHECK_EQUAL(records.size(), 1);
+ BOOST_CHECK_EQUAL(records.size(), 1U);
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::CNAME);
BOOST_CHECK(record.d_class == QClass::IN);
BOOST_CHECK(matchingPolicy.d_type == DNSFilterEngine::PolicyType::QName);
BOOST_CHECK(matchingPolicy.d_kind == DNSFilterEngine::PolicyKind::Custom);
auto records = matchingPolicy.getCustomRecords(bad, QType::A);
- BOOST_CHECK_EQUAL(records.size(), 1);
+ BOOST_CHECK_EQUAL(records.size(), 1U);
const auto& record = records.at(0);
BOOST_CHECK(record.d_type == QType::CNAME);
BOOST_CHECK(record.d_class == QClass::IN);
NegCache cache;
cache.add(genNegCacheEntry(qname, auth, now));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
bool ret = cache.get(qname, QType(1), now, &ne);
NegCache cache;
cache.add(genNegCacheEntry(qname, auth, now));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
bool ret = cache.get(qname, QType(1), now, &ne, true);
NegCache cache;
cache.add(genNegCacheEntry(qname, auth, now, 1));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
bool ret = cache.get(qname, QType(1), now, &ne);
NegCache cache;
cache.add(genNegCacheEntry(qname, auth, now));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
bool ret = cache.getRootNXTrust(qname, now, &ne);
NegCache cache;
cache.add(genNegCacheEntry(qname, auth, now));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
NegCache cache;
cache.add(genNegCacheEntry(qname, auth, now));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
// Should override the existing entry for www2.powerdns.com
cache.add(genNegCacheEntry(qname, auth2, now));
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* ne = nullptr;
bool ret = cache.get(qname, QType(1), now, &ne);
cache.add(ne);
}
- BOOST_CHECK_EQUAL(cache.size(), 400);
+ BOOST_CHECK_EQUAL(cache.size(), 400U);
cache.prune(100);
- BOOST_CHECK_EQUAL(cache.size(), 100);
+ BOOST_CHECK_EQUAL(cache.size(), 100U);
}
BOOST_AUTO_TEST_CASE(test_prune_valid_entries) {
ne = genNegCacheEntry(power2, auth, now);
cache.add(ne);
- BOOST_CHECK_EQUAL(cache.size(), 2);
+ BOOST_CHECK_EQUAL(cache.size(), 2U);
/* power2 has been inserted more recently, so it should be
removed last */
cache.prune(1);
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
const NegCache::NegCacheEntry* got = nullptr;
bool ret = cache.get(power2, QType(1), now, &got);
/* insert power1 back */
ne = genNegCacheEntry(power1, auth, now);
cache.add(ne);
- BOOST_CHECK_EQUAL(cache.size(), 2);
+ BOOST_CHECK_EQUAL(cache.size(), 2U);
/* replace the entry for power2 */
ne = genNegCacheEntry(power2, auth, now);
cache.add(ne);
- BOOST_CHECK_EQUAL(cache.size(), 2);
+ BOOST_CHECK_EQUAL(cache.size(), 2U);
/* power2 has been updated more recently, so it should be
removed last */
cache.prune(1);
- BOOST_CHECK_EQUAL(cache.size(), 1);
+ BOOST_CHECK_EQUAL(cache.size(), 1U);
got = nullptr;
ret = cache.get(power2, QType(1), now, &got);
BOOST_REQUIRE(ret);
cache.add(ne);
}
- BOOST_CHECK_EQUAL(cache.size(), 401);
+ BOOST_CHECK_EQUAL(cache.size(), 401U);
// Should only wipe the powerdns.com entry
cache.wipe(auth);
- BOOST_CHECK_EQUAL(cache.size(), 400);
+ BOOST_CHECK_EQUAL(cache.size(), 400U);
const NegCache::NegCacheEntry* ne2 = nullptr;
bool ret = cache.get(auth, QType(1), now, &ne2);
BOOST_CHECK(ne2 == nullptr);
cache.wipe(DNSName("1.powerdns.com"));
- BOOST_CHECK_EQUAL(cache.size(), 399);
+ BOOST_CHECK_EQUAL(cache.size(), 399U);
const NegCache::NegCacheEntry* ne3 = nullptr;
ret = cache.get(auth, QType(1), now, &ne3);
cache.add(ne);
}
- BOOST_CHECK_EQUAL(cache.size(), 801);
+ BOOST_CHECK_EQUAL(cache.size(), 801U);
// Should wipe all the *.powerdns.com and powerdns.com entries
cache.wipe(auth, true);
- BOOST_CHECK_EQUAL(cache.size(), 400);
+ BOOST_CHECK_EQUAL(cache.size(), 400U);
}
BOOST_AUTO_TEST_CASE(test_clear) {
cache.add(ne);
}
- BOOST_CHECK_EQUAL(cache.size(), 400);
+ BOOST_CHECK_EQUAL(cache.size(), 400U);
cache.clear();
- BOOST_CHECK_EQUAL(cache.size(), 0);
+ BOOST_CHECK_EQUAL(cache.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_dumpToFile) {
uint64_t count;
count = cache.count(auth);
- BOOST_CHECK_EQUAL(count, 1);
+ BOOST_CHECK_EQUAL(count, 1U);
count = cache.count(auth, QType(1));
- BOOST_CHECK_EQUAL(count, 0);
+ BOOST_CHECK_EQUAL(count, 0U);
}
BOOST_AUTO_TEST_SUITE_END()
std::vector<std::shared_ptr<RRSIGRecordContent>> signatures;
time_t now = time(nullptr);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
MRC.replace(now, DNSName("hello"), QType(QType::A), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_GT(MRC.bytes(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_GT(MRC.bytes(), 1U);
BOOST_CHECK_EQUAL(MRC.doWipeCache(DNSName("hello"), false, QType::A), 1);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.bytes(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.bytes(), 0U);
uint64_t counter = 0;
try {
std::vector<DNSRecord> retrieved;
ComboAddress who("192.0.2.1");
- uint64_t matches = 0;
+ int64_t matches = 0;
int64_t expected = counter-delcounter;
for(; delcounter < counter; ++delcounter) {
BOOST_CHECK_EQUAL(retrieved.size(), records.size());
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
time_t ttd = now + 30;
DNSName power("powerdns.com.");
// insert a subnet specific entry
records.push_back(dr1);
MRC.replace(now, power, QType(QType::AAAA), records, signatures, authRecords, true, boost::optional<Netmask>("192.0.2.1/25"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
retrieved.clear();
// subnet specific should be returned for a matching subnet
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::AAAA), false, &retrieved, ComboAddress("192.0.2.2"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
retrieved.clear();
// subnet specific should not be returned for a different subnet
BOOST_CHECK_LT(MRC.get(now, power, QType(QType::AAAA), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), 0);
- BOOST_CHECK_EQUAL(retrieved.size(), 0);
+ BOOST_CHECK_EQUAL(retrieved.size(), 0U);
// remove everything
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
// insert a NON-subnet specific entry
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
// NON-subnet specific should always be returned
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
retrieved.clear();
records.push_back(dr1);
MRC.replace(now, power, QType(QType::AAAA), records, signatures, authRecords, true, boost::optional<Netmask>("192.0.2.1/25"));
// we should not have replaced the existing entry
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
// insert a TXT one, we will use that later
records.clear();
records.push_back(dr1);
MRC.replace(now, power, QType(QType::TXT), records, signatures, authRecords, true, boost::none);
// we should not have replaced any existing entry
- BOOST_CHECK_EQUAL(MRC.size(), 3);
+ BOOST_CHECK_EQUAL(MRC.size(), 3U);
// we should still get the NON-subnet specific entry
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
retrieved.clear();
// we should get the subnet specific entry if we are from the right subnet
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::AAAA), false, &retrieved, ComboAddress("192.0.2.3"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
retrieved.clear();
// but nothing from a different subnet
BOOST_CHECK_LT(MRC.get(now, power, QType(QType::AAAA), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), 0);
- BOOST_CHECK_EQUAL(retrieved.size(), 0);
+ BOOST_CHECK_EQUAL(retrieved.size(), 0U);
retrieved.clear();
// QType::ANY should return any qtype, so from the right subnet we should get all of them
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::ANY), false, &retrieved, ComboAddress("192.0.2.3"), nullptr), (ttd-now));
- BOOST_CHECK_EQUAL(retrieved.size(), 3);
+ BOOST_CHECK_EQUAL(retrieved.size(), 3U);
for (const auto& rec : retrieved) {
BOOST_CHECK(rec.d_type == QType::A || rec.d_type == QType::AAAA || rec.d_type == QType::TXT);
}
// but only the non-subnet specific from the another subnet
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::ANY), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_CHECK_EQUAL(retrieved.size(), 2);
+ BOOST_CHECK_EQUAL(retrieved.size(), 2U);
for (const auto& rec : retrieved) {
BOOST_CHECK(rec.d_type == QType::A || rec.d_type == QType::TXT);
}
// QType::ADDR should return both A and AAAA but no TXT, so two entries from the right subnet
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::ADDR), false, &retrieved, ComboAddress("192.0.2.3"), nullptr), (ttd-now));
- BOOST_CHECK_EQUAL(retrieved.size(), 2);
+ BOOST_CHECK_EQUAL(retrieved.size(), 2U);
bool gotA = false;
bool gotAAAA = false;
for (const auto& rec : retrieved) {
// but only the non-subnet specific one from the another subnet
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::ADDR), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK(retrieved.at(0).d_type == QType::A);
retrieved.clear();
// entries are only valid until ttd, we should not get anything after that because they are expired
BOOST_CHECK_LT(MRC.get(ttd + 5, power, QType(QType::ADDR), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), 0);
- BOOST_CHECK_EQUAL(retrieved.size(), 0);
+ BOOST_CHECK_EQUAL(retrieved.size(), 0U);
retrieved.clear();
// let's age the records for our existing QType::TXT entry so they are now only valid for 5s
BOOST_CHECK_EQUAL(MRC.doAgeCache(now, power, QType::TXT, newTTL), true);
// we should still be able to retrieve it
- BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::TXT), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), newTTL);
- BOOST_CHECK_EQUAL(retrieved.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::TXT), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), static_cast<int32_t>(newTTL));
+ BOOST_CHECK_EQUAL(retrieved.size(), 1U);
BOOST_CHECK(retrieved.at(0).d_type == QType::TXT);
// please note that this is still a TTD at this point
BOOST_CHECK_EQUAL(retrieved.at(0).d_ttl, now + newTTL);
// but 10s later it should be gone
BOOST_CHECK_LT(MRC.get(now + 10, power, QType(QType::TXT), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), 0);
- BOOST_CHECK_EQUAL(retrieved.size(), 0);
+ BOOST_CHECK_EQUAL(retrieved.size(), 0U);
retrieved.clear();
// wipe everything
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
records.clear();
// insert auth record
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_CHECK_EQUAL(retrieved.size(), 1);
+ BOOST_CHECK_EQUAL(retrieved.size(), 1U);
DNSRecord dr3;
ComboAddress dr3Content("192.0.2.84");
// non-auth should not replace valid auth
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, false, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
// but non-auth _should_ replace expired auth
MRC.replace(ttd + 1, power, QType(QType::A), records, signatures, authRecords, false, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
BOOST_CHECK_EQUAL(MRC.get(ttd + 1, power, QType(QType::A), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (dr3.d_ttl - (ttd + 1)));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr3Content.toString());
// auth should replace non-auth
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, false, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
// let's first check that non-auth is not returned when we need authoritative data
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), true, &retrieved, ComboAddress("127.0.0.1"), nullptr), -now);
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("127.0.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
/**** Most specific netmask tests ****/
// wipe everything
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
records.clear();
// insert an entry for 192.0.0.1/8
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::optional<Netmask>("192.0.0.1/8"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* same as dr2 except for the actual IP */
DNSRecord dr4;
records.push_back(dr4);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::optional<Netmask>("192.168.0.1/31"));
// we should not have replaced any existing entry
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
// insert the same than the first one but for 192.168.0.2/32
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::optional<Netmask>("192.168.0.2/32"));
// we should not have replaced any existing entry
- BOOST_CHECK_EQUAL(MRC.size(), 3);
+ BOOST_CHECK_EQUAL(MRC.size(), 3U);
// we should get the most specific entry for 192.168.0.1, so the second one
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.168.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr4Content.toString());
retrieved.clear();
// wipe everything
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
records.clear();
// insert an entry for 192.0.0.1/8, non auth
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, false, boost::optional<Netmask>("192.0.0.1/8"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
// we should not get it when we need authoritative data
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), true, &retrieved, ComboAddress("192.168.0.1"), nullptr), -1);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 0);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 0U);
retrieved.clear();
// but we should when we are OK with non-auth
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.168.0.1"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
retrieved.clear();
}
std::vector<std::shared_ptr<RRSIGRecordContent>> signatures;
time_t now = time(nullptr);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
/* insert NS coming from a delegation */
time_t ttd = now + 30;
ns1.d_place = DNSResourceRecord::ANSWER;
records.push_back(ns1);
MRC.replace(now, ns1.d_name, QType(ns1.d_type), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* try to raise the TTL, simulating the delegated authoritative server
raising the TTL so the zone stays alive */
ns1.d_ttl = static_cast<uint32_t>(ttd + 3600);
records.push_back(ns1);
MRC.replace(now, ns1.d_name, QType(ns1.d_type), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* the TTL should not have been raisd */
std::vector<DNSRecord> retrieved;
BOOST_CHECK_EQUAL(MRC.get(now, ghost, QType(QType::NS), false, &retrieved, ComboAddress("192.0.2.2"), nullptr), (ttd-now));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(retrieved.at(0).d_ttl, static_cast<uint32_t>(ttd));
}
std::vector<DNSRecord> records;
std::vector<std::shared_ptr<RRSIGRecordContent>> signatures;
std::vector<std::shared_ptr<DNSRecord>> authRecs;
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
time_t now = time(nullptr);
DNSName power1("powerdns.com.");
DNSName power2("powerdns-1.com.");
records.push_back(dr2);
MRC.replace(now, power2, QType(dr2.d_type), records, signatures, authRecs, true, boost::none);
records.clear();
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* the one for power2 having been inserted
more recently should be removed last */
/* we ask that only entry remains in the cache */
MRC.doPrune(1);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* the remaining entry should be power2, but to get it
we need to go back in the past a bit */
BOOST_CHECK_EQUAL(MRC.get(ttd - 1, power2, QType(dr2.d_type), false, &retrieved, who, nullptr), 1);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
/* check that power1 is gone */
BOOST_CHECK_EQUAL(MRC.get(ttd - 1, power1, QType(dr1.d_type), false, &retrieved, who, nullptr), -1);
/* clear everything up */
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
records.clear();
/* insert both entries back */
records.push_back(dr2);
MRC.replace(now, power2, QType(dr2.d_type), records, signatures, authRecs, true, boost::none);
records.clear();
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* trigger a miss (expired) for power2 */
BOOST_CHECK_EQUAL(MRC.get(now, power2, QType(dr2.d_type), false, &retrieved, who, nullptr), -now);
queue, and should this time be removed first */
/* we ask that only entry remains in the cache */
MRC.doPrune(1);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* the remaining entry should be power1, but to get it
we need to go back in the past a bit */
BOOST_CHECK_EQUAL(MRC.get(ttd - 1, power1, QType(dr1.d_type), false, &retrieved, who, nullptr), 1);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* check that power2 is gone */
BOOST_CHECK_EQUAL(MRC.get(ttd - 1, power2, QType(dr2.d_type), false, &retrieved, who, nullptr), -1);
std::vector<DNSRecord> records;
std::vector<std::shared_ptr<RRSIGRecordContent>> signatures;
std::vector<std::shared_ptr<DNSRecord>> authRecs;
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
time_t now = time(nullptr);
DNSName power1("powerdns.com.");
DNSName power2("powerdns-1.com.");
records.push_back(dr2);
MRC.replace(now, power2, QType(dr2.d_type), records, signatures, authRecs, true, boost::none);
records.clear();
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* the one for power2 having been inserted
more recently should be removed last */
/* we ask that only entry remains in the cache */
MRC.doPrune(1);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* the remaining entry should be power2 */
BOOST_CHECK_EQUAL(MRC.get(now, power2, QType(dr2.d_type), false, &retrieved, who, nullptr), ttd-now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
/* check that power1 is gone */
BOOST_CHECK_EQUAL(MRC.get(now, power1, QType(dr1.d_type), false, &retrieved, who, nullptr), -1);
/* clear everything up */
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
records.clear();
/* insert both entries back */
records.push_back(dr2);
MRC.replace(now, power2, QType(dr2.d_type), records, signatures, authRecs, true, boost::none);
records.clear();
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* replace the entry for power1 */
records.push_back(dr1);
MRC.replace(now, power1, QType(dr1.d_type), records, signatures, authRecs, true, boost::none);
records.clear();
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* the replaced entry for power1 should have been moved
to the back of the expunge queue, so power2 should be at the front
and should this time be removed first */
/* we ask that only entry remains in the cache */
MRC.doPrune(1);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* the remaining entry should be power1 */
BOOST_CHECK_EQUAL(MRC.get(now, power1, QType(dr1.d_type), false, &retrieved, who, nullptr), ttd-now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* check that power2 is gone */
BOOST_CHECK_EQUAL(MRC.get(now, power2, QType(dr2.d_type), false, &retrieved, who, nullptr), -1);
/* clear everything up */
MRC.doWipeCache(DNSName("."), true);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
records.clear();
/* insert both entries back */
records.push_back(dr2);
MRC.replace(now, power2, QType(dr2.d_type), records, signatures, authRecs, true, boost::none);
records.clear();
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* get a hit for power1 */
BOOST_CHECK_EQUAL(MRC.get(now, power1, QType(dr1.d_type), false, &retrieved, who, nullptr), ttd-now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* the entry for power1 should have been moved to the back of the expunge queue
due to the hit, so power2 should be at the front and should this time be removed first */
/* we ask that only entry remains in the cache */
MRC.doPrune(1);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* the remaining entry should be power1 */
BOOST_CHECK_EQUAL(MRC.get(now, power1, QType(dr1.d_type), false, &retrieved, who, nullptr), ttd-now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* check that power2 is gone */
BOOST_CHECK_EQUAL(MRC.get(now, power2, QType(dr2.d_type), false, &retrieved, who, nullptr), -1);
MRC.doPrune(0);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
/* add a lot of netmask-specific entries */
for (size_t i = 0; i <= 255; i++) {
MRC.replace(now, power1, QType(QType::A), records, signatures, authRecs, true, Netmask(r1Content, 32));
}
- BOOST_CHECK_EQUAL(MRC.size(), 256);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 256U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* remove a bit less than half of them */
size_t keep = 129;
MRC.doPrune(keep);
BOOST_CHECK_EQUAL(MRC.size(), keep);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* check that we can still retrieve the remaining ones */
size_t found = 0;
auto ret = MRC.get(now, power1, QType(QType::A), false, &retrieved, whoLoop);
if (ret > 0) {
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), whoLoop.toString());
found++;
}
else {
BOOST_REQUIRE_EQUAL(ret, -1);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 0);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 0U);
}
}
/* remove the rest */
MRC.doPrune(0);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
}
BOOST_AUTO_TEST_CASE(test_RecursorCacheECSIndex) {
dr2.d_ttl = static_cast<uint32_t>(now + 5);
dr2.d_place = DNSResourceRecord::ANSWER;
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* no entry in the ECS index, no non-specific entry either */
retrieved.clear();
records.push_back(dr1);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* retrieve the non-specific entry */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, who), ttd - now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* wipe everything */
MRC.doPrune(0);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* insert a specific entry */
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* there is an ECS index for that entry but no match, and no non-specific entry */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.4")), -1);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 0);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 0U);
/* there is an ECS index for that entry and we get a match */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.1")), ttd - now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* there is an ECS index for that entry and we get a match,
but it has expired. No other match, no non-specific entry */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now + ttl + 1, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.1")), -1);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 0);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 0U);
/* The ECS index should now be empty, but the cache entry has not been expunged yet */
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
/* add back the entry while it still exists in the cache but has been removed from the ECS index.
It should be added back to the ECS index, and we should be able to retrieve it */
MRC.replace(now + ttl + 1, power, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.1")), ttd - now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* wipe everything */
MRC.doPrune(0);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* insert a specific entry */
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/24"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* insert a slightly more specific one, but expiring sooner */
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/26"));
- BOOST_CHECK_EQUAL(MRC.size(), 2);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* check that we get the most specific one as long as it's still valid */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.1")), 5);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr2Content.toString());
/* there is an ECS index for that entry and we get a match,
The second ECS is a match too, and is valid. */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now + 5 + 1, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.1")), (ttd - (now +5 + 1)));
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
/* The ECS index should not be empty */
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
- BOOST_CHECK_EQUAL(MRC.size(), 2);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
/* wipe everything */
MRC.doPrune(0);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* insert a non-specific entry */
records.clear();
records.push_back(dr1);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, boost::none);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* insert a subnet-specific entry */
records.clear();
records.push_back(dr2);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.42/32"));
- BOOST_CHECK_EQUAL(MRC.size(), 2);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* there is an ECS index for that entry and it doesn't match. No other match, but we have a non-specific entry */
retrieved.clear();
BOOST_CHECK_EQUAL(MRC.get(now, power, QType(QType::A), false, &retrieved, ComboAddress("192.0.2.255")), ttd - now);
- BOOST_REQUIRE_EQUAL(retrieved.size(), 1);
+ BOOST_REQUIRE_EQUAL(retrieved.size(), 1U);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(retrieved.at(0))->getCA().toString(), dr1Content.toString());
- BOOST_CHECK_EQUAL(MRC.size(), 2);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* wipe everything */
MRC.doPrune(0);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
}
BOOST_AUTO_TEST_CASE(test_RecursorCache_Wipe) {
dr1.d_ttl = static_cast<uint32_t>(ttd);
dr1.d_place = DNSResourceRecord::ANSWER;
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
/* no entry in the ECS index, no non-specific entry either */
retrieved.clear();
records.push_back(dr1);
MRC.replace(now, power, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
/* insert two sub-domains entries */
DNSName sub1("a.powerdns.com.");
records.push_back(dr1);
MRC.replace(now, sub1, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 2);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 2U);
DNSName sub2("z.powerdns.com.");
dr1.d_name = sub2;
records.push_back(dr1);
MRC.replace(now, sub2, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 3);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 3);
+ BOOST_CHECK_EQUAL(MRC.size(), 3U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 3U);
/* insert two entries for different domains */
DNSName other1("b\bpowerdns.com.");
records.push_back(dr1);
MRC.replace(now, other1, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 4);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 4);
+ BOOST_CHECK_EQUAL(MRC.size(), 4U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 4U);
DNSName other2("c\bpowerdns.com.");
dr1.d_name = other2;
records.push_back(dr1);
MRC.replace(now, other2, QType(QType::A), records, signatures, authRecords, true, Netmask("192.0.2.0/31"));
- BOOST_CHECK_EQUAL(MRC.size(), 5);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 5);
+ BOOST_CHECK_EQUAL(MRC.size(), 5U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 5U);
/* wipe everything under the powerdns.com domain */
BOOST_CHECK_EQUAL(MRC.doWipeCache(power, true), 3);
- BOOST_CHECK_EQUAL(MRC.size(), 2);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 2);
+ BOOST_CHECK_EQUAL(MRC.size(), 2U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 2U);
/* now wipe the other domains too */
BOOST_CHECK_EQUAL(MRC.doWipeCache(other1, true), 1);
- BOOST_CHECK_EQUAL(MRC.size(), 1);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1);
+ BOOST_CHECK_EQUAL(MRC.size(), 1U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 1U);
BOOST_CHECK_EQUAL(MRC.doWipeCache(other2, true), 1);
- BOOST_CHECK_EQUAL(MRC.size(), 0);
- BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0);
+ BOOST_CHECK_EQUAL(MRC.size(), 0U);
+ BOOST_CHECK_EQUAL(MRC.ecsIndexSize(), 0U);
}
BOOST_AUTO_TEST_SUITE_END()
SyncRes::setECSScopeZeroAddress(Netmask("127.0.0.1/32"));
SyncRes::clearNSSpeeds();
- BOOST_CHECK_EQUAL(SyncRes::getNSSpeedsSize(), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getNSSpeedsSize(), 0U);
SyncRes::clearEDNSStatuses();
- BOOST_CHECK_EQUAL(SyncRes::getEDNSStatusesSize(), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getEDNSStatusesSize(), 0U);
SyncRes::clearThrottle();
- BOOST_CHECK_EQUAL(SyncRes::getThrottledServersSize(), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getThrottledServersSize(), 0U);
SyncRes::clearFailedServers();
- BOOST_CHECK_EQUAL(SyncRes::getFailedServersSize(), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getFailedServersSize(), 0U);
SyncRes::clearECSStats();
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
res = sr->beginResolve(target, QType(QType::AAAA), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::AAAA);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 13);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 13U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_root_not_primed) {
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("."), QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_root_not_primed_and_no_response) {
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("."), QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
BOOST_CHECK(downServers.size() > 0);
/* we explicitly refuse to mark the root servers down */
for (const auto& server : downServers) {
- BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 0U);
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("powerdns.com."), QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesWithEDNS, sample ? 3 : 1);
- BOOST_CHECK_EQUAL(queriesWithoutEDNS, sample ? 4 : 1);
- BOOST_CHECK_EQUAL(SyncRes::getEDNSStatusesSize(), sample ? 3 : 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesWithEDNS, sample ? 3U : 1U);
+ BOOST_CHECK_EQUAL(queriesWithoutEDNS, sample ? 4U : 1U);
+ BOOST_CHECK_EQUAL(SyncRes::getEDNSStatusesSize(), sample ? 3U : 1U);
BOOST_CHECK_EQUAL(SyncRes::getEDNSStatus(noEDNSServer), SyncRes::EDNSStatus::NOEDNS);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("powerdns.com."), QType(QType::DNAME), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesWithEDNS, 26);
- BOOST_CHECK_EQUAL(queriesWithoutEDNS, 0);
- BOOST_CHECK_EQUAL(SyncRes::getEDNSStatusesSize(), 26);
- BOOST_CHECK_EQUAL(usedServers.size(), 26);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesWithEDNS, 26U);
+ BOOST_CHECK_EQUAL(queriesWithoutEDNS, 0U);
+ BOOST_CHECK_EQUAL(SyncRes::getEDNSStatusesSize(), 26U);
+ BOOST_CHECK_EQUAL(usedServers.size(), 26U);
for (const auto& server : usedServers) {
BOOST_CHECK_EQUAL(SyncRes::getEDNSStatus(server), SyncRes::EDNSStatus::EDNSOK);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("powerdns.com."), QType(qtype), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -1);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("powerdns.com."), QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(tcpQueriesCount, 2);
+ BOOST_CHECK_EQUAL(tcpQueriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_all_nss_down) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(downServers.size(), 4);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(downServers.size(), 4U);
time_t now = sr->getNow().tv_sec;
for (const auto& server : downServers) {
- BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 1);
+ BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 1U);
BOOST_CHECK(SyncRes::isThrottled(now, server, target, QType::A));
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(downServers.size(), 4);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(downServers.size(), 4U);
time_t now = sr->getNow().tv_sec;
for (const auto& server : downServers) {
- BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 1);
+ BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 1U);
BOOST_CHECK(SyncRes::isThrottled(now, server, target, QType::A));
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_os_limit_errors) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(downServers.size(), 3);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(downServers.size(), 3U);
/* Error is reported as "OS limit error" (-2) so the servers should _NOT_ be marked down */
time_t now = sr->getNow().tv_sec;
for (const auto& server : downServers) {
- BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getServerFailsCount(server), 0U);
BOOST_CHECK(!SyncRes::isThrottled(now, server, target, QType::A));
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
- BOOST_CHECK_EQUAL(SyncRes::s_ecsqueries, 2);
- BOOST_CHECK_EQUAL(SyncRes::s_ecsresponses, 1);
+ BOOST_CHECK_EQUAL(SyncRes::s_ecsqueries, 2U);
+ BOOST_CHECK_EQUAL(SyncRes::s_ecsresponses, 1U);
for (const auto& entry : SyncRes::s_ecsResponsesBySubnetSize4) {
- BOOST_CHECK_EQUAL(entry.second, entry.first == 15 ? 1 : 0);
+ BOOST_CHECK_EQUAL(entry.second, entry.first == 15 ? 1U : 0U);
}
for (const auto& entry : SyncRes::s_ecsResponsesBySubnetSize6) {
- BOOST_CHECK_EQUAL(entry.second, 0);
+ BOOST_CHECK_EQUAL(entry.second, 0U);
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
- BOOST_CHECK_EQUAL(SyncRes::s_ecsqueries, 1);
- BOOST_CHECK_EQUAL(SyncRes::s_ecsresponses, 1);
+ BOOST_CHECK_EQUAL(SyncRes::s_ecsqueries, 1U);
+ BOOST_CHECK_EQUAL(SyncRes::s_ecsresponses, 1U);
for (const auto& entry : SyncRes::s_ecsResponsesBySubnetSize4) {
- BOOST_CHECK_EQUAL(entry.second, 0);
+ BOOST_CHECK_EQUAL(entry.second, 0u);
}
for (const auto& entry : SyncRes::s_ecsResponsesBySubnetSize6) {
- BOOST_CHECK_EQUAL(entry.second, entry.first == 55 ? 1 : 0);
+ BOOST_CHECK_EQUAL(entry.second, entry.first == 55 ? 1U : 0U);
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
BOOST_CHECK(ret[1].d_type == QType::A);
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
BOOST_CHECK(ret[1].d_type == QType::SOA);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
BOOST_CHECK(ret[1].d_type == QType::SOA);
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_REQUIRE(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
BOOST_CHECK_EQUAL(getRR<CNAMERecordContent>(ret[0])->getTarget(), cnameTarget);
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_GT(ret.size(), 0);
- BOOST_CHECK_EQUAL(count, 2);
+ BOOST_CHECK_GT(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(count, 2U);
}
BOOST_AUTO_TEST_CASE(test_cname_depth) {
BOOST_CHECK_EQUAL(res, RCode::ServFail);
BOOST_CHECK_EQUAL(ret.size(), depth);
/* we have an arbitrary limit at 10 when following a CNAME chain */
- BOOST_CHECK_EQUAL(depth, 10 + 2);
+ BOOST_CHECK_EQUAL(depth, 10U + 2U);
}
BOOST_AUTO_TEST_CASE(test_time_limit) {
}
catch(const ImmediateServFailException& e) {
}
- BOOST_CHECK_EQUAL(queries, 1);
+ BOOST_CHECK_EQUAL(queries, 1U);
}
BOOST_AUTO_TEST_CASE(test_dname_processing) {
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
- BOOST_CHECK_EQUAL(queries, 4);
+ BOOST_CHECK_EQUAL(queries, 4u);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
- BOOST_CHECK_EQUAL(queries, 4);
+ BOOST_CHECK_EQUAL(queries, 4U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
res = sr->beginResolve(uncachedTarget, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(queries, 5);
+ BOOST_CHECK_EQUAL(queries, 5U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
ret.clear();
res = sr->beginResolve(dnameOwner, QType(QType::DNAME), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(queries, 5);
+ BOOST_CHECK_EQUAL(queries, 5U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
ret.clear();
res = sr->beginResolve(synthCNAME, QType(QType::CNAME), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(queries, 5);
+ BOOST_CHECK_EQUAL(queries, 5U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(dnameOwner, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(dnameTarget, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(dnameOwner, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(dnameTarget, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queries = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 5); /* DNAME + RRSIG(DNAME) + CNAME + A + RRSIG(A) */
+ BOOST_REQUIRE_EQUAL(ret.size(), 5U); /* DNAME + RRSIG(DNAME) + CNAME + A + RRSIG(A) */
- BOOST_CHECK_EQUAL(queries, 11);
+ BOOST_CHECK_EQUAL(queries, 11U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 5); /* DNAME + RRSIG(DNAME) + CNAME + A + RRSIG(A) */
+ BOOST_REQUIRE_EQUAL(ret.size(), 5U); /* DNAME + RRSIG(DNAME) + CNAME + A + RRSIG(A) */
- BOOST_CHECK_EQUAL(queries, 11);
+ BOOST_CHECK_EQUAL(queries, 11U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(dnameOwner, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(dnameOwner, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queries = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4); /* DNAME + RRSIG(DNAME) + CNAME + A */
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U); /* DNAME + RRSIG(DNAME) + CNAME + A */
- BOOST_CHECK_EQUAL(queries, 9);
+ BOOST_CHECK_EQUAL(queries, 9U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4); /* DNAME + RRSIG(DNAME) + CNAME + A */
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U); /* DNAME + RRSIG(DNAME) + CNAME + A */
- BOOST_CHECK_EQUAL(queries, 9);
+ BOOST_CHECK_EQUAL(queries, 9U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
- BOOST_CHECK_EQUAL(queries, 4);
+ BOOST_CHECK_EQUAL(queries, 4U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
- BOOST_CHECK_EQUAL(queries, 4);
+ BOOST_CHECK_EQUAL(queries, 4U);
BOOST_REQUIRE(ret[0].d_type == QType::DNAME);
BOOST_CHECK(ret[0].d_name == dnameOwner);
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
/* we should not have sent any queries to ns */
- BOOST_CHECK_EQUAL(queriesToNS, 0);
+ BOOST_CHECK_EQUAL(queriesToNS, 0U);
}
BOOST_AUTO_TEST_CASE(test_throttled_server_count) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
/* we should not have sent any queries to ns */
- BOOST_CHECK_EQUAL(queriesToNS, 0);
+ BOOST_CHECK_EQUAL(queriesToNS, 0U);
}
BOOST_AUTO_TEST_CASE(test_root_nx_trust) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target1, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* one for target1 and one for the entire TLD */
- BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 2);
+ BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 2U);
ret.clear();
res = sr->beginResolve(target2, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK_LE(ret[0].d_ttl, SyncRes::s_maxnegttl);
/* one for target1 and one for the entire TLD */
- BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 2);
+ BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 2U);
/* we should have sent only one query */
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_root_nx_trust_specific) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target1, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* even with root-nx-trust on and a NX answer from the root,
we should not have cached the entire TLD this time. */
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
ret.clear();
res = sr->beginResolve(target2, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK_EQUAL(ret[0].d_name, target2);
BOOST_REQUIRE(ret[0].d_type == QType::A);
BOOST_CHECK(getRR<ARecordContent>(ret[0])->getCA() == ComboAddress("192.0.2.2"));
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
}
BOOST_AUTO_TEST_CASE(test_root_nx_dont_trust) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target1, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* one for target1 */
- BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 1U);
ret.clear();
res = sr->beginResolve(target2, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* one for target1 */
- BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 1U);
/* we should have sent three queries */
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
}
BOOST_AUTO_TEST_CASE(test_skip_negcache_for_variable_response) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
/* no negative cache entry because the response was variable */
- BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 0);
+ BOOST_CHECK_EQUAL(SyncRes::getNegCacheSize(), 0U);
}
BOOST_AUTO_TEST_CASE(test_ecs_cache_limit_allowed) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* should have been cached */
const ComboAddress who("192.0.2.128");
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_ecs_cache_limit_no_ttl_limit_allowed) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* should have been cached because /24 is more specific than /16 but TTL limit is nof effective */
const ComboAddress who("192.0.2.128");
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_allowed) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* should have been cached */
const ComboAddress who("192.0.2.128");
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_and_scope_allowed) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* should have been cached */
const ComboAddress who("192.0.2.128");
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_ecs_cache_ttllimit_notallowed) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
/* should have NOT been cached because TTL of 60 is too small and /24 is more specific than /16 */
const ComboAddress who("192.0.2.128");
vector<DNSRecord> cached;
BOOST_REQUIRE_LT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 0);
+ BOOST_REQUIRE_EQUAL(cached.size(), 0U);
}
nsCounts[ip]++;
if (ip == ComboAddress("[2001:DB8::2]:53") || ip == ComboAddress("192.0.2.2:53")) {
- BOOST_CHECK_LT(nsCounts.size(), 3);
+ BOOST_CHECK_LT(nsCounts.size(), 3U);
/* let's time out on pdns-public-ns2.powerdns.com. */
return 0;
}
else if (ip == ComboAddress("192.0.2.1:53")) {
- BOOST_CHECK_EQUAL(nsCounts.size(), 3);
+ BOOST_CHECK_EQUAL(nsCounts.size(), 3U);
setLWResult(res, 0, true, false, true);
addRecordToLW(res, domain, QType::A, "192.0.2.254");
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(nsCounts.size(), 3);
- BOOST_CHECK_EQUAL(nsCounts[ComboAddress("192.0.2.1:53")], 1);
- BOOST_CHECK_EQUAL(nsCounts[ComboAddress("192.0.2.2:53")], 1);
- BOOST_CHECK_EQUAL(nsCounts[ComboAddress("[2001:DB8::2]:53")], 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(nsCounts.size(), 3U);
+ BOOST_CHECK_EQUAL(nsCounts[ComboAddress("192.0.2.1:53")], 1U);
+ BOOST_CHECK_EQUAL(nsCounts[ComboAddress("192.0.2.2:53")], 1U);
+ BOOST_CHECK_EQUAL(nsCounts[ComboAddress("[2001:DB8::2]:53")], 1U);
}
BOOST_AUTO_TEST_CASE(test_flawed_nsset) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_completely_flawed_nsset) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
/* one query to get NSs, then A and AAAA for each NS */
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_cache_hit) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_no_rd) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_cache_min_max_ttl) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK_EQUAL(ret[0].d_ttl, SyncRes::s_minimumTTL);
const ComboAddress who;
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
BOOST_REQUIRE_GT(cached[0].d_ttl, now);
BOOST_CHECK_EQUAL((cached[0].d_ttl - now), SyncRes::s_minimumTTL);
cached.clear();
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::NS), false, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
BOOST_REQUIRE_GT(cached[0].d_ttl, now);
BOOST_CHECK_LE((cached[0].d_ttl - now), SyncRes::s_maxcachettl);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK_EQUAL(ret[0].d_ttl, SyncRes::s_minimumECSTTL);
const ComboAddress who("192.0.2.128");
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
BOOST_REQUIRE_GT(cached[0].d_ttl, now);
BOOST_CHECK_EQUAL((cached[0].d_ttl - now), SyncRes::s_minimumECSTTL);
cached.clear();
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::NS), false, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
BOOST_REQUIRE_GT(cached[0].d_ttl, now);
BOOST_CHECK_LE((cached[0].d_ttl - now), SyncRes::s_maxcachettl);
cached.clear();
BOOST_REQUIRE_GT(t_RC->get(now, DNSName("a.gtld-servers.net."), QType(QType::A), false, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
BOOST_REQUIRE_GT(cached[0].d_ttl, now);
BOOST_CHECK_LE((cached[0].d_ttl - now), SyncRes::s_minimumTTL);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_REQUIRE(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret[0])->getCA().toStringWithPort(), ComboAddress("192.0.2.2").toStringWithPort());
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_REQUIRE_EQUAL(QType(ret.at(0).d_type).getName(), QType(QType::A).getName());
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret.at(0))->getCA().toString(), ComboAddress("192.0.2.2").toString());
const ComboAddress who;
vector<DNSRecord> cached;
BOOST_REQUIRE_GT(t_RC->get(now, target, QType(QType::A), true, &cached, who), 0);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
BOOST_REQUIRE_EQUAL(QType(cached.at(0).d_type).getName(), QType(QType::A).getName());
BOOST_CHECK_EQUAL(getRR<ARecordContent>(cached.at(0))->getCA().toString(), ComboAddress("192.0.2.2").toString());
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_unauth_any) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::ANY), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
static void test_no_data_f(bool qmin) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_no_data) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_nodata_nsec_nodnssec) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_nodata_nsec_dnssec) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 4);
+ BOOST_CHECK_EQUAL(ret.size(), 4U);
}
BOOST_AUTO_TEST_CASE(test_nx_nsec_nodnssec) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_nx_nsec_dnssec) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 4);
+ BOOST_CHECK_EQUAL(ret.size(), 4U);
}
BOOST_AUTO_TEST_CASE(test_qclass_none) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::NONE, ret);
BOOST_CHECK_EQUAL(res, -1);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_answer_no_aa) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::ServFail);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
/* check that the record in the answer section has not been cached */
const ComboAddress who;
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::AXFR), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -1);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
res = sr->beginResolve(target, QType(QType::IXFR), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -1);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
res = sr->beginResolve(target, QType(QType::RRSIG), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -1);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
res = sr->beginResolve(target, QType(QType::NSEC3), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -1);
- BOOST_CHECK_EQUAL(ret.size(), 0);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_special_names) {
vector<DNSRecord> ret;
int res = sr->beginResolve(DNSName("1.0.0.127.in-addr.arpa."), QType(QType::PTR), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::PTR);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("1.0.0.127.in-addr.arpa."), QType(QType::ANY), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::PTR);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa."), QType(QType::PTR), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::PTR);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa."), QType(QType::ANY), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::PTR);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("localhost."), QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret[0])->getCA().toString(), "127.0.0.1");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("localhost."), QType(QType::AAAA), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::AAAA);
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(ret[0])->getCA().toString(), "::1");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("localhost."), QType(QType::ANY), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& rec : ret) {
BOOST_REQUIRE((rec.d_type == QType::A) || rec.d_type == QType::AAAA);
if (rec.d_type == QType::A) {
BOOST_CHECK_EQUAL(getRR<AAAARecordContent>(rec)->getCA().toString(), "::1");
}
}
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("version.bind."), QType(QType::TXT), QClass::CHAOS, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::TXT);
BOOST_CHECK_EQUAL(getRR<TXTRecordContent>(ret[0])->d_text, "\"PowerDNS Unit Tests\"");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("version.bind."), QType(QType::ANY), QClass::CHAOS, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::TXT);
BOOST_CHECK_EQUAL(getRR<TXTRecordContent>(ret[0])->d_text, "\"PowerDNS Unit Tests\"");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("version.pdns."), QType(QType::TXT), QClass::CHAOS, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::TXT);
BOOST_CHECK_EQUAL(getRR<TXTRecordContent>(ret[0])->d_text, "\"PowerDNS Unit Tests\"");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("version.pdns."), QType(QType::ANY), QClass::CHAOS, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::TXT);
BOOST_CHECK_EQUAL(getRR<TXTRecordContent>(ret[0])->d_text, "\"PowerDNS Unit Tests\"");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("id.server."), QType(QType::TXT), QClass::CHAOS, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::TXT);
BOOST_CHECK_EQUAL(getRR<TXTRecordContent>(ret[0])->d_text, "\"PowerDNS Unit Tests Server ID\"");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
ret.clear();
res = sr->beginResolve(DNSName("id.server."), QType(QType::ANY), QClass::CHAOS, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::TXT);
BOOST_CHECK_EQUAL(getRR<TXTRecordContent>(ret[0])->d_text, "\"PowerDNS Unit Tests Server ID\"");
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_nameserver_ipv4_rpz) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -2);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_nameserver_ipv6_rpz) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -2);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_nameserver_name_rpz) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, -2);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_nameserver_name_rpz_disabled) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_nord) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_rd) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* now make sure we can resolve from the cache (see #6340
where the entries were added to the cache but not retrieved,
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_nord) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd_dnssec) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
const ComboAddress forwardedNS("192.0.2.42:53");
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd_dnssec_bogus) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(cnameTarget, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(cnameTarget, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
const ComboAddress forwardedNS("192.0.2.42:53");
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_forward_zone_recurse_rd_dnssec_nodata_bogus) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
const ComboAddress forwardedNS("192.0.2.42:53");
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 0);
+ BOOST_REQUIRE_EQUAL(ret.size(), 0U);
/* com|NS, powerdns.com|NS, powerdns.com|A */
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 0);
+ BOOST_REQUIRE_EQUAL(ret.size(), 0U);
/* we don't store empty results */
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_oob) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, 0);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
BOOST_CHECK(sr->wasOutOfBand());
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, 0);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
BOOST_CHECK(sr->wasOutOfBand());
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
sr->setDNSSECValidationRequested(true);
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, 0);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
BOOST_CHECK(sr->wasOutOfBand());
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, 0);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK(ret[1].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
BOOST_CHECK(sr->wasOutOfBand());
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, 0);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK(ret[1].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
BOOST_CHECK(sr->wasOutOfBand());
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
sr->setDNSSECValidationRequested(true);
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, 0);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK(ret[1].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
BOOST_CHECK(sr->wasOutOfBand());
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret[0])->getCA().toString(), addr.toString());
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_cname_lead_to_oob) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(getRR<CNAMERecordContent>(ret[0])->getTarget().toString(), authZone.toString());
BOOST_CHECK(ret[1].d_type == QType::A);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret[1])->getCA().toString(), addr.toString());
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_oob_lead_to_outgoing_queryb) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(getRR<CNAMERecordContent>(ret[0])->getTarget().toString(), externalCNAME.toString());
BOOST_CHECK(ret[1].d_type == QType::A);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret[1])->getCA().toString(), addr.toString());
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_SUITE_END()
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::AAAA), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::SOA);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_nx) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::SOA);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_delegation) {
testkeysset_t keys;
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::SHA384, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::DIGEST_SHA384, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
/* make sure that the signature inception and validity times are computed
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_wildcard) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_wildcard_with_ent) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
// WARN below should be changed to CHECK once the issue is fixed.
const string m("Please fix issue #8312");
BOOST_WARN_MESSAGE(ret[0].d_type == QType::SOA, m);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_wildcard_nodata) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::AAAA), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::SOA);
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_auth_zone_cache_only) {
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
BOOST_CHECK_EQUAL(getRR<ARecordContent>(ret[0])->getCA().toString(), addr.toString());
- BOOST_CHECK_EQUAL(queriesCount, 0);
+ BOOST_CHECK_EQUAL(queriesCount, 0U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_rrsig) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_root_validation_ksk_zsk) {
DNSSECPrivateKey ksk;
ksk.d_flags = 257;
ksk.setKey(dckeZ);
- DSRecordContent kskds = makeDSFromDNSKey(target, ksk.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent kskds = makeDSFromDNSKey(target, ksk.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
auto dckeK = std::shared_ptr<DNSCryptoKeyEngine>(DNSCryptoKeyEngine::make(DNSSECKeeper::ECDSA256));
dckeK->create(dckeK->getBits());
DNSSECPrivateKey zsk;
zsk.d_flags = 256;
zsk.setKey(dckeK);
- DSRecordContent zskds = makeDSFromDNSKey(target, zsk.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent zskds = makeDSFromDNSKey(target, zsk.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
kskeys[target] = std::pair<DNSSECPrivateKey,DSRecordContent>(ksk, kskds);
zskeys[target] = std::pair<DNSSECPrivateKey,DSRecordContent>(zsk, zskds);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_dnskey) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_dnskey_doesnt_match_ds) {
DNSSECPrivateKey dskey;
dskey.d_flags = 257;
dskey.setKey(dckeDS);
- DSRecordContent drc = makeDSFromDNSKey(target, dskey.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent drc = makeDSFromDNSKey(target, dskey.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
auto dcke = std::shared_ptr<DNSCryptoKeyEngine>(DNSCryptoKeyEngine::make(DNSSECKeeper::ECDSA256));
dcke->create(dcke->getBits());
DNSSECPrivateKey dpk;
dpk.d_flags = 256;
dpk.setKey(dcke);
- DSRecordContent uselessdrc = makeDSFromDNSKey(target, dpk.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent uselessdrc = makeDSFromDNSKey(target, dpk.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
dskeys[target] = std::pair<DNSSECPrivateKey,DSRecordContent>(dskey, drc);
keys[target] = std::pair<DNSSECPrivateKey,DSRecordContent>(dpk, uselessdrc);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_rrsig_signed_with_unknown_dnskey) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
auto dckeRRSIG = std::shared_ptr<DNSCryptoKeyEngine>(DNSCryptoKeyEngine::make(DNSSECKeeper::ECDSA256));
DNSSECPrivateKey rrsigkey;
rrsigkey.d_flags = 257;
rrsigkey.setKey(dckeRRSIG);
- DSRecordContent rrsigds = makeDSFromDNSKey(target, rrsigkey.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent rrsigds = makeDSFromDNSKey(target, rrsigkey.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
rrsigkeys[target] = std::pair<DNSSECPrivateKey,DSRecordContent>(rrsigkey, rrsigds);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_no_rrsig) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* 13 NS + 0 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 13);
+ BOOST_REQUIRE_EQUAL(ret.size(), 13U);
/* no RRSIG so no query for DNSKEYs */
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 13);
+ BOOST_REQUIRE_EQUAL(ret.size(), 13U);
/* check that we capped the TTL to max-cache-bogus-ttl */
for (const auto& record : ret) {
BOOST_CHECK_LE(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_insecure_unknown_ds_algorithm) {
/* Fake algorithm number (private) */
dpk.d_algorithm = 253;
- DSRecordContent drc = makeDSFromDNSKey(target, dpk.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent drc = makeDSFromDNSKey(target, dpk.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
keys[target] = std::pair<DNSSECPrivateKey,DSRecordContent>(dpk, drc);
/* Fake algorithm number (private) */
drc.d_algorithm = 253;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
/* no supported DS so no query for DNSKEYs */
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_insecure_unknown_ds_digest) {
DNSSECPrivateKey dpk;
dpk.d_flags = 256;
dpk.setKey(dcke);
- DSRecordContent drc = makeDSFromDNSKey(target, dpk.getDNSKEY(), DNSSECKeeper::SHA256);
+ DSRecordContent drc = makeDSFromDNSKey(target, dpk.getDNSKEY(), DNSSECKeeper::DIGEST_SHA256);
/* Fake digest number (reserved) */
drc.d_digesttype = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
/* no supported DS so no query for DNSKEYs */
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_bad_sig) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::SHA384, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::DIGEST_SHA384, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_bad_algo) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::SHA384, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::DIGEST_SHA384, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::SHA384, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::DIGEST_SHA384, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
/* now we ask directly for the DS */
ret.clear();
res = sr->beginResolve(DNSName("com."), QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_unsigned_ds_direct) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::SHA384, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::DIGEST_SHA384, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(DNSName("com."), QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_SUITE_END()
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::SHA384, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA384, DNSSECKeeper::SHA384, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::RSASHA512, DNSSECKeeper::DIGEST_SHA384, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA384, DNSSECKeeper::DIGEST_SHA384, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_a_then_ns) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* this time we ask for the NS that should be in the cache, to check
the validation status */
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
}
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
/* this time we ask for the NS that should be in the cache, to check
the validation status */
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_with_nta) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
/* Add a NTA for "powerdns.com" */
luaconfsCopy.negAnchors[target] = "NTA for PowerDNS.com";
BOOST_CHECK_EQUAL(res, RCode::NoError);
/* Should be insecure because of the NTA */
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
/* again, to test the cache */
ret.clear();
BOOST_CHECK_EQUAL(res, RCode::NoError);
/* Should be insecure because of the NTA */
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_with_nta) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
/* Add a NTA for "powerdns.com" */
luaconfsCopy.negAnchors[target] = "NTA for PowerDNS.com";
BOOST_CHECK_EQUAL(res, RCode::NoError);
/* Should be insecure because of the NTA */
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nxdomain_nsec) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_nodata_nowildcard) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 6);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 6U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 6);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 6U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 8);
- BOOST_CHECK_EQUAL(queriesCount, 6);
+ BOOST_REQUIRE_EQUAL(ret.size(), 8U);
+ BOOST_CHECK_EQUAL(queriesCount, 6U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 8);
- BOOST_CHECK_EQUAL(queriesCount, 6);
+ BOOST_REQUIRE_EQUAL(ret.size(), 8U);
+ BOOST_CHECK_EQUAL(queriesCount, 6U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_nodata_nowildcard_too_many_iterations) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 8);
- BOOST_CHECK_EQUAL(queriesCount, 6);
+ BOOST_REQUIRE_EQUAL(ret.size(), 8U);
+ BOOST_CHECK_EQUAL(queriesCount, 6U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 8);
- BOOST_CHECK_EQUAL(queriesCount, 6);
+ BOOST_REQUIRE_EQUAL(ret.size(), 8U);
+ BOOST_CHECK_EQUAL(queriesCount, 6U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 10);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 10U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 10);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 10U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec3_wildcard_too_many_iterations) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 6);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 6U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_nsec_wildcard_missing) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_expanded_onto_itself) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
/* A + RRSIG, NSEC + RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_wildcard_like_expanded_from_wildcard) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
/* A + RRSIG, NSEC + RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
}
BOOST_AUTO_TEST_SUITE_END()
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 9);
- BOOST_CHECK_EQUAL(dsQueriesCount, 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
+ BOOST_CHECK_EQUAL(dsQueriesCount, 3U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 9);
- BOOST_CHECK_EQUAL(dsQueriesCount, 3);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
+ BOOST_CHECK_EQUAL(dsQueriesCount, 3U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_ds_sign_loop) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("www.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("www.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_dnskey_signed_child) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("www.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("sub.www.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("www.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("sub.www.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 10);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 10U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 10);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 10U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_no_ds_on_referral_insecure) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 7);
- BOOST_CHECK_EQUAL(dsQueriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
+ BOOST_CHECK_EQUAL(dsQueriesCount, 2U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 7);
- BOOST_CHECK_EQUAL(dsQueriesCount, 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
+ BOOST_CHECK_EQUAL(dsQueriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_unsigned_nsec) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_CHECK_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_CHECK_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_bogus_no_nsec) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_CHECK_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 8);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 8U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
/* 4 NS: com at ., com at com, powerdns.com at com, powerdns.com at powerdns.com
4 DNSKEY: ., com (not for powerdns.com because DS denial in referral)
1 query for A */
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
}
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::DS || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::DS || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_insecure_direct_ds) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::SOA || record.d_type == QType::NSEC || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::SOA || record.d_type == QType::NSEC || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_skipped_cut) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 9);
+ BOOST_CHECK_EQUAL(queriesCount, 9U);
}
BOOST_AUTO_TEST_SUITE_END()
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
/* No key material for .com */
/* But TA for sub.powerdns.com. */
- generateKeyMaterial(DNSName("sub.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("sub.powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
luaconfsCopy.dsAnchors[DNSName("sub.powerdns.com.")].insert(keys[DNSName("sub.powerdns.com.")].second);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_nodata) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
/* 4 NS (com from root, com from com, powerdns.com from com,
powerdns.com from powerdns.com)
2 DNSKEY (. and com., none for powerdns.com because no DS)
1 query for A
*/
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 7);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 7U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_insecure_cname_glue) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_insecure_to_secure_cname) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_secure_cname) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_bogus_cname) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 11);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 11U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_secure_to_secure_cname) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 12);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 12U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 12);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 12U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_to_insecure_cname) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
- generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
+ generateKeyMaterial(DNSName("power-dns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* no RRSIG to show */
- BOOST_CHECK_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 10);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 10U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_CHECK_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 10);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 10U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
/* No key material for .com */
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
luaconfsCopy.dsAnchors[target].insert(keys[target].second);
g_luaconfs.setState(luaconfsCopy);
/* should be insecure but we have a TA for powerdns.com. */
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
/* We got a RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_insecure_ta_norrsig) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
/* No key material for .com */
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
luaconfsCopy.dsAnchors[target].insert(keys[target].second);
g_luaconfs.setState(luaconfsCopy);
/* should be insecure but we have a TA for powerdns.com., but no RRSIG so Bogus */
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* No RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
BOOST_CHECK(ret[0].d_type == QType::A);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_nta) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
/* Add a NTA for "." */
luaconfsCopy.negAnchors[g_rootdnsname] = "NTA for Root";
g_luaconfs.setState(luaconfsCopy);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
/* 13 NS + 1 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 14);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 14U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_no_ta) {
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
/* 13 NS + 0 RRSIG */
- BOOST_REQUIRE_EQUAL(ret.size(), 13);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 13U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::NS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 13);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 13U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_bogus_nodata) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 0);
+ BOOST_REQUIRE_EQUAL(ret.size(), 0U);
/* com|NS, powerdns.com|NS, powerdns.com|A */
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 0);
+ BOOST_REQUIRE_EQUAL(ret.size(), 0U);
/* we don't store empty results */
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_SUITE_END()
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("example.org."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("powerdns.com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
initSR();
testkeysset_t keys;
- generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(DNSName("."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
vector<DNSRecord> records;
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* check that the entry has not been negatively cached for longer than the RRSIG validity */
const NegCache::NegCacheEntry* ne = nullptr;
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_ttd, fixedNow + 1);
BOOST_CHECK_EQUAL(ne->d_validationState, Secure);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 1);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 1U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_negcache_bogus_validity) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* check that the entry has been negatively cached but not longer than s_maxbogusttl */
const NegCache::NegCacheEntry* ne = nullptr;
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_ttd, fixedNow + SyncRes::s_maxbogusttl);
BOOST_CHECK_EQUAL(ne->d_validationState, Bogus);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0U);
/* again, to test the cache */
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 3);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 3U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_rrsig_cache_validity) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
/* check that the entry has not been cached for longer than the RRSIG validity */
const ComboAddress who;
vector<DNSRecord> cached;
vector<std::shared_ptr<RRSIGRecordContent>> signatures;
BOOST_REQUIRE_EQUAL(t_RC->get(tnow, target, QType(QType::A), true, &cached, who, &signatures), 1);
- BOOST_REQUIRE_EQUAL(cached.size(), 1);
- BOOST_REQUIRE_EQUAL(signatures.size(), 1);
+ BOOST_REQUIRE_EQUAL(cached.size(), 1U);
+ BOOST_REQUIRE_EQUAL(signatures.size(), 1U);
BOOST_CHECK_EQUAL((cached[0].d_ttl - tnow), 1);
/* again, to test the cache */
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_secure) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_insecure) {
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A);
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A);
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cache_bogus) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A);
- BOOST_CHECK_EQUAL(record.d_ttl, 86400);
+ BOOST_CHECK_EQUAL(record.d_ttl, 86400U);
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
ret.clear();
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
/* check that we correctly capped the TTD for a Bogus record after
just-in-time validation */
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A);
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
ret.clear();
/* third time also _does_ require validation, so we
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::A);
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
}
BOOST_AUTO_TEST_SUITE_END()
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A || record.d_type == QType::RRSIG);
}
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_insecure) {
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A);
}
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A);
}
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_cname_cache_bogus) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A);
- BOOST_CHECK_EQUAL(record.d_ttl, 86400);
+ BOOST_CHECK_EQUAL(record.d_ttl, 86400U);
}
- BOOST_CHECK_EQUAL(queriesCount, 2);
+ BOOST_CHECK_EQUAL(queriesCount, 2U);
ret.clear();
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
/* check that we correctly capped the TTD for a Bogus record after
just-in-time validation */
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A);
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
ret.clear();
/* and a third time to make sure that the validation status (and TTL!)
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::CNAME || record.d_type == QType::A);
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_additional_without_rrsig) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::RRSIG || record.d_type == QType::A);
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
ret.clear();
/* ask for the additional record directly, we should not use
res = sr->beginResolve(addTarget, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK(record.d_type == QType::RRSIG || record.d_type == QType::A);
}
- BOOST_CHECK_EQUAL(queriesCount, 5);
+ BOOST_CHECK_EQUAL(queriesCount, 5U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_secure) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* check that the entry has been negatively cached */
const NegCache::NegCacheEntry* ne = nullptr;
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Indeterminate);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 1);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 1U);
ret.clear();
/* second one _does_ require validation */
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 4);
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Secure);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 1);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 1U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_secure_ds) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
ret.clear();
/* second one _does_ require validation */
res = sr->beginResolve(target, QType(QType::DS), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Secure);
- BOOST_REQUIRE_EQUAL(ret.size(), 4);
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_REQUIRE_EQUAL(ret.size(), 4U);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_insecure) {
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
/* check that the entry has not been negatively cached */
const NegCache::NegCacheEntry* ne = nullptr;
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Indeterminate);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0U);
ret.clear();
/* second one _does_ require validation */
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Insecure);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Insecure);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_dnssec_validation_from_negcache_bogus) {
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
size_t queriesCount = 0;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Indeterminate);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
if (record.d_type == QType::SOA) {
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxnegttl);
}
}
- BOOST_CHECK_EQUAL(queriesCount, 1);
+ BOOST_CHECK_EQUAL(queriesCount, 1U);
const NegCache::NegCacheEntry* ne = nullptr;
- BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1);
+ BOOST_CHECK_EQUAL(SyncRes::t_sstorage.negcache.size(), 1U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Indeterminate);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
BOOST_CHECK_EQUAL(ne->d_ttd, now + SyncRes::s_maxnegttl);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0U);
ret.clear();
/* second one _does_ require validation */
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Bogus);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
BOOST_CHECK_EQUAL(ne->d_ttd, now + SyncRes::s_maxbogusttl);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0U);
ret.clear();
/* third one _does_ not require validation, we just check that
res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
BOOST_CHECK_EQUAL(sr->getValidationState(), Bogus);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
for (const auto& record : ret) {
BOOST_CHECK_EQUAL(record.d_ttl, SyncRes::s_maxbogusttl);
}
- BOOST_CHECK_EQUAL(queriesCount, 4);
+ BOOST_CHECK_EQUAL(queriesCount, 4U);
BOOST_REQUIRE_EQUAL(SyncRes::t_sstorage.negcache.get(target, QType(QType::A), sr->getNow(), &ne), true);
BOOST_CHECK_EQUAL(ne->d_validationState, Bogus);
- BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1);
- BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.records.size(), 1U);
+ BOOST_CHECK_EQUAL(ne->authoritySOA.signatures.size(), 1U);
BOOST_CHECK_EQUAL(ne->d_ttd, now + SyncRes::s_maxbogusttl);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0);
- BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.records.size(), 0U);
+ BOOST_CHECK_EQUAL(ne->DNSSECRecords.signatures.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_lowercase_outgoing) {
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK_EQUAL(ret[0].d_content->getZoneRepresentation(), cname.toString());
- BOOST_REQUIRE_EQUAL(sentOutQnames.size(), 4);
+ BOOST_REQUIRE_EQUAL(sentOutQnames.size(), 4U);
BOOST_CHECK_EQUAL(sentOutQnames[0].toString(), target.makeLowerCase().toString());
BOOST_CHECK_EQUAL(sentOutQnames[1].toString(), target.makeLowerCase().toString());
BOOST_CHECK_EQUAL(sentOutQnames[2].toString(), cname.makeLowerCase().toString());
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
// As testkeysset_t only contains one DSRecordContent, create another one with a different hash algo
- generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA1, keys2);
+ generateKeyMaterial(DNSName("com."), DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA1, keys2);
// But add the existing root key otherwise no RRSIG can be created
auto rootkey = keys.find(g_rootdnsname);
keys2.insert(*rootkey);
dsmap_t ds;
auto state = sr->getDSRecords(target, ds, false, 0, false);
BOOST_CHECK_EQUAL(state, Secure);
- BOOST_REQUIRE_EQUAL(ds.size(), 1);
+ BOOST_REQUIRE_EQUAL(ds.size(), 1U);
for (const auto& i : ds) {
- BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::SHA256);
+ BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::DIGEST_SHA256);
}
}
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
// As testkeysset_t only contains one DSRecordContent, create another one with a different hash algo
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA1, keys2);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA1, keys2);
// But add the existing root key otherwise no RRSIG can be created
auto rootkey = keys.find(g_rootdnsname);
keys2.insert(*rootkey);
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA384, keys3);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA384, keys3);
// But add the existing root key otherwise no RRSIG can be created
keys3.insert(*rootkey);
dsmap_t ds;
auto state = sr->getDSRecords(target, ds, false, 0, false);
BOOST_CHECK_EQUAL(state, Secure);
- BOOST_REQUIRE_EQUAL(ds.size(), 1);
+ BOOST_REQUIRE_EQUAL(ds.size(), 1U);
for (const auto& i : ds) {
- BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::SHA384);
+ BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::DIGEST_SHA384);
}
}
auto luaconfsCopy = g_luaconfs.getCopy();
luaconfsCopy.dsAnchors.clear();
- generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys, luaconfsCopy.dsAnchors);
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys);
+ generateKeyMaterial(g_rootdnsname, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys, luaconfsCopy.dsAnchors);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys);
g_luaconfs.setState(luaconfsCopy);
// As testkeysset_t only contains one DSRecordContent, create another one with a different hash algo
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA256, keys2);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA256, keys2);
// But add the existing root key otherwise no RRSIG can be created
auto rootkey = keys.find(g_rootdnsname);
keys2.insert(*rootkey);
- generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::SHA1, keys3);
+ generateKeyMaterial(target, DNSSECKeeper::ECDSA256, DNSSECKeeper::DIGEST_SHA1, keys3);
// But add the existing root key otherwise no RRSIG can be created
keys3.insert(*rootkey);
dsmap_t ds;
auto state = sr->getDSRecords(target, ds, false, 0, false);
BOOST_CHECK_EQUAL(state, Secure);
- BOOST_REQUIRE_EQUAL(ds.size(), 2);
+ BOOST_REQUIRE_EQUAL(ds.size(), 2U);
for (const auto& i : ds) {
- BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::SHA256);
+ BOOST_CHECK_EQUAL(i.d_digesttype, DNSSECKeeper::DIGEST_SHA256);
}
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 2);
+ BOOST_REQUIRE_EQUAL(ret.size(), 2U);
BOOST_CHECK(ret[0].d_type == QType::CNAME);
BOOST_CHECK_EQUAL(ret[0].d_name, target);
BOOST_CHECK(ret[1].d_type == QType::A);
auto ttl = t_RC->get(now, DNSName("powerdns.com."), QType(QType::NS), false, &cached, who, nullptr, nullptr, nullptr, nullptr, &wasAuth);
BOOST_REQUIRE_GE(ttl, 1);
BOOST_REQUIRE_LE(ttl, 42);
- BOOST_CHECK_EQUAL(cached.size(), 1);
+ BOOST_CHECK_EQUAL(cached.size(), 1U);
BOOST_CHECK_EQUAL(wasAuth, false);
cached.clear();
/* Also check that the the part in additional is still not auth */
BOOST_REQUIRE_GE(t_RC->get(now, DNSName("a.gtld-servers.net."), QType(QType::A), false, &cached, who, nullptr, nullptr, nullptr, nullptr, &wasAuth), -1);
- BOOST_CHECK_EQUAL(cached.size(), 1);
+ BOOST_CHECK_EQUAL(cached.size(), 1U);
BOOST_CHECK_EQUAL(wasAuth, false);
}
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
const ComboAddress who;
vector<DNSRecord> cached;
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_REQUIRE_EQUAL(ret.size(), 1);
+ BOOST_REQUIRE_EQUAL(ret.size(), 1U);
const ComboAddress who;
vector<DNSRecord> cached;
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NoError);
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(queriesCount, 3);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(queriesCount, 3U);
const ComboAddress who;
vector<DNSRecord> cached;
vector<DNSRecord> ret;
int res = sr->beginResolve(target, QType(QType::A), QClass::IN, ret);
BOOST_CHECK_EQUAL(res, RCode::NXDomain);
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
const ComboAddress who;
vector<DNSRecord> cached;
ComboAddress destination("192.0.2.2:65535");
auto payload = generateXPFPayload(false, source, destination);
- BOOST_CHECK_EQUAL(payload.size(), 14);
+ BOOST_CHECK_EQUAL(payload.size(), 14U);
BOOST_CHECK_EQUAL(payload.at(0), 4);
BOOST_CHECK_EQUAL(payload.at(1), 17);
ComboAddress destination("192.0.2.2:65535");
auto payload = generateXPFPayload(true, source, destination);
- BOOST_CHECK_EQUAL(payload.size(), 14);
+ BOOST_CHECK_EQUAL(payload.size(), 14U);
BOOST_CHECK_EQUAL(payload.at(0), 4);
BOOST_CHECK_EQUAL(payload.at(1), 6);
ComboAddress destination("[::1]:65535");
auto payload = generateXPFPayload(false, source, destination);
- BOOST_CHECK_EQUAL(payload.size(), 38);
+ BOOST_CHECK_EQUAL(payload.size(), 38U);
BOOST_CHECK_EQUAL(payload.at(0), 6);
BOOST_CHECK_EQUAL(payload.at(1), 17);
ComboAddress destination("[::1]:65535");
auto payload = generateXPFPayload(true, source, destination);
- BOOST_CHECK_EQUAL(payload.size(), 38);
+ BOOST_CHECK_EQUAL(payload.size(), 38U);
BOOST_CHECK_EQUAL(payload.at(0), 6);
BOOST_CHECK_EQUAL(payload.at(1), 6);
ComboAddress destination("192.0.2.2:65535");
auto payload = generateXPFPayload(false, source, destination);
- BOOST_CHECK_EQUAL(payload.size(), 14);
+ BOOST_CHECK_EQUAL(payload.size(), 14U);
BOOST_CHECK_EQUAL(payload.at(0), 4);
BOOST_CHECK_EQUAL(payload.at(1), 17);
const auto dscontent = getRR<DSRecordContent>(record);
if (dscontent && isSupportedDS(*dscontent)) {
// Make GOST a lower prio than SHA256
- if (dscontent->d_digesttype == DNSSECKeeper::GOST && bestDigestType == DNSSECKeeper::SHA256) {
+ if (dscontent->d_digesttype == DNSSECKeeper::DIGEST_GOST && bestDigestType == DNSSECKeeper::DIGEST_SHA256) {
continue;
}
- if (dscontent->d_digesttype > bestDigestType || (bestDigestType == DNSSECKeeper::GOST && dscontent->d_digesttype == DNSSECKeeper::SHA256)) {
+ if (dscontent->d_digesttype > bestDigestType || (bestDigestType == DNSSECKeeper::DIGEST_GOST && dscontent->d_digesttype == DNSSECKeeper::DIGEST_SHA256)) {
bestDigestType = dscontent->d_digesttype;
}
ds.insert(*dscontent);
n3rc.d_salt = ns3pr.d_salt;
n3rc.d_flags = ns3pr.d_flags;
n3rc.d_iterations = ns3pr.d_iterations;
- n3rc.d_algorithm = DNSSECKeeper::SHA1; // SHA1, fixed in PowerDNS for now
+ n3rc.d_algorithm = DNSSECKeeper::DIGEST_SHA1; // SHA1, fixed in PowerDNS for now
nsecxrepo_t::const_iterator inext = iter;
++inext;
if(inext == nsecxrepo.end())
success=on
really=yes)";
- int len=write(fd, config.c_str(), config.size());
+ ssize_t len=write(fd, config.c_str(), config.size());
- BOOST_CHECK_EQUAL(len, config.size());
+ BOOST_CHECK_EQUAL(len, static_cast<ssize_t>(config.size()));
if(!len)
return;
close(fd);
BP.parse(pathbuf.str());
vector<BindDomainInfo> domains=BP.getDomains();
- BOOST_CHECK_EQUAL(domains.size(), 11);
+ BOOST_CHECK_EQUAL(domains.size(), 11U);
#define checkzone(i, dname, fname, ztype, nmasters) { \
BOOST_CHECK(domains[i].name == DNSName(#dname)); \
BOOST_CHECK_EQUAL(domains[i].masters.size(), nmasters); \
}
- checkzone(0, example.com, "./zones//example.com", master, 0);
- checkzone(1, test.com, "./zones//test.com", slave, 1);
+ checkzone(0, example.com, "./zones//example.com", master, 0U);
+ checkzone(1, test.com, "./zones//test.com", slave, 1U);
BOOST_CHECK_EQUAL(domains[1].masters[0].toString(), ComboAddress("1.2.3.4", 5678).toString());
- checkzone(2, test.dyndns, "./zones//test.dyndns", garblewarble, 0);
- checkzone(3, wtest.com, "./zones//wtest.com", master, 0);
- checkzone(4, nztest.com, "./zones//nztest.com", master, 0);
- checkzone(5, dnssec-parent.com, "./zones//dnssec-parent.com", master, 0);
- checkzone(6, delegated.dnssec-parent.com, "./zones//delegated.dnssec-parent.com", master, 0);
- checkzone(7, secure-delegated.dnssec-parent.com, "./zones//secure-delegated.dnssec-parent.com", master, 0);
- checkzone(8, minimal.com, "./zones//minimal.com", master, 0);
- checkzone(9, tsig.com, "./zones//tsig.com", master, 0);
- checkzone(10, stest.com, "./zones//stest.com", master, 0);
+ checkzone(2, test.dyndns, "./zones//test.dyndns", garblewarble, 0U);
+ checkzone(3, wtest.com, "./zones//wtest.com", master, 0U);
+ checkzone(4, nztest.com, "./zones//nztest.com", master, 0U);
+ checkzone(5, dnssec-parent.com, "./zones//dnssec-parent.com", master, 0U);
+ checkzone(6, delegated.dnssec-parent.com, "./zones//delegated.dnssec-parent.com", master, 0U);
+ checkzone(7, secure-delegated.dnssec-parent.com, "./zones//secure-delegated.dnssec-parent.com", master, 0U);
+ checkzone(8, minimal.com, "./zones//minimal.com", master, 0U);
+ checkzone(9, tsig.com, "./zones//tsig.com", master, 0U);
+ checkzone(10, stest.com, "./zones//stest.com", master, 0U);
}
BOOST_AUTO_TEST_SUITE_END()
MOADNSParser mdp(false, (char*) response.data(), response.size());
- BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.ancount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.arcount, 0);
+ BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.ancount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.arcount, 0U);
BOOST_CHECK_EQUAL(mdp.d_qname.toString(), "2.name.");
BOOST_CHECK(mdp.d_qclass == QClass::IN);
MOADNSParser mdp(true, (char*) plainQuery.data(), decryptedLen);
- BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.ancount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.arcount, 0);
+ BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.ancount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.arcount, 0U);
BOOST_CHECK_EQUAL(mdp.d_qname, name);
BOOST_CHECK(mdp.d_qclass == QClass::IN);
MOADNSParser mdp(true, (char*) plainQuery.data(), decryptedLen);
- BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.ancount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.arcount, 0);
+ BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.ancount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.arcount, 0U);
BOOST_CHECK_EQUAL(mdp.d_qname, name);
BOOST_CHECK(mdp.d_qclass == QClass::IN);
BOOST_CHECK_EQUAL(mdp.d_qname.toString(), "www.powerdns.com.");
- BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.ancount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0);
+ BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.ancount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0U);
uint16_t expectedARCount = 0 + (hasEdns ? 1 : 0) + (hasXPF ? 1 : 0);
BOOST_CHECK_EQUAL(mdp.d_header.arcount, expectedARCount);
}
DNSQuestion dq(&qname, qtype, qclass, consumed, nullptr, &rem, const_cast<dnsheader*>(reinterpret_cast<const dnsheader*>(packet)), packetSize, packetSize, false, nullptr);
BOOST_CHECK(parseEDNSOptions(dq));
BOOST_REQUIRE(dq.ednsOptions != nullptr);
- BOOST_CHECK_EQUAL(dq.ednsOptions->size(), 1);
+ BOOST_CHECK_EQUAL(dq.ednsOptions->size(), 1U);
const auto& ecsOption = dq.ednsOptions->find(EDNSOptionCode::ECS);
BOOST_REQUIRE(ecsOption != dq.ednsOptions->cend());
string expectedOption;
generateECSOption(expected, expectedOption, expected.sin4.sin_family == AF_INET ? ECSSourcePrefixV4 : ECSSourcePrefixV6);
/* we need to skip the option code and length, which are not included */
- BOOST_REQUIRE_EQUAL(ecsOption->second.values.size(), 1);
+ BOOST_REQUIRE_EQUAL(ecsOption->second.values.size(), 1U);
BOOST_CHECK_EQUAL(expectedOption.substr(EDNS_OPTION_CODE_SIZE + EDNS_OPTION_LENGTH_SIZE), std::string(ecsOption->second.values.at(0).content, ecsOption->second.values.at(0).size));
}
BOOST_CHECK_EQUAL(mdp.d_qname.toString(), "www.powerdns.com.");
- BOOST_CHECK_EQUAL(mdp.d_header.qr, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.ancount, 1);
- BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0);
- BOOST_CHECK_EQUAL(mdp.d_header.arcount, (hasEdns ? 1 : 0) + additionalCount);
+ BOOST_CHECK_EQUAL(mdp.d_header.qr, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.qdcount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.ancount, 1U);
+ BOOST_CHECK_EQUAL(mdp.d_header.nscount, 0U);
+ BOOST_CHECK_EQUAL(mdp.d_header.arcount, (hasEdns ? 1U : 0U) + additionalCount);
}
BOOST_AUTO_TEST_CASE(test_addXPF)
BOOST_AUTO_TEST_CASE(test_PacketCacheSimple) {
const size_t maxEntries = 150000;
DNSDistPacketCache PC(maxEntries, 86400, 1);
- BOOST_CHECK_EQUAL(PC.getSize(), 0);
+ BOOST_CHECK_EQUAL(PC.getSize(), 0U);
struct timespec queryTime;
gettime(&queryTime); // does not have to be accurate ("realTime") in tests
bool found = PC.get(dq, a.wirelength(), 0, responseBuf, &responseBufSize, &key, subnet, dnssecOK);
if (found == true) {
auto removed = PC.expungeByName(a);
- BOOST_CHECK_EQUAL(removed, 1);
+ BOOST_CHECK_EQUAL(removed, 1U);
deleted += removed;
}
}
auto remaining = PC.getSize();
auto removed = PC.expungeByName(DNSName(" hello"), QType::ANY, true);
- BOOST_CHECK_EQUAL(PC.getSize(), 0);
+ BOOST_CHECK_EQUAL(PC.getSize(), 0U);
BOOST_CHECK_EQUAL(removed, remaining);
}
catch(PDNSException& e) {
for(int i=0; i < 4 ; ++i)
pthread_join(tid[i], &res);
- BOOST_CHECK_EQUAL(g_PC.getSize() + g_PC.getDeferredInserts() + g_PC.getInsertCollisions(), 400000);
+ BOOST_CHECK_EQUAL(g_PC.getSize() + g_PC.getDeferredInserts() + g_PC.getInsertCollisions(), 400000U);
BOOST_CHECK_SMALL(1.0*g_PC.getInsertCollisions(), 10000.0);
for(int i=0; i < 4; ++i)
BOOST_AUTO_TEST_CASE(test_PCCollision) {
const size_t maxEntries = 150000;
DNSDistPacketCache PC(maxEntries, 86400, 1, 60, 3600, 60, false, 1, true, true);
- BOOST_CHECK_EQUAL(PC.getSize(), 0);
+ BOOST_CHECK_EQUAL(PC.getSize(), 0U);
DNSName qname("www.powerdns.com.");
uint16_t qtype = QType::AAAA;
pwR.commit();
PC.insert(key, subnetOut, *(getFlagsFromDNSHeader(pwR.getHeader())), dnssecOK, qname, qtype, QClass::IN, reinterpret_cast<const char*>(response.data()), response.size(), false, RCode::NoError, boost::none);
- BOOST_CHECK_EQUAL(PC.getSize(), 1);
+ BOOST_CHECK_EQUAL(PC.getSize(), 1U);
found = PC.get(dq, qname.wirelength(), 0, responseBuf, &responseBufSize, &key, subnetOut, dnssecOK);
BOOST_CHECK_EQUAL(found, true);
BOOST_CHECK_EQUAL(secondKey, key);
BOOST_REQUIRE(subnetOut);
BOOST_CHECK_EQUAL(subnetOut->toString(), opt.source.toString());
- BOOST_CHECK_EQUAL(PC.getLookupCollisions(), 1);
+ BOOST_CHECK_EQUAL(PC.getLookupCollisions(), 1U);
}
}
BOOST_AUTO_TEST_CASE(test_PCDNSSECCollision) {
const size_t maxEntries = 150000;
DNSDistPacketCache PC(maxEntries, 86400, 1, 60, 3600, 60, false, 1, true, true);
- BOOST_CHECK_EQUAL(PC.getSize(), 0);
+ BOOST_CHECK_EQUAL(PC.getSize(), 0U);
DNSName qname("www.powerdns.com.");
uint16_t qtype = QType::AAAA;
pwR.commit();
PC.insert(key, subnetOut, *(getFlagsFromDNSHeader(pwR.getHeader())), /* DNSSEC OK is set */ true, qname, qtype, QClass::IN, reinterpret_cast<const char*>(response.data()), response.size(), false, RCode::NoError, boost::none);
- BOOST_CHECK_EQUAL(PC.getSize(), 1);
+ BOOST_CHECK_EQUAL(PC.getSize(), 1U);
found = PC.get(dq, qname.wirelength(), 0, responseBuf, &responseBufSize, &key, subnetOut, false);
BOOST_CHECK_EQUAL(found, false);
string before("www.ds9a.nl.");
DNSName b(before);
- BOOST_CHECK_EQUAL(b.getRawLabels().size(), 3);
+ BOOST_CHECK_EQUAL(b.getRawLabels().size(), 3U);
string after(b.toString());
BOOST_CHECK_EQUAL(before, after);
auto labels=rfc4343_2_2.getRawLabels();
BOOST_CHECK_EQUAL(*labels.begin(), "Donald E. Eastlake 3rd");
BOOST_CHECK_EQUAL(*labels.rbegin(), "example");
- BOOST_CHECK_EQUAL(labels.size(), 2);
+ BOOST_CHECK_EQUAL(labels.size(), 2U);
DNSName build;
build.appendRawLabel("Donald E. Eastlake 3rd");
BOOST_AUTO_TEST_CASE(test_trim) {
DNSName w("www.powerdns.com.");
- BOOST_CHECK_EQUAL(w.countLabels(), 3);
+ BOOST_CHECK_EQUAL(w.countLabels(), 3U);
w.trimToLabels(2);
BOOST_CHECK_EQUAL(w.toString(), "powerdns.com.");
DNSName w2("powerdns.com.");
BOOST_CHECK(w==w2);
DNSName root(".");
- BOOST_CHECK_EQUAL(root.countLabels(), 0);
+ BOOST_CHECK_EQUAL(root.countLabels(), 0U);
}
BOOST_AUTO_TEST_CASE(test_toolong) {
std::unordered_set<DNSName> s;
s.insert(DNSName("www.powerdns.com"));
BOOST_CHECK(s.count(DNSName("WwW.PoWerDNS.CoM")));
- BOOST_CHECK_EQUAL(s.size(), 1);
+ BOOST_CHECK_EQUAL(s.size(), 1U);
s.insert(DNSName("www.POWERDNS.com"));
- BOOST_CHECK_EQUAL(s.size(), 1);
+ BOOST_CHECK_EQUAL(s.size(), 1U);
s.insert(DNSName("www2.POWERDNS.com"));
- BOOST_CHECK_EQUAL(s.size(), 2);
+ BOOST_CHECK_EQUAL(s.size(), 2U);
s.clear();
unsigned int n=0;
count++;
BOOST_CHECK_EQUAL(smt.d_value, apowerdnscom);
});
- BOOST_CHECK_EQUAL(count, 1);
+ BOOST_CHECK_EQUAL(count, 1U);
BOOST_CHECK_EQUAL(*smt.lookup(apowerdnscom), apowerdnscom);
smt.remove(apowerdnscom);
smt.visit([&count](const SuffixMatchTree<DNSName>& smt) {
count++;
});
- BOOST_CHECK_EQUAL(count, 0);
+ BOOST_CHECK_EQUAL(count, 0U);
}
{ // append
DNSName dn(name);
dn.appendRawLabel(label);
- BOOST_CHECK_EQUAL(dn.toString().size(), 254);
+ BOOST_CHECK_EQUAL(dn.toString().size(), 254U);
}
{ // prepend
DNSName dn(name);
dn.prependRawLabel(label);
- BOOST_CHECK_EQUAL(dn.toString().size(), 254);
+ BOOST_CHECK_EQUAL(dn.toString().size(), 254U);
}
{ // concat
DNSName dn(name);
dn += DNSName(label + ".");
- BOOST_CHECK_EQUAL(dn.toString().size(), 254);
+ BOOST_CHECK_EQUAL(dn.toString().size(), 254U);
}
}
BOOST_AUTO_TEST_CASE(test_wirelength) { // Testing if we get the correct value from the wirelength function
DNSName name("www.powerdns.com");
- BOOST_CHECK_EQUAL(name.wirelength(), 18);
+ BOOST_CHECK_EQUAL(name.wirelength(), 18U);
DNSName sname("powerdns.com");
sname.prependRawLabel(string("ww\x00""w", 4));
- BOOST_CHECK_EQUAL(sname.wirelength(), 19);
+ BOOST_CHECK_EQUAL(sname.wirelength(), 19U);
sname = DNSName("powerdns.com");
sname.prependRawLabel(string("www\x00", 4));
- BOOST_CHECK_EQUAL(sname.wirelength(), 19);
+ BOOST_CHECK_EQUAL(sname.wirelength(), 19U);
}
BOOST_AUTO_TEST_CASE(test_getrawlabel) {
});
/* check that we have been for all records */
- BOOST_CHECK_EQUAL(called, 5);
+ BOOST_CHECK_EQUAL(called, 5U);
BOOST_REQUIRE_EQUAL(firstPacket.size(), expectedAlteredPacket.size());
for (size_t idx = 0; idx < firstPacket.size(); idx++) {
});
/* check that we have been for all records */
- BOOST_CHECK_EQUAL(called, 4);
+ BOOST_CHECK_EQUAL(called, 4U);
BOOST_CHECK(firstPacket == expectedAlteredPacket);
}
pwR.commit();
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size(), nullptr);
- BOOST_CHECK_EQUAL(result, 255);
+ BOOST_CHECK_EQUAL(result, 255U);
}
{
bool seenAuthSOA = false;
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size(), &seenAuthSOA);
- BOOST_CHECK_EQUAL(result, 255);
+ BOOST_CHECK_EQUAL(result, 255U);
BOOST_CHECK_EQUAL(seenAuthSOA, false);
}
bool seenAuthSOA = false;
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size(), &seenAuthSOA);
- BOOST_CHECK_EQUAL(result, 255);
+ BOOST_CHECK_EQUAL(result, 255U);
BOOST_CHECK_EQUAL(seenAuthSOA, true);
}
bool seenAuthSOA = false;
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size(), &seenAuthSOA);
- BOOST_CHECK_EQUAL(result, 255);
+ BOOST_CHECK_EQUAL(result, 255U);
BOOST_CHECK_EQUAL(seenAuthSOA, false);
}
bool seenAuthSOA = false;
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size(), &seenAuthSOA);
- BOOST_CHECK_EQUAL(result, 257);
+ BOOST_CHECK_EQUAL(result, 257U);
BOOST_CHECK_EQUAL(seenAuthSOA, false);
}
bool seenAuthSOA = false;
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size(), &seenAuthSOA);
- BOOST_CHECK_EQUAL(result, 255);
+ BOOST_CHECK_EQUAL(result, 255U);
BOOST_CHECK_EQUAL(seenAuthSOA, false);
}
bool seenAuthSOA = false;
auto result = getDNSPacketMinTTL(reinterpret_cast<char*>(packet.data()), packet.size() - sizeof(uint32_t) - /* rdata length */ sizeof (uint16_t) - /* IPv4 payload in rdata */ 4, &seenAuthSOA);
- BOOST_CHECK_EQUAL(result, 255);
+ BOOST_CHECK_EQUAL(result, 255U);
BOOST_CHECK_EQUAL(seenAuthSOA, true);
}
}
BOOST_CHECK_EQUAL(eo.d_packetsize, 1280);
// it should contain NSID option with value 'powerdns', and nothing else
- BOOST_CHECK_EQUAL(eo.d_options.size(), 1);
+ BOOST_CHECK_EQUAL(eo.d_options.size(), 1U);
BOOST_CHECK_EQUAL(eo.d_options[0].first, 3); // nsid
BOOST_CHECK_EQUAL(eo.d_options[0].second, "powerdns");
}
BOOST_CHECK(nsecContent->isSet(type));
}
BOOST_CHECK_EQUAL(nsecContent->isSet(QType::NSEC3), false);
- BOOST_CHECK_EQUAL(nsecContent->numberOfTypesSet(), 5);
+ BOOST_CHECK_EQUAL(nsecContent->numberOfTypesSet(), 5U);
}
{
auto nsecContent = std::make_shared<NSECRecordContent>();
- BOOST_CHECK_EQUAL(nsecContent->numberOfTypesSet(), 0);
+ BOOST_CHECK_EQUAL(nsecContent->numberOfTypesSet(), 0U);
BOOST_CHECK_EQUAL(nsecContent->isSet(QType::NSEC3), false);
for (size_t idx = 0; idx < 65536; idx++) {
nsecContent->set(idx);
}
BOOST_CHECK_EQUAL(nsecContent->isSet(QType::NSEC3), true);
- BOOST_CHECK_EQUAL(nsecContent->numberOfTypesSet(), 65536);
+ BOOST_CHECK_EQUAL(nsecContent->numberOfTypesSet(), 65536U);
for (size_t idx = 0; idx < 65536; idx++) {
BOOST_CHECK(nsecContent->isSet(idx));
}
BOOST_CHECK(nsec3Content->isSet(type));
}
BOOST_CHECK_EQUAL(nsec3Content->isSet(QType::NSEC), false);
- BOOST_CHECK_EQUAL(nsec3Content->numberOfTypesSet(), 6);
+ BOOST_CHECK_EQUAL(nsec3Content->numberOfTypesSet(), 6U);
auto str2 = nsec3Content->getZoneRepresentation();
boost::to_lower(str2);
BOOST_CHECK_EQUAL(str2, str);
{
std::string str = "1 1 12 aabbccdd 2vptu5timamqttgl4luu9kg21e0aor3s";
auto nsec3Content = std::make_shared<NSEC3RecordContent>(str);
- BOOST_CHECK_EQUAL(nsec3Content->numberOfTypesSet(), 0);
+ BOOST_CHECK_EQUAL(nsec3Content->numberOfTypesSet(), 0U);
BOOST_CHECK_EQUAL(nsec3Content->isSet(QType::NSEC), false);
for (size_t idx = 0; idx < 65536; idx++) {
str += " " + toLower(DNSRecordContent::NumberToType(idx));
}
BOOST_CHECK_EQUAL(nsec3Content->isSet(QType::NSEC), true);
- BOOST_CHECK_EQUAL(nsec3Content->numberOfTypesSet(), 65536);
+ BOOST_CHECK_EQUAL(nsec3Content->numberOfTypesSet(), 65536U);
for (size_t idx = 0; idx < 65536; idx++) {
BOOST_CHECK(nsec3Content->isSet(idx));
}
BOOST_CHECK_EQUAL(packet.size(), expectedSize);
MOADNSParser parser(false, reinterpret_cast<const char*>(packet.data()), packet.size());
- BOOST_REQUIRE_EQUAL(parser.d_answers.size(), 1);
+ BOOST_REQUIRE_EQUAL(parser.d_answers.size(), 1U);
const auto& record = parser.d_answers.at(0).first;
BOOST_REQUIRE(record.d_type == QType::NSEC3);
BOOST_REQUIRE(record.d_class == QClass::IN);
auto content = std::dynamic_pointer_cast<NSEC3RecordContent>(record.d_content);
BOOST_REQUIRE(content);
- BOOST_CHECK_EQUAL(content->numberOfTypesSet(), 0);
+ BOOST_CHECK_EQUAL(content->numberOfTypesSet(), 0U);
for (size_t idx = 0; idx < 65536; idx++) {
BOOST_CHECK_EQUAL(content->isSet(idx), false);
}
auto txt = string("\"")+string(16262, 'A')+string("\"");
pwR.xfrText(txt);
pwR.commit();
- BOOST_CHECK_EQUAL(pwR.size(), 16368);
+ BOOST_CHECK_EQUAL(pwR.size(), 16368U);
pwR.startRecord(DNSName("mediumsizedlabel.example.net"), QType::A, 3600, QClass::IN, DNSResourceRecord::ANSWER);
pwR.xfrIP('P'<<24 |
'R'<<8 |
'S');
pwR.commit();
- BOOST_CHECK_EQUAL(pwR.size(), 16412); // 16412 (0x401c) puts '7example3net' at 0x4001
+ BOOST_CHECK_EQUAL(pwR.size(), 16412U); // 16412 (0x401c) puts '7example3net' at 0x4001
pwR.startRecord(DNSName("adifferentlabel.example.net"), QType::A, 3600, QClass::IN, DNSResourceRecord::ANSWER);
pwR.xfrIP('D'<<24 |
'F'<<8 |
'G');
pwR.commit();
- BOOST_CHECK_EQUAL(pwR.size(), 16455);
+ BOOST_CHECK_EQUAL(pwR.size(), 16455U);
string spacket(packet.begin(), packet.end());
BOOST_CHECK_EQUAL(result->second, 32);
}
- for(unsigned int i = 0; i < 256; ++i) {
- for(unsigned int j = 32; j >= 16; --j) {
+ for(int i = 0; i < 256; ++i) {
+ for(int j = 32; j >= 16; --j) {
ComboAddress key(prefix + std::to_string(i) + ".127.255");
nmt.erase(Netmask(key, j));
const auto result = nmt.lookup(key);
}
}
- BOOST_CHECK_EQUAL(nmt.size(), 0);
+ BOOST_CHECK_EQUAL(nmt.size(), 0U);
BOOST_CHECK(nmt.empty());
}
addRecordToList(records, DNSName("JAIN.AD.JP."), QType::SOA, "ns.jain.ad.jp. mohta.jain.ad.jp. 3 600 600 3600000 604800");
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
- BOOST_CHECK_EQUAL(ret.size(), 1);
- BOOST_CHECK_EQUAL(ret.at(0).first.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
+ BOOST_CHECK_EQUAL(ret.at(0).first.size(), 0U);
BOOST_REQUIRE_EQUAL(ret.at(0).second.size(), records.size());
for (size_t idx = 0; idx < records.size(); idx++) {
BOOST_CHECK(ret.at(0).second.at(idx) == records.at(idx));
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
// two sequences
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
// the first one has one removal, two additions (plus the corresponding SOA removal/addition)
- BOOST_CHECK_EQUAL(ret.at(0).first.size(), 1 + 1);
- BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2 + 1);
+ BOOST_CHECK_EQUAL(ret.at(0).first.size(), 1U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(0).first.at(0).d_type, QType(QType::SOA).getCode());
BOOST_CHECK_EQUAL(ret.at(0).second.at(2).d_type, QType(QType::A).getCode());
// the second one has one removal, one addition
- BOOST_CHECK_EQUAL(ret.at(1).first.size(), 1 + 1);
- BOOST_CHECK_EQUAL(ret.at(1).second.size(), 1 + 1);
+ BOOST_CHECK_EQUAL(ret.at(1).first.size(), 1U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(1).second.size(), 1U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(1).first.at(0).d_type, QType(QType::SOA).getCode());
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
// one sequence
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
// it has one removal, two additions (plus the corresponding SOA removal/addition)
- BOOST_CHECK_EQUAL(ret.at(0).first.size(), 1 + 1);
- BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2 + 1);
+ BOOST_CHECK_EQUAL(ret.at(0).first.size(), 1U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(0).first.at(0).d_type, QType(QType::SOA).getCode());
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
// two sequences
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
// the first one has one removal, no additions (plus the corresponding SOA removal/addition)
- BOOST_CHECK_EQUAL(ret.at(0).first.size(), 1 + 1);
- BOOST_CHECK_EQUAL(ret.at(0).second.size(), 0 + 1);
+ BOOST_CHECK_EQUAL(ret.at(0).first.size(), 1U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(0).second.size(), 0U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(0).first.at(0).d_type, QType(QType::SOA).getCode());
BOOST_CHECK_EQUAL(ret.at(0).second.at(0).d_type, QType(QType::SOA).getCode());
// the second one has one removal, one addition
- BOOST_CHECK_EQUAL(ret.at(1).first.size(), 1 + 1);
- BOOST_CHECK_EQUAL(ret.at(1).second.size(), 1 + 1);
+ BOOST_CHECK_EQUAL(ret.at(1).first.size(), 1U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(1).second.size(), 1U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(1).first.at(0).d_type, QType(QType::SOA).getCode());
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
// two sequences
- BOOST_CHECK_EQUAL(ret.size(), 2);
+ BOOST_CHECK_EQUAL(ret.size(), 2U);
// the first one has no removal, two additions (plus the corresponding SOA removal/addition)
- BOOST_CHECK_EQUAL(ret.at(0).first.size(), 0 + 1);
- BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2 + 1);
+ BOOST_CHECK_EQUAL(ret.at(0).first.size(), 0U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(0).first.at(0).d_type, QType(QType::SOA).getCode());
BOOST_CHECK_EQUAL(ret.at(0).second.at(1).d_type, QType(QType::A).getCode());
// the second one has one removal, one addition
- BOOST_CHECK_EQUAL(ret.at(1).first.size(), 1 + 1);
- BOOST_CHECK_EQUAL(ret.at(1).second.size(), 1 + 1);
+ BOOST_CHECK_EQUAL(ret.at(1).first.size(), 1U + 1U);
+ BOOST_CHECK_EQUAL(ret.at(1).second.size(), 1U + 1U);
// check removals
BOOST_CHECK_EQUAL(ret.at(1).first.at(0).d_type, QType(QType::SOA).getCode());
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
// this is actually an empty AXFR
- BOOST_CHECK_EQUAL(ret.size(), 1);
+ BOOST_CHECK_EQUAL(ret.size(), 1U);
// nothing in the deletion part then
- BOOST_CHECK_EQUAL(ret.at(0).first.size(), 0);
+ BOOST_CHECK_EQUAL(ret.at(0).first.size(), 0U);
// and the two SOAs in the addition part
- BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2);
+ BOOST_CHECK_EQUAL(ret.at(0).second.size(), 2U);
BOOST_CHECK_EQUAL(ret.at(0).second.at(0).d_type, QType(QType::SOA).getCode());
BOOST_CHECK_EQUAL(ret.at(0).second.at(1).d_type, QType(QType::SOA).getCode());
}
vector<DNSRecord> records;
auto ret = processIXFRRecords(master, zone, records, std::dynamic_pointer_cast<SOARecordContent>(masterSOA));
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_ixfr_invalid_no_master_soa) {
addRecordToList(records, DNSName("JAIN.AD.JP."), QType::SOA, "ns.jain.ad.jp. mohta.jain.ad.jp. 3 600 600 3600000 604800");
auto ret = processIXFRRecords(master, zone, records, nullptr);
- BOOST_CHECK_EQUAL(ret.size(), 0);
+ BOOST_CHECK_EQUAL(ret.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_ixfr_invalid_no_trailing_soa) {
nsset.insert("def");
nsset.insert("aBc");
nsset.insert("ns.example.com");
- BOOST_CHECK_EQUAL(nsset.size(), 4);
+ BOOST_CHECK_EQUAL(nsset.size(), 4U);
ostringstream s;
for(set<std::string, CIStringCompare>::const_iterator i=nsset.begin();i!=nsset.end();++i) {
nsset2.insert(make_pair("ns.example.com", 0));
nsset2.insert(make_pair("abc", 2));
nsset2.insert(make_pair("ABC", 2));
- BOOST_CHECK_EQUAL(nsset2.size(), 6);
+ BOOST_CHECK_EQUAL(nsset2.size(), 6U);
ostringstream s;
for(set<typedns_t, CIStringPairCompare>::const_iterator i=nsset2.begin();i!=nsset2.end();++i) {
AtomicCounter ac(0);
++ac;
++ac;
- BOOST_CHECK_EQUAL(ac, 2);
+ BOOST_CHECK_EQUAL(ac, 2U);
}
BOOST_AUTO_TEST_CASE(test_endianness) {
std::vector<int> readyFDs;
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_CHECK_EQUAL(readyFDs.size(), 0);
+ BOOST_CHECK_EQUAL(readyFDs.size(), 0U);
auto timeouts = mplexer->getTimeouts(now);
- BOOST_CHECK_EQUAL(timeouts.size(), 0);
+ BOOST_CHECK_EQUAL(timeouts.size(), 0U);
int pipes[2];
int res = pipe(pipes);
readyFDs.clear();
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_REQUIRE_EQUAL(readyFDs.size(), 1);
+ BOOST_REQUIRE_EQUAL(readyFDs.size(), 1U);
BOOST_CHECK_EQUAL(readyFDs.at(0), pipes[1]);
ready = mplexer->run(&now, 100);
/* no read timeouts */
timeouts = mplexer->getTimeouts(now, false);
- BOOST_CHECK_EQUAL(timeouts.size(), 0);
+ BOOST_CHECK_EQUAL(timeouts.size(), 0U);
/* but we should have a write one */
timeouts = mplexer->getTimeouts(now, true);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 1);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 1U);
BOOST_CHECK_EQUAL(timeouts.at(0).first, pipes[1]);
/* can't remove from the wrong type of FD */
readyFDs.clear();
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_REQUIRE_EQUAL(readyFDs.size(), 0);
+ BOOST_REQUIRE_EQUAL(readyFDs.size(), 0U);
ready = mplexer->run(&now, 100);
BOOST_CHECK_EQUAL(ready, 0);
/* not ready for reading yet */
readyFDs.clear();
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_REQUIRE_EQUAL(readyFDs.size(), 0);
+ BOOST_REQUIRE_EQUAL(readyFDs.size(), 0U);
ready = mplexer->run(&now, 100);
BOOST_CHECK_EQUAL(ready, 0);
readyFDs.clear();
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_REQUIRE_EQUAL(readyFDs.size(), 1);
+ BOOST_REQUIRE_EQUAL(readyFDs.size(), 1U);
BOOST_CHECK_EQUAL(readyFDs.at(0), pipes[0]);
ready = mplexer->run(&now, 100);
readyFDs.clear();
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_REQUIRE_GT(readyFDs.size(), 0);
+ BOOST_REQUIRE_GT(readyFDs.size(), 0U);
if (readyFDs.size() == 2) {
ready = mplexer->run(&now, 100);
BOOST_CHECK_EQUAL(ready, 2);
BOOST_CHECK_EQUAL(writeCBCalled, false);
char buffer[1];
ssize_t got = read(pipes[0], &buffer[0], sizeof(buffer));
- BOOST_CHECK_EQUAL(got, 1);
+ BOOST_CHECK_EQUAL(got, 1U);
/* ok, the pipe should be writable now, but not readable */
readyFDs.clear();
mplexer->getAvailableFDs(readyFDs, 0);
- BOOST_CHECK_EQUAL(readyFDs.size(), 1);
+ BOOST_CHECK_EQUAL(readyFDs.size(), 1U);
BOOST_REQUIRE_EQUAL(readyFDs.at(0), pipes[1]);
ready = mplexer->run(&now, 100);
/* both the read and write FD should be reported */
timeouts = mplexer->getTimeouts(now, false);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 1);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 1U);
BOOST_CHECK_EQUAL(timeouts.at(0).first, pipes[0]);
timeouts = mplexer->getTimeouts(now, true);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 1);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 1U);
BOOST_CHECK_EQUAL(timeouts.at(0).first, pipes[1]);
struct timeval past = ttd;
/* no read timeouts */
timeouts = mplexer->getTimeouts(past, false);
- BOOST_CHECK_EQUAL(timeouts.size(), 0);
+ BOOST_CHECK_EQUAL(timeouts.size(), 0U);
/* and we should not have a write one either */
timeouts = mplexer->getTimeouts(past, true);
- BOOST_CHECK_EQUAL(timeouts.size(), 0);
+ BOOST_CHECK_EQUAL(timeouts.size(), 0U);
/* update the timeouts to now, they should not be reported anymore */
mplexer->setReadTTD(pipes[0], now, 0);
mplexer->setWriteTTD(pipes[1], now, 0);
timeouts = mplexer->getTimeouts(now, false);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 0);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 0U);
timeouts = mplexer->getTimeouts(now, true);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 0);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 0U);
/* put it back into the past */
mplexer->setReadTTD(pipes[0], now, -5);
mplexer->setWriteTTD(pipes[1], now, -5);
timeouts = mplexer->getTimeouts(now, false);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 1);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 1U);
BOOST_CHECK_EQUAL(timeouts.at(0).first, pipes[0]);
timeouts = mplexer->getTimeouts(now, true);
- BOOST_REQUIRE_EQUAL(timeouts.size(), 1);
+ BOOST_REQUIRE_EQUAL(timeouts.size(), 1U);
BOOST_CHECK_EQUAL(timeouts.at(0).first, pipes[1]);
mplexer->removeReadFD(pipes[0]);
vector<DNSZoneRecord> records;
- BOOST_CHECK_EQUAL(QC.size(), 0);
+ BOOST_CHECK_EQUAL(QC.size(), 0U);
QC.insert(DNSName("hello"), QType(QType::A), records, 3600, 1);
- BOOST_CHECK_EQUAL(QC.size(), 1);
- BOOST_CHECK_EQUAL(QC.purge(), 1);
- BOOST_CHECK_EQUAL(QC.size(), 0);
+ BOOST_CHECK_EQUAL(QC.size(), 1U);
+ BOOST_CHECK_EQUAL(QC.purge(), 1U);
+ BOOST_CHECK_EQUAL(QC.size(), 0U);
uint64_t counter=0;
try {
uint64_t delcounter=0;
for(delcounter=0; delcounter < counter/100; ++delcounter) {
DNSName a=DNSName("hello ")+DNSName(std::to_string(delcounter));
- BOOST_CHECK_EQUAL(QC.purge(a.toString()), 1);
+ BOOST_CHECK_EQUAL(QC.purge(a.toString()), 1U);
}
BOOST_CHECK_EQUAL(QC.size(), counter-delcounter);
- uint64_t matches=0;
+ int64_t matches=0;
vector<DNSZoneRecord> entry;
int64_t expected=counter-delcounter;
for(; delcounter < counter; ++delcounter) {
for(int i=0; i < 4 ; ++i)
pthread_join(tid[i], &res);
- BOOST_CHECK_EQUAL(QC.size() + S.read("deferred-cache-inserts"), 400000);
+ BOOST_CHECK_EQUAL(QC.size() + S.read("deferred-cache-inserts"), 400000U);
BOOST_CHECK_SMALL(1.0*S.read("deferred-cache-inserts"), 10000.0);
for(int i=0; i < 4; ++i)
for(int i=0; i < 4 ; ++i)
pthread_join(tid[i], &res);
- BOOST_CHECK_EQUAL(PC.size() + S.read("deferred-packetcache-inserts"), 400000);
- BOOST_CHECK_EQUAL(S.read("deferred-packetcache-lookup"), 0);
+ BOOST_CHECK_EQUAL(PC.size() + S.read("deferred-packetcache-inserts"), 400000UL);
+ BOOST_CHECK_EQUAL(S.read("deferred-packetcache-lookup"), 0UL);
BOOST_CHECK_SMALL(1.0*S.read("deferred-packetcache-inserts"), 10000.0);
for(int i=0; i < 4; ++i)
cerr<<PC.size()<<endl;
*/
- BOOST_CHECK_EQUAL(g_PCmissing + S.read("packetcache-hit"), 400000);
+ BOOST_CHECK_EQUAL(g_PCmissing + S.read("packetcache-hit"), 400000UL);
BOOST_CHECK_EQUAL(S.read("deferred-packetcache-inserts") + S.read("deferred-packetcache-lookup"), g_PCmissing);
}
catch(PDNSException& e) {
BOOST_CHECK_EQUAL(PC.get(q, r2), false);
PC.insert(q, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
BOOST_CHECK_EQUAL(PC.get(ednsQ, r2), false);
/* inserting the EDNS-enabled one too */
PC.insert(ednsQ, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 2);
+ BOOST_CHECK_EQUAL(PC.size(), 2U);
/* different EDNS versions, should not match */
BOOST_CHECK_EQUAL(PC.get(ednsVersion42, r2), false);
/* inserting the version with ECS Client Subnet set,
it should NOT replace the existing EDNS one. */
PC.insert(ecs1, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 3);
+ BOOST_CHECK_EQUAL(PC.size(), 3U);
/* different subnet of same size, should NOT match
since we don't skip the option */
/* different subnet of different size, should NOT match. */
BOOST_CHECK_EQUAL(PC.get(ecs3, r2), false);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com"), 3);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com"), 3U);
BOOST_CHECK_EQUAL(PC.get(q, r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
PC.insert(q, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.purge("com$"), 1);
+ BOOST_CHECK_EQUAL(PC.purge("com$"), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
PC.insert(q, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.purge("powerdns.com$"), 1);
+ BOOST_CHECK_EQUAL(PC.purge("powerdns.com$"), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
PC.insert(q, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1U);
BOOST_CHECK_EQUAL(PC.get(q, r2), false);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
PC.insert(q, r, 3600);
- BOOST_CHECK_EQUAL(PC.size(), 1);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.net"), 0);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.net"), 0U);
BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
- BOOST_CHECK_EQUAL(PC.purge("net$"), 0);
+ BOOST_CHECK_EQUAL(PC.purge("net$"), 0U);
BOOST_CHECK_EQUAL(PC.get(q, r2), true);
BOOST_CHECK_EQUAL(r2.qdomain, r.qdomain);
- BOOST_CHECK_EQUAL(PC.size(), 1);
+ BOOST_CHECK_EQUAL(PC.size(), 1U);
- BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1);
- BOOST_CHECK_EQUAL(PC.size(), 0);
+ BOOST_CHECK_EQUAL(PC.purge("www.powerdns.com$"), 1U);
+ BOOST_CHECK_EQUAL(PC.size(), 0U);
}
catch(PDNSException& e) {
cerr<<"Had error in AuthPacketCache: "<<e.reason<<endl;
uint32_t age=0;
uint32_t qhash=0;
uint32_t ttd=3600;
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
::arg().set("rng")="auto";
::arg().set("entropy-source")="/dev/urandom";
string rpacket((const char*)&packet[0], packet.size());
rpc.insertResponsePacket(tag, qhash, string(qpacket), qname, QType::A, QClass::IN, string(rpacket), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 1);
+ BOOST_CHECK_EQUAL(rpc.size(), 1U);
rpc.doPruneTo(0);
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
rpc.insertResponsePacket(tag, qhash, string(qpacket), qname, QType::A, QClass::IN, string(rpacket), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 1);
+ BOOST_CHECK_EQUAL(rpc.size(), 1U);
rpc.doWipePacketCache(qname);
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
rpc.insertResponsePacket(tag, qhash, string(qpacket), qname, QType::A, QClass::IN, string(rpacket), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 1);
+ BOOST_CHECK_EQUAL(rpc.size(), 1U);
uint32_t qhash2 = 0;
bool found = rpc.getResponsePacket(tag, qpacket, time(nullptr), &fpacket, &age, &qhash2);
BOOST_CHECK_EQUAL(found, true);
BOOST_CHECK_EQUAL(found, false);
rpc.doWipePacketCache(DNSName("com"), 0xffff, true);
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
}
BOOST_AUTO_TEST_CASE(test_recPacketCache_Tags) {
uint32_t qhash=0;
uint32_t temphash=0;
uint32_t ttd=3600;
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
::arg().set("rng")="auto";
::arg().set("entropy-source")="/dev/urandom";
/* inserting a response for tag1 */
rpc.insertResponsePacket(tag1, qhash, string(qpacket), qname, QType::A, QClass::IN, string(r1packet), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 1);
+ BOOST_CHECK_EQUAL(rpc.size(), 1U);
/* inserting a different response for tag2, should not override the first one */
rpc.insertResponsePacket(tag2, qhash, string(qpacket), qname, QType::A, QClass::IN, string(r2packet), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 2);
+ BOOST_CHECK_EQUAL(rpc.size(), 2U);
/* remove all responses from the cache */
rpc.doPruneTo(0);
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
/* reinsert both */
rpc.insertResponsePacket(tag1, qhash, string(qpacket), qname, QType::A, QClass::IN, string(r1packet), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 1);
+ BOOST_CHECK_EQUAL(rpc.size(), 1U);
rpc.insertResponsePacket(tag2, qhash, string(qpacket), qname, QType::A, QClass::IN, string(r2packet), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 2);
+ BOOST_CHECK_EQUAL(rpc.size(), 2U);
/* remove the responses by qname, should remove both */
rpc.doWipePacketCache(qname);
- BOOST_CHECK_EQUAL(rpc.size(), 0);
+ BOOST_CHECK_EQUAL(rpc.size(), 0U);
/* insert the response for tag1 */
rpc.insertResponsePacket(tag1, qhash, string(qpacket), qname, QType::A, QClass::IN, string(r1packet), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 1);
+ BOOST_CHECK_EQUAL(rpc.size(), 1U);
/* we can retrieve it */
BOOST_CHECK_EQUAL(rpc.getResponsePacket(tag1, qpacket, qname, QType::A, QClass::IN, time(nullptr), &fpacket, &age, &temphash), true);
/* adding a response for the second tag */
rpc.insertResponsePacket(tag2, qhash, string(qpacket), qname, QType::A, QClass::IN, string(r2packet), time(0), ttd, Indeterminate, 0, 0, boost::none);
- BOOST_CHECK_EQUAL(rpc.size(), 2);
+ BOOST_CHECK_EQUAL(rpc.size(), 2U);
/* We still get the correct response for the first tag */
BOOST_CHECK_EQUAL(rpc.getResponsePacket(tag1, qpacket, time(nullptr), &fpacket, &age, &temphash), true);
std::string name;
std::string rfcMsgDump;
std::string rfcB64Signature;
- unsigned int bits;
+ int bits;
uint16_t flags;
uint16_t rfcFlags;
uint8_t algorithm;
BOOST_CHECK_EQUAL(drc.getZoneRepresentation(), signer.zoneRepresentation);
DNSName name(signer.name);
- auto ds1 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA1);
+ auto ds1 = makeDSFromDNSKey(name, drc, DNSSECKeeper::DIGEST_SHA1);
if (!signer.dsSHA1.empty()) {
BOOST_CHECK_EQUAL(ds1.getZoneRepresentation(), signer.dsSHA1);
}
- auto ds2 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA256);
+ auto ds2 = makeDSFromDNSKey(name, drc, DNSSECKeeper::DIGEST_SHA256);
if (!signer.dsSHA256.empty()) {
BOOST_CHECK_EQUAL(ds2.getZoneRepresentation(), signer.dsSHA256);
}
- auto ds4 = makeDSFromDNSKey(name, drc, DNSSECKeeper::SHA384);
+ auto ds4 = makeDSFromDNSKey(name, drc, DNSSECKeeper::DIGEST_SHA384);
if (!signer.dsSHA384.empty()) {
BOOST_CHECK_EQUAL(ds4.getZoneRepresentation(), signer.dsSHA384);
}
s.declare("b", "description");
s.declare("c", "description");
s.inc("a");
- BOOST_CHECK_EQUAL(s.read("a"), 1);
+ BOOST_CHECK_EQUAL(s.read("a"), 1UL);
- int n;
+ unsigned long n;
for(n=0; n < 1000000; ++n)
s.inc("b");
#ifdef UINTPTR_MAX
#if UINTPTR_MAX > 0xffffffffULL
- BOOST_CHECK_EQUAL(sizeof(AtomicCounterInner), 8);
+ BOOST_CHECK_EQUAL(sizeof(AtomicCounterInner), 8U);
s.set("c", 1ULL<<33);
BOOST_CHECK_EQUAL(s.read("c"), (1ULL<<33) );
s.inc("c");
s.set("c", ~0ULL);
BOOST_CHECK_EQUAL(s.read("c"), 0xffffffffffffffffULL );
s.inc("c");
- BOOST_CHECK_EQUAL(s.read("c"), 0 );
+ BOOST_CHECK_EQUAL(s.read("c"), 0UL );
#else
- BOOST_CHECK_EQUAL(sizeof(AtomicCounterInner), 4);
+ BOOST_CHECK_EQUAL(sizeof(AtomicCounterInner), 4U);
BOOST_CHECK_EQUAL(~0UL, 0xffffffffUL);
s.set("c", ~0UL);
BOOST_CHECK_EQUAL(s.read("c"), 0xffffffffUL );
s.inc("c");
- BOOST_CHECK_EQUAL(s.read("c"), 0 );
+ BOOST_CHECK_EQUAL(s.read("c"), 0UL );
#endif
#endif
}
if(answer.first.d_type == QType::TSIG) {
BOOST_CHECK_EQUAL(answer.first.d_place, DNSResourceRecord::ADDITIONAL);
BOOST_CHECK_EQUAL(answer.first.d_class, QClass::ANY);
- BOOST_CHECK_EQUAL(answer.first.d_ttl, 0);
+ BOOST_CHECK_EQUAL(answer.first.d_ttl, 0U);
BOOST_CHECK_EQUAL(tsigFound, false);
shared_ptr<TSIGRecordContent> rectrc = getRR<TSIGRecordContent>(answer.first);
if (dnskeyr == nullptr) {
throw PDNSException("Unable to parse DNSKEY record '" + rr.qname.toString() + " " + rr.getZoneRepresentation() +"'");
}
- auto dsr = makeDSFromDNSKey(rr.qname, *dnskeyr, DNSSECKeeper::SHA256);
+ auto dsr = makeDSFromDNSKey(rr.qname, *dnskeyr, DNSSECKeeper::DIGEST_SHA256);
newDSAnchors[rr.qname].insert(dsr);
}
}
if (value.second.keyType == DNSSECKeeper::KSK || value.second.keyType == DNSSECKeeper::CSK) {
Json::array dses;
- for(const uint8_t keyid : { DNSSECKeeper::SHA1, DNSSECKeeper::SHA256, DNSSECKeeper::GOST, DNSSECKeeper::SHA384 })
+ for(const uint8_t keyid : { DNSSECKeeper::DIGEST_SHA1, DNSSECKeeper::DIGEST_SHA256, DNSSECKeeper::DIGEST_GOST, DNSSECKeeper::DIGEST_SHA384 })
try {
dses.push_back(makeDSFromDNSKey(zonename, value.first.getDNSKEY(), keyid).getZoneRepresentation());
} catch (...) {}
projects / pdns / commitdiff