8050283735

Committed 26 Feb 2024 02:14PM UTC coverage: 59.175% (+10.9%) from 48.27%

Build # 8050283735

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #13824 from omoerbeek/rec-keytrap-log

rec: log if a dnssec related limit was hit (if log_bogus is set)

Run Details

32410 of 88016 branches covered (36.82%)

Branch coverage included in aggregate %.

6 of 23 new or added lines in 3 files covered. (26.09%)

3609 existing lines in 65 files now uncovered.

113514 of 158581 relevant lines covered (71.58%)

3449009.2 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

83.33

/pdns/json.cc

/*
 * This file is part of PowerDNS or dnsdist.
 * Copyright -- PowerDNS.COM B.V. and its contributors
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of version 2 of the GNU General Public License as
 * published by the Free Software Foundation.
 *
 * In addition, for the avoidance of any doubt, permission is granted to
 * link this program with OpenSSL and to (re)distribute the binaries
 * produced as the result of such linking.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "json.hh"
#include "namespaces.hh"
#include "misc.hh"

using json11::Json;

static inline int intFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const int default_value)
{
  const auto& val = container[key];
  if (val.is_number()) {
    return val.int_value();
  }

  if (val.is_string()) {
    try {
      return std::stoi(val.string_value());
    } catch (std::out_of_range&) {
      throw JsonException("Key '" + string(key) + "' is out of range");
    }
  }

  if (have_default) {
    return default_value;
  }
  throw JsonException("Key '" + string(key) + "' not an Integer or not present");
}

int intFromJson(const Json& container, const std::string& key)
{
  return intFromJsonInternal(container, key, false, 0);
}

int intFromJson(const Json& container, const std::string& key, const int default_value)
{
  return intFromJsonInternal(container, key, true, default_value);
}

static inline unsigned int uintFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const unsigned int default_value)
{
  int intval = intFromJsonInternal(container, key, have_default, static_cast<int>(default_value));
  if (intval >= 0) {
    return intval;
  }
  throw JsonException("Key '" + string(key) + "' is not a positive Integer");
}

unsigned int uintFromJson(const Json& container, const std::string& key)
{
  return uintFromJsonInternal(container, key, false, 0);
}

unsigned int uintFromJson(const Json& container, const std::string& key, const unsigned int default_value)
{
  return uintFromJsonInternal(container, key, true, default_value);
}

static inline double doubleFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const double default_value)
{
  const auto& val = container[key];
  if (val.is_number()) {
    return val.number_value();
  }

  if (val.is_string()) {
    try {
      return std::stod(val.string_value());
    } catch (std::out_of_range&) {
      throw JsonException("Value for key '" + string(key) + "' is out of range");
    }
  }

  if (have_default) {
    return default_value;
  }
  throw JsonException("Key '" + string(key) + "' not an Integer or not present");
}

double doubleFromJson(const Json& container, const std::string& key)
{
  return doubleFromJsonInternal(container, key, false, 0);
}

double doubleFromJson(const Json& container, const std::string& key, const double default_value)
{
  return doubleFromJsonInternal(container, key, true, default_value);
}

string stringFromJson(const Json& container, const std::string &key)
{
  const auto& val = container[key];
  if (val.is_string()) {
    return val.string_value();
  }
  throw JsonException("Key '" + string(key) + "' not present or not a String");
}

static inline bool boolFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const bool default_value)
{
  const auto& val = container[key];
  if (val.is_bool()) {
    return val.bool_value();
  }
  if (have_default) {
    return default_value;
  }
  throw JsonException("Key '" + string(key) + "' not present or not a Bool");
}

bool boolFromJson(const Json& container, const std::string& key)
{
  return boolFromJsonInternal(container, key, false, false);
}

bool boolFromJson(const Json& container, const std::string& key, const bool default_value)
{
  return boolFromJsonInternal(container, key, true, default_value);
}

1	/*
2	* This file is part of PowerDNS or dnsdist.
3	* Copyright -- PowerDNS.COM B.V. and its contributors
4	*
5	* This program is free software; you can redistribute it and/or modify
6	* it under the terms of version 2 of the GNU General Public License as
7	* published by the Free Software Foundation.
8	*
9	* In addition, for the avoidance of any doubt, permission is granted to
10	* link this program with OpenSSL and to (re)distribute the binaries
11	* produced as the result of such linking.
12	*
13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.
17	*
18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software
20	* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
21	*/
22	#ifdef HAVE_CONFIG_H
23	#include "config.h"
24	#endif
25	#include "json.hh"
26	#include "namespaces.hh"
27	#include "misc.hh"
28
29	using json11::Json;
30
31	static inline int intFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const int default_value)
32	{	918✔
33	const auto& val = container[key];	918✔
34	if (val.is_number()) {	918✔
35	return val.int_value();	883✔
36	}	883✔
37
38	if (val.is_string()) {	35✔
39	try {	3✔
40	return std::stoi(val.string_value());	3✔
41	} catch (std::out_of_range&) {	3✔
42	throw JsonException("Key '" + string(key) + "' is out of range");	3✔
43	}	3✔
44	}	3✔
45
46	if (have_default) {	32!
47	return default_value;	32✔
48	}	32✔
UNCOV 49	throw JsonException("Key '" + string(key) + "' not an Integer or not present");	×
50	}	32✔
51
52	int intFromJson(const Json& container, const std::string& key)
53	{	56✔
54	return intFromJsonInternal(container, key, false, 0);	56✔
55	}	56✔
56
57	int intFromJson(const Json& container, const std::string& key, const int default_value)
58	{	536✔
59	return intFromJsonInternal(container, key, true, default_value);	536✔
60	}	536✔
61
62	static inline unsigned int uintFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const unsigned int default_value)
63	{	326✔
64	int intval = intFromJsonInternal(container, key, have_default, static_cast<int>(default_value));	326✔
65	if (intval >= 0) {	326✔
66	return intval;	319✔
67	}	319✔
68	throw JsonException("Key '" + string(key) + "' is not a positive Integer");	7✔
69	}	326✔
70
71	unsigned int uintFromJson(const Json& container, const std::string& key)
72	{	301✔
73	return uintFromJsonInternal(container, key, false, 0);	301✔
74	}	301✔
75
76	unsigned int uintFromJson(const Json& container, const std::string& key, const unsigned int default_value)
77	{	25✔
78	return uintFromJsonInternal(container, key, true, default_value);	25✔
79	}	25✔
80
81	static inline double doubleFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const double default_value)
82	{	24✔
83	const auto& val = container[key];	24✔
84	if (val.is_number()) {	24!
85	return val.number_value();	×
86	}	×
87
88	if (val.is_string()) {	24!
89	try {	×
90	return std::stod(val.string_value());	×
91	} catch (std::out_of_range&) {	×
92	throw JsonException("Value for key '" + string(key) + "' is out of range");	×
93	}	×
94	}	×
95
96	if (have_default) {	24!
97	return default_value;	24✔
98	}	24✔
99	throw JsonException("Key '" + string(key) + "' not an Integer or not present");	×
100	}	24✔
101
102	double doubleFromJson(const Json& container, const std::string& key)
UNCOV 103	{	×
104	return doubleFromJsonInternal(container, key, false, 0);	×
105	}	×
106
107	double doubleFromJson(const Json& container, const std::string& key, const double default_value)
108	{	24✔
109	return doubleFromJsonInternal(container, key, true, default_value);	24✔
110	}	24✔
111
112	string stringFromJson(const Json& container, const std::string &key)
113	{	5,377✔
114	const auto& val = container[key];	5,377✔
115	if (val.is_string()) {	5,377✔
116	return val.string_value();	4,852✔
117	}	4,852✔
118	throw JsonException("Key '" + string(key) + "' not present or not a String");	525✔
119	}	5,377✔
120
121	static inline bool boolFromJsonInternal(const Json& container, const std::string& key, const bool have_default, const bool default_value)
122	{	2,262✔
123	const auto& val = container[key];	2,262✔
124	if (val.is_bool()) {	2,262✔
125	return val.bool_value();	670✔
126	}	670✔
127	if (have_default) {	1,592✔
128	return default_value;	571✔
129	}	571✔
130	throw JsonException("Key '" + string(key) + "' not present or not a Bool");	1,021✔
131	}	1,592✔
132
133	bool boolFromJson(const Json& container, const std::string& key)
134	{	1,369✔
135	return boolFromJsonInternal(container, key, false, false);	1,369✔
136	}	1,369✔
137
138	bool boolFromJson(const Json& container, const std::string& key, const bool default_value)
139	{	893✔
140	return boolFromJsonInternal(container, key, true, default_value);	893✔
141	}	893✔

PowerDNS / pdns / 8050283735

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous