6604151522

Committed 22 Oct 2023 01:33PM CUT coverage: 55.124% (-2.4%) from 57.485%

Build # 6604151522

Build Type

Pull #11678

github

Committed by

web-flow

Commit Message

Merge 6c021206c into 42240b1f5

Pull Request Pull Request #11678: Draft: Lua global include

Run Details

23854 of 67374 branches covered (0.0%)

Branch coverage included in aggregate %.

5 of 48 new or added lines in 6 files covered. (10.42%)

6223 existing lines in 108 files now uncovered.

88618 of 136660 relevant lines covered (64.85%)

3655010.43 hits per line

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

0.0

/pdns/protozero.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 "protozero.hh"

#ifndef DISABLE_PROTOBUF
#include "dnsparser.hh"

void pdns::ProtoZero::Message::encodeComboAddress(const protozero::pbf_tag_type type, const ComboAddress& ca)
{
  if (ca.sin4.sin_family == AF_INET) {
    d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin4.sin_addr.s_addr), sizeof(ca.sin4.sin_addr.s_addr));
  }
  else if (ca.sin4.sin_family == AF_INET6) {
    d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin6.sin6_addr.s6_addr), sizeof(ca.sin6.sin6_addr.s6_addr));
  }
}

void pdns::ProtoZero::Message::encodeNetmask(const protozero::pbf_tag_type type, const Netmask& subnet, uint8_t mask)
{
  if (!subnet.empty()) {
    ComboAddress ca(subnet.getNetwork());
    ca.truncate(mask);
    if (ca.sin4.sin_family == AF_INET) {
      d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin4.sin_addr.s_addr), sizeof(ca.sin4.sin_addr.s_addr));
    }
    else if (ca.sin4.sin_family == AF_INET6) {
      d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin6.sin6_addr.s6_addr), sizeof(ca.sin6.sin6_addr.s6_addr));
    }
  }
}

void pdns::ProtoZero::Message::encodeDNSName(protozero::pbf_writer& pbf, std::string& buffer, const protozero::pbf_tag_type type, const DNSName& name)
{
  // this will append the tag, mark the current position then reserve enough place to write the size
  protozero::pbf_writer pbf_name{pbf, type};
  // we append the name to the buffer
  name.toString(buffer);
  // leaving the block will cause the sub writer to compute how much was written based on the new size and update the size accordingly
}

void pdns::ProtoZero::Message::setRequest(const boost::uuids::uuid& uniqueId, const ComboAddress& requestor, const ComboAddress& local, const DNSName& qname, uint16_t qtype, uint16_t qclass, uint16_t id, pdns::ProtoZero::Message::TransportProtocol proto, size_t len)
{
  setMessageIdentity(uniqueId);
  setSocketFamily(requestor.sin4.sin_family);
  setSocketProtocol(proto);
  setFrom(requestor);
  setTo(local);
  setInBytes(len);
  setTime();
  setId(id);
  setQuestion(qname, qtype, qclass);
  setFromPort(requestor.getPort());
  setToPort(local.getPort());
}

void pdns::ProtoZero::Message::setResponse(const DNSName& qname, uint16_t qtype, uint16_t qclass)
{
  setType(pdns::ProtoZero::Message::MessageType::DNSResponseType);
  setQuestion(qname, qtype, qclass);
}

void pdns::ProtoZero::Message::addRRsFromPacket(const char* packet, const size_t len, bool includeCNAME)
{
  if (len < sizeof(struct dnsheader)) {
    return;
  }

  const dnsheader_aligned dh(packet);

  if (ntohs(dh->ancount) == 0) {
    return;
  }

  if (ntohs(dh->qdcount) == 0) {
    return;
  }

  PacketReader pr(std::string_view(packet, len));

  size_t idx = 0;
  DNSName rrname;
  uint16_t qdcount = ntohs(dh->qdcount);
  uint16_t ancount = ntohs(dh->ancount);
  uint16_t rrtype;
  uint16_t rrclass;
  string blob;
  struct dnsrecordheader ah;

  rrname = pr.getName();
  rrtype = pr.get16BitInt();
  rrclass = pr.get16BitInt();
  (void) rrtype;
  (void) rrclass;

  /* consume remaining qd if any */
  if (qdcount > 1) {
    for(idx = 1; idx < qdcount; idx++) {
      rrname = pr.getName();
      rrtype = pr.get16BitInt();
      rrclass = pr.get16BitInt();
      (void) rrtype;
      (void) rrclass;
    }
  }

  /* parse AN */
  for (idx = 0; idx < ancount; idx++) {
    rrname = pr.getName();
    pr.getDnsrecordheader(ah);

    if (ah.d_type == QType::A || ah.d_type == QType::AAAA) {
      pr.xfrBlob(blob);

      addRR(rrname, ah.d_type, ah.d_class, ah.d_ttl, blob);

    } else if (ah.d_type == QType::CNAME && includeCNAME) {
      protozero::pbf_writer pbf_rr{d_response, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::ResponseField::rrs)};

      encodeDNSName(pbf_rr, d_buffer, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::name), rrname);
      pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::type), ah.d_type);
      pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::class_), ah.d_class);
      pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::ttl), ah.d_ttl);
      DNSName target;
      pr.xfrName(target, true);
      encodeDNSName(pbf_rr, d_buffer, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), target);
    }
    else {
      pr.xfrBlob(blob);
    }
  }
}

