9076012796

Committed 14 May 2024 08:14AM UTC coverage: 59.643% (-0.02%) from 59.664%

Build # 9076012796

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14156 from rgacogne/ddist-fix-assertion-doh-xfr-tcp

dnsdist: Fix handling of XFR requests over DoH

Run Details

32870 of 87836 branches covered (37.42%)

Branch coverage included in aggregate %.

12 of 18 new or added lines in 3 files covered. (66.67%)

44 existing lines in 13 files now uncovered.

115445 of 160835 relevant lines covered (71.78%)

3064305.51 hits per line

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

80.85

/pdns/query-local-address.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 "query-local-address.hh"
#include "iputils.hh"
#include "dns_random.hh"

namespace pdns {
  static const ComboAddress local4("0.0.0.0");
  static const ComboAddress local6("::");

  static vector<ComboAddress> g_localQueryAddresses4;
  static vector<ComboAddress> g_localQueryAddresses6;

  ComboAddress getQueryLocalAddress(const sa_family_t family, const in_port_t port) {
    ComboAddress ret;
    if (family==AF_INET) {
      if (g_localQueryAddresses4.empty()) {
        ret = local4;
      } else if (g_localQueryAddresses4.size() == 1) {
        ret = g_localQueryAddresses4.at(0);
      } else {
        ret = g_localQueryAddresses4[dns_random(g_localQueryAddresses4.size())];
      }
      ret.sin4.sin_port = htons(port);
    }
    else {
      if (g_localQueryAddresses6.empty()) {
        ret = local6;
      } else if (g_localQueryAddresses6.size() == 1) {
        ret = g_localQueryAddresses6.at(0);
      } else {
        ret = g_localQueryAddresses6[dns_random(g_localQueryAddresses6.size())];
      }
      ret.sin6.sin6_port = htons(port);
    }
    return ret;
  }

  ComboAddress getNonAnyQueryLocalAddress(const sa_family_t family) {
    if (family == AF_INET) {
      for (const auto& addr : pdns::g_localQueryAddresses4) {
        if (!IsAnyAddress(addr)) {
          return addr;
        }
      }
    }
    if (family == AF_INET6) {
      for (const auto& addr : pdns::g_localQueryAddresses6) {
        if (!IsAnyAddress(addr)) {
          return addr;
        }
      }
    }
    ComboAddress ret("0.0.0.0");
    ret.reset(); // Ensure all is zero, even the addr family
    return ret;
  }

  void parseQueryLocalAddress(const std::string &qla) {
    vector<string> addrs;
    stringtok(addrs, qla, ", ;");
    for(const string& addr : addrs) {
      ComboAddress tmp(addr);
      if (tmp.isIPv4()) {
        g_localQueryAddresses4.push_back(tmp);
        continue;
      }
      g_localQueryAddresses6.push_back(tmp);
    }
  }

  bool isQueryLocalAddressFamilyEnabled(const sa_family_t family) {
    if (family == AF_INET) {
      return !g_localQueryAddresses4.empty();
    }
    if (family == AF_INET6) {
      return !g_localQueryAddresses6.empty();
    }
    return false;
  }
} // namespace pdns

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 "query-local-address.hh"
23	#include "iputils.hh"
24	#include "dns_random.hh"
25
26	namespace pdns {
27	static const ComboAddress local4("0.0.0.0");
28	static const ComboAddress local6("::");
29
30	static vector<ComboAddress> g_localQueryAddresses4;
31	static vector<ComboAddress> g_localQueryAddresses6;
32
33	ComboAddress getQueryLocalAddress(const sa_family_t family, const in_port_t port) {	513✔
34	ComboAddress ret;	513✔
35	if (family==AF_INET) {	513✔
36	if (g_localQueryAddresses4.empty()) {	465✔
37	ret = local4;	2✔
38	} else if (g_localQueryAddresses4.size() == 1) {	465!
39	ret = g_localQueryAddresses4.at(0);	463✔
40	} else {	463✔
UNCOV 41	ret = g_localQueryAddresses4[dns_random(g_localQueryAddresses4.size())];	×
UNCOV 42	}	×
43	ret.sin4.sin_port = htons(port);	465✔
44	}	465✔
45	else {	48✔
46	if (g_localQueryAddresses6.empty()) {	48✔
47	ret = local6;	2✔
48	} else if (g_localQueryAddresses6.size() == 1) {	48!
49	ret = g_localQueryAddresses6.at(0);	46✔
50	} else {	46✔
UNCOV 51	ret = g_localQueryAddresses6[dns_random(g_localQueryAddresses6.size())];	×
UNCOV 52	}	×
53	ret.sin6.sin6_port = htons(port);	48✔
54	}	48✔
55	return ret;	513✔
56	}	513✔
57
58	ComboAddress getNonAnyQueryLocalAddress(const sa_family_t family) {	2✔
59	if (family == AF_INET) {	2✔
60	for (const auto& addr : pdns::g_localQueryAddresses4) {	1✔
61	if (!IsAnyAddress(addr)) {	1!
62	return addr;	×
63	}	×
64	}	1✔
65	}	1✔
66	if (family == AF_INET6) {	2✔
67	for (const auto& addr : pdns::g_localQueryAddresses6) {	1!
68	if (!IsAnyAddress(addr)) {	×
69	return addr;	×
70	}	×
71	}	×
72	}	1✔
73	ComboAddress ret("0.0.0.0");	2✔
74	ret.reset(); // Ensure all is zero, even the addr family	2✔
75	return ret;	2✔
76	}	2✔
77
78	void parseQueryLocalAddress(const std::string &qla) {	97✔
79	vector<string> addrs;	97✔
80	stringtok(addrs, qla, ", ;");	97✔
81	for(const string& addr : addrs) {	189✔
82	ComboAddress tmp(addr);	189✔
83	if (tmp.isIPv4()) {	189✔
84	g_localQueryAddresses4.push_back(tmp);	97✔
85	continue;	97✔
86	}	97✔
87	g_localQueryAddresses6.push_back(tmp);	92✔
88	}	92✔
89	}	97✔
90
91	bool isQueryLocalAddressFamilyEnabled(const sa_family_t family) {	788✔
92	if (family == AF_INET) {	788✔
93	return !g_localQueryAddresses4.empty();	727✔
94	}	727✔
95	if (family == AF_INET6) {	61!
96	return !g_localQueryAddresses6.empty();	61✔
97	}	61✔
98	return false;	×
99	}	61✔
100	} // namespace pdns

PowerDNS / pdns / 9076012796

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