11913896599

Committed 19 Nov 2024 01:18PM UTC coverage: 64.669% (-0.01%) from 64.682%

Build # 11913896599

Build Type

Pull #14852

github

Committed by

web-flow

Commit Message

Merge ea9d3de6c into b476fe149

Pull Request Pull Request #14852: rec: add headerflags and ednsVersion as fields in protobuf messages

Run Details

37417 of 88712 branches covered (42.18%)

Branch coverage included in aggregate %.

23 of 24 new or added lines in 4 files covered. (95.83%)

8596 existing lines in 93 files now uncovered.

125768 of 163625 relevant lines covered (76.86%)

4643863.44 hits per line

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

33.33

/pdns/dnsdistdist/dnsdist-random.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.
 */
#include "config.h"

#include <stdexcept>
#include <sys/time.h>
#include <unistd.h>
#ifdef HAVE_LIBSODIUM
#include <sodium.h>
#endif /* HAVE_LIBSODIUM */
#ifdef HAVE_RAND_BYTES
#include <openssl/rand.h>
#endif /* HAVE_RAND_BYTES */

#if defined(HAVE_GETRANDOM)
#include <sys/random.h>
#endif

#include "dnsdist-random.hh"
#include "dns_random.hh"
#include "dolog.hh"
#include "misc.hh"

namespace dnsdist
{
#if !defined(HAVE_LIBSODIUM) && defined(HAVE_GETRANDOM)
static bool s_useGetRandom{true};
#endif

void initRandom()
{
#ifdef HAVE_LIBSODIUM
  srandom(randombytes_random());
#else
  {
    auto getSeed = []() {
#if defined(HAVE_GETRANDOM)
      char buf[1];
      // some systems define getrandom but it does not really work, e.g. because it's
      // not present in kernel.
      if (getrandom(buf, sizeof(buf), 0) == -1 && errno != EINTR) {
        warnlog("getrandom() failed %s", stringerror());
        s_useGetRandom = false;
      }
#endif /* HAVE_GETRANDOM */
#ifdef HAVE_RAND_BYTES
      unsigned int seed;
      if (RAND_bytes(reinterpret_cast<unsigned char*>(&seed), sizeof(seed)) == 1) {
        return seed;
      }
#endif /* HAVE_RAND_BYTES */
      struct timeval tv;
      gettimeofday(&tv, 0);
      return static_cast<unsigned int>(tv.tv_sec ^ tv.tv_usec ^ getpid());
    };

    srandom(getSeed());
  }
#endif
}

uint32_t getRandomValue(uint32_t upperBound)
{
#ifdef HAVE_LIBSODIUM
  return randombytes_uniform(upperBound);
#else /* HAVE_LIBSODIUM */
  uint32_t result = 0;
  unsigned int min = pdns::random_minimum_acceptable_value(upperBound);

#if defined(HAVE_GETRANDOM)
  if (s_useGetRandom) {
    do {
      auto got = getrandom(&result, sizeof(result), 0);
      if (got == -1 && errno == EINTR) {
        continue;
      }
      if (got != sizeof(result)) {
        throw std::runtime_error("Error getting a random value via getrandom(): " + stringerror());
      }
    } while (result < min);

    return result % upperBound;
  }
#endif /* HAVE_GETRANDOM */
#ifdef HAVE_RAND_BYTES
  do {
    if (RAND_bytes(reinterpret_cast<unsigned char*>(&result), sizeof(result)) != 1) {
      throw std::runtime_error("Error getting a random value via RAND_bytes");
    }
  } while (result < min);

  return result % upperBound;
#endif /* HAVE_RAND_BYTES */
  do {
    result = random();
  } while (result < min);

  return result % upperBound;
#endif /* HAVE_LIBSODIUM */
}

uint16_t getRandomDNSID()
{
  return getRandomValue(65536);
}
}

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	#include "config.h"
23
24	#include <stdexcept>
25	#include <sys/time.h>
26	#include <unistd.h>
27	#ifdef HAVE_LIBSODIUM
28	#include <sodium.h>
29	#endif /* HAVE_LIBSODIUM */
30	#ifdef HAVE_RAND_BYTES
31	#include <openssl/rand.h>
32	#endif /* HAVE_RAND_BYTES */
33
34	#if defined(HAVE_GETRANDOM)
35	#include <sys/random.h>
36	#endif
37
38	#include "dnsdist-random.hh"
39	#include "dns_random.hh"
40	#include "dolog.hh"
41	#include "misc.hh"
42
43	namespace dnsdist
44	{
45	#if !defined(HAVE_LIBSODIUM) && defined(HAVE_GETRANDOM)
46	static bool s_useGetRandom{true};
47	#endif
48
49	void initRandom()
UNCOV 50	{	645✔
51	#ifdef HAVE_LIBSODIUM	645✔
52	srandom(randombytes_random());	645✔
53	#else
54	{
55	auto getSeed = []() {
56	#if defined(HAVE_GETRANDOM)
57	char buf[1];
58	// some systems define getrandom but it does not really work, e.g. because it's
59	// not present in kernel.
60	if (getrandom(buf, sizeof(buf), 0) == -1 && errno != EINTR) {	×
61	warnlog("getrandom() failed %s", stringerror());
62	s_useGetRandom = false;
63	}
64	#endif /* HAVE_GETRANDOM */
65	#ifdef HAVE_RAND_BYTES
66	unsigned int seed;
67	if (RAND_bytes(reinterpret_cast<unsigned char*>(&seed), sizeof(seed)) == 1) {	×
68	return seed;
69	}
70	#endif /* HAVE_RAND_BYTES */
71	struct timeval tv;
72	gettimeofday(&tv, 0);
73	return static_cast<unsigned int>(tv.tv_sec ^ tv.tv_usec ^ getpid());
74	};
75
76	srandom(getSeed());
77	}
78	#endif
UNCOV 79	}	645✔
80
81	uint32_t getRandomValue(uint32_t upperBound)
UNCOV 82	{	3,494✔
83	#ifdef HAVE_LIBSODIUM	3,494✔
84	return randombytes_uniform(upperBound);	3,494✔
85	#else /* HAVE_LIBSODIUM */
86	uint32_t result = 0;
87	unsigned int min = pdns::random_minimum_acceptable_value(upperBound);
88
89	#if defined(HAVE_GETRANDOM)
90	if (s_useGetRandom) {	×
91	do {
92	auto got = getrandom(&result, sizeof(result), 0);
93	if (got == -1 && errno == EINTR) {	×
94	continue;
95	}
96	if (got != sizeof(result)) {	×
97	throw std::runtime_error("Error getting a random value via getrandom(): " + stringerror());
98	}
99	} while (result < min);	×
100
101	return result % upperBound;
102	}
103	#endif /* HAVE_GETRANDOM */
104	#ifdef HAVE_RAND_BYTES
105	do {
106	if (RAND_bytes(reinterpret_cast<unsigned char*>(&result), sizeof(result)) != 1) {	×
107	throw std::runtime_error("Error getting a random value via RAND_bytes");
108	}
109	} while (result < min);	×
110
111	return result % upperBound;
112	#endif /* HAVE_RAND_BYTES */
113	do {
114	result = random();
115	} while (result < min);	×
116
117	return result % upperBound;
118	#endif /* HAVE_LIBSODIUM */
UNCOV 119	}	3,494✔
120
121	uint16_t getRandomDNSID()
UNCOV 122	{	1,249✔
UNCOV 123	return getRandomValue(65536);	1,249✔
UNCOV 124	}	1,249✔
125	}

PowerDNS / pdns / 11913896599

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