void pdns::ProtoZero::Message::addRR(const DNSName& name, uint16_t uType, uint16_t uClass, uint32_t uTTL, const std::string& blob)
{
  protozero::pbf_writer pbf_rr{d_response, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::ResponseField::rrs)};
  encodeDNSName(pbf_rr, d_buffer, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::name), name);
  pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::type), uType);
  pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::class_), uClass);
  pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::ttl), uTTL);
  pbf_rr.add_string(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), blob);
}

#endif /* DISABLE_PROTOBUF */

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
23	#include "protozero.hh"
24
25	#ifndef DISABLE_PROTOBUF
26	#include "dnsparser.hh"
27
28	void pdns::ProtoZero::Message::encodeComboAddress(const protozero::pbf_tag_type type, const ComboAddress& ca)
UNCOV 29	{	×
UNCOV 30	if (ca.sin4.sin_family == AF_INET) {	×
UNCOV 31	d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin4.sin_addr.s_addr), sizeof(ca.sin4.sin_addr.s_addr));	×
UNCOV 32	}	×
UNCOV 33	else if (ca.sin4.sin_family == AF_INET6) {	×
UNCOV 34	d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin6.sin6_addr.s6_addr), sizeof(ca.sin6.sin6_addr.s6_addr));	×
UNCOV 35	}	×
UNCOV 36	}	×
37
38	void pdns::ProtoZero::Message::encodeNetmask(const protozero::pbf_tag_type type, const Netmask& subnet, uint8_t mask)
39	{	×
40	if (!subnet.empty()) {	×
41	ComboAddress ca(subnet.getNetwork());	×
42	ca.truncate(mask);	×
43	if (ca.sin4.sin_family == AF_INET) {	×
44	d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin4.sin_addr.s_addr), sizeof(ca.sin4.sin_addr.s_addr));	×
45	}	×
46	else if (ca.sin4.sin_family == AF_INET6) {	×
47	d_message.add_bytes(type, reinterpret_cast<const char*>(&ca.sin6.sin6_addr.s6_addr), sizeof(ca.sin6.sin6_addr.s6_addr));	×
48	}	×
49	}	×
50	}	×
51
52	void pdns::ProtoZero::Message::encodeDNSName(protozero::pbf_writer& pbf, std::string& buffer, const protozero::pbf_tag_type type, const DNSName& name)
UNCOV 53	{	×
54	// this will append the tag, mark the current position then reserve enough place to write the size
UNCOV 55	protozero::pbf_writer pbf_name{pbf, type};	×
56	// we append the name to the buffer
UNCOV 57	name.toString(buffer);	×
58	// leaving the block will cause the sub writer to compute how much was written based on the new size and update the size accordingly
UNCOV 59	}	×
60
61	void pdns::ProtoZero::Message::setRequest(const boost::uuids::uuid& uniqueId, const ComboAddress& requestor, const ComboAddress& local, const DNSName& qname, uint16_t qtype, uint16_t qclass, uint16_t id, pdns::ProtoZero::Message::TransportProtocol proto, size_t len)
UNCOV 62	{	×
UNCOV 63	setMessageIdentity(uniqueId);	×
UNCOV 64	setSocketFamily(requestor.sin4.sin_family);	×
UNCOV 65	setSocketProtocol(proto);	×
UNCOV 66	setFrom(requestor);	×
UNCOV 67	setTo(local);	×
UNCOV 68	setInBytes(len);	×
UNCOV 69	setTime();	×
UNCOV 70	setId(id);	×
UNCOV 71	setQuestion(qname, qtype, qclass);	×
UNCOV 72	setFromPort(requestor.getPort());	×
UNCOV 73	setToPort(local.getPort());	×
UNCOV 74	}	×
75
76	void pdns::ProtoZero::Message::setResponse(const DNSName& qname, uint16_t qtype, uint16_t qclass)
77	{	×
78	setType(pdns::ProtoZero::Message::MessageType::DNSResponseType);	×
79	setQuestion(qname, qtype, qclass);	×
80	}	×
81
82	void pdns::ProtoZero::Message::addRRsFromPacket(const char* packet, const size_t len, bool includeCNAME)
UNCOV 83	{	×
UNCOV 84	if (len < sizeof(struct dnsheader)) {	×
85	return;	×
86	}	×
87
UNCOV 88	const dnsheader_aligned dh(packet);	×
89
UNCOV 90	if (ntohs(dh->ancount) == 0) {	×
91	return;	×
92	}	×
93
UNCOV 94	if (ntohs(dh->qdcount) == 0) {	×
95	return;	×
96	}	×
97
UNCOV 98	PacketReader pr(std::string_view(packet, len));	×
99
UNCOV 100	size_t idx = 0;	×
UNCOV 101	DNSName rrname;	×
UNCOV 102	uint16_t qdcount = ntohs(dh->qdcount);	×
UNCOV 103	uint16_t ancount = ntohs(dh->ancount);	×
UNCOV 104	uint16_t rrtype;	×
UNCOV 105	uint16_t rrclass;	×
UNCOV 106	string blob;	×
UNCOV 107	struct dnsrecordheader ah;	×
108
UNCOV 109	rrname = pr.getName();	×
UNCOV 110	rrtype = pr.get16BitInt();	×
UNCOV 111	rrclass = pr.get16BitInt();	×
UNCOV 112	(void) rrtype;	×
UNCOV 113	(void) rrclass;	×
114
115	/* consume remaining qd if any */
UNCOV 116	if (qdcount > 1) {	×
117	for(idx = 1; idx < qdcount; idx++) {	×
118	rrname = pr.getName();	×
119	rrtype = pr.get16BitInt();	×
120	rrclass = pr.get16BitInt();	×
121	(void) rrtype;	×
122	(void) rrclass;	×
123	}	×
124	}	×
125
126	/* parse AN */
UNCOV 127	for (idx = 0; idx < ancount; idx++) {	×
UNCOV 128	rrname = pr.getName();	×
UNCOV 129	pr.getDnsrecordheader(ah);	×
130
UNCOV 131	if (ah.d_type == QType::A \|\| ah.d_type == QType::AAAA) {	×
UNCOV 132	pr.xfrBlob(blob);	×
133
UNCOV 134	addRR(rrname, ah.d_type, ah.d_class, ah.d_ttl, blob);	×
135
UNCOV 136	} else if (ah.d_type == QType::CNAME && includeCNAME) {	×
UNCOV 137	protozero::pbf_writer pbf_rr{d_response, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::ResponseField::rrs)};	×
138
UNCOV 139	encodeDNSName(pbf_rr, d_buffer, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::name), rrname);	×
UNCOV 140	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::type), ah.d_type);	×
UNCOV 141	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::class_), ah.d_class);	×
UNCOV 142	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::ttl), ah.d_ttl);	×
UNCOV 143	DNSName target;	×
UNCOV 144	pr.xfrName(target, true);	×
UNCOV 145	encodeDNSName(pbf_rr, d_buffer, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), target);	×
UNCOV 146	}	×
147	else {	×
148	pr.xfrBlob(blob);	×
149	}	×
UNCOV 150	}	×
UNCOV 151	}	×
152
153	void pdns::ProtoZero::Message::addRR(const DNSName& name, uint16_t uType, uint16_t uClass, uint32_t uTTL, const std::string& blob)
UNCOV 154	{	×
UNCOV 155	protozero::pbf_writer pbf_rr{d_response, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::ResponseField::rrs)};	×
UNCOV 156	encodeDNSName(pbf_rr, d_buffer, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::name), name);	×
UNCOV 157	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::type), uType);	×
UNCOV 158	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::class_), uClass);	×
UNCOV 159	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::ttl), uTTL);	×
UNCOV 160	pbf_rr.add_string(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), blob);	×
UNCOV 161	}	×
162
163	#endif /* DISABLE_PROTOBUF */

PowerDNS / pdns / 6604151522

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