9480112502

Committed 12 Jun 2024 09:25AM UTC coverage: 61.318% (-0.2%) from 61.495%

Build # 9480112502

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #14312 from omoerbeek/rec-pbout-udr

rec: do not add UDR field to outgoingProtobuf answer messages

Run Details

34154 of 88172 branches covered (38.74%)

Branch coverage included in aggregate %.

0 of 6 new or added lines in 2 files covered. (0.0%)

15 existing lines in 6 files now uncovered.

118955 of 161524 relevant lines covered (73.65%)

6176393.25 hits per line

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

0.0

/pdns/recursordist/rec-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 "dnsrecords.hh"
#include "rec-protozero.hh"
#include <variant>

void pdns::ProtoZero::RecMessage::addRR(const DNSRecord& record, const std::set<uint16_t>& exportTypes, [[maybe_unused]] std::optional<bool> udr)
{
  if (record.d_place != DNSResourceRecord::ANSWER || record.d_class != QClass::IN) {
    return;
  }

  if (exportTypes.count(record.d_type) == 0) {
    return;
  }

  protozero::pbf_writer pbf_rr{d_response, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::ResponseField::rrs)};

  encodeDNSName(pbf_rr, d_rspbuf, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::name), record.d_name);
  pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::type), record.d_type);
  pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::class_), record.d_class);
  pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::ttl), record.d_ttl);

  auto add = [&](const std::string& str) {
    if (size() + str.length() < std::numeric_limits<uint16_t>::max() / 2) {
      pbf_rr.add_string(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), str);
    }
  };

  switch (record.d_type) {
  case QType::A: {
    const auto& content = getRR<ARecordContent>(record);
    if (!content) {
      return;
    }
    ComboAddress data = content->getCA();
    pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin4.sin_addr.s_addr), sizeof(data.sin4.sin_addr.s_addr)); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API
    break;
  }
  case QType::AAAA: {
    const auto& content = getRR<AAAARecordContent>(record);
    if (!content) {
      return;
    }
    ComboAddress data = content->getCA();
    pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin6.sin6_addr.s6_addr), sizeof(data.sin6.sin6_addr.s6_addr)); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API
    break;
  }
  case QType::CNAME: {
    const auto& content = getRR<CNAMERecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getTarget().toString());
    break;
  }
  case QType::TXT: {
    const auto& content = getRR<TXTRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->d_text);
    break;
  }
  case QType::NS: {
    const auto& content = getRR<NSRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getNS().toString());
    break;
  }
  case QType::PTR: {
    const auto& content = getRR<PTRRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getContent().toString());
    break;
  }
  case QType::MX: {
    const auto& content = getRR<MXRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->d_mxname.toString());
    break;
  }
  case QType::SPF: {
    const auto& content = getRR<SPFRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getText());
    break;
  }
  case QType::SRV: {
    const auto& content = getRR<SRVRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->d_target.toString());
    break;
  }
  case QType::SVCB: {
    const auto& content = getRR<SVCBRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getZoneRepresentation());
    break;
  }
  case QType::HTTPS: {
    const auto& content = getRR<HTTPSRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getZoneRepresentation());
    break;
  }
  case QType::NAPTR: {
    const auto& content = getRR<NAPTRRecordContent>(record);
    if (!content) {
      return;
    }
    add(content->getZoneRepresentation());
    break;
  }
  default:
    break;
  }
#ifdef NOD_ENABLED
  if (udr) {
    pbf_rr.add_bool(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::udr), *udr);
    pbf_rr.commit();

    // Save the offset of the byte containing the just added bool. We can do this since
    // we know a bit about how protobuf's encoding works.
    offsets.push_back(d_rspbuf.length() - 1);
  }
#endif
}

#ifdef NOD_ENABLED
void pdns::ProtoZero::RecMessage::clearUDR(std::string& str)
{
  for (auto offset : offsets) {
    str.at(offset) = 0;
  }
}
#endif

void pdns::ProtoZero::RecMessage::addEvents(const RecEventTrace& trace)
{
  for (const auto& event : trace.getEvents()) {
    protozero::pbf_writer pbf_trace{d_message, static_cast<protozero::pbf_tag_type>(Field::trace)};
    pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::ts), event.d_ts);
    pbf_trace.add_uint32(static_cast<protozero::pbf_tag_type>(Event::event), event.d_event);
    pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::start), event.d_start);

    const auto& value = event.d_value;
    if (std::holds_alternative<std::nullopt_t>(value)) {
    }
    else if (std::holds_alternative<bool>(value)) {
      pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::boolVal), std::get<bool>(value));
    }
    else if (std::holds_alternative<int64_t>(value)) {
      pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::intVal), std::get<int64_t>(value));
    }
    else if (std::holds_alternative<std::string>(value)) {
      pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::stringVal), std::get<std::string>(value));
    }
    else if (std::holds_alternative<PacketBuffer>(value)) {
      const auto& packetBuffer = std::get<PacketBuffer>(value);
      pbf_trace.add_bytes(static_cast<protozero::pbf_tag_type>(Event::bytesVal), reinterpret_cast<const char*>(packetBuffer.data()), packetBuffer.size()); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API
    }
    if (!event.d_custom.empty()) {
      pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::custom), event.d_custom);
    }
  }
}

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 "dnsrecords.hh"
24	#include "rec-protozero.hh"
25	#include <variant>
26
27	void pdns::ProtoZero::RecMessage::addRR(const DNSRecord& record, const std::set<uint16_t>& exportTypes, [[maybe_unused]] std::optional<bool> udr)
28	{	×
29	if (record.d_place != DNSResourceRecord::ANSWER \|\| record.d_class != QClass::IN) {	×
30	return;	×
31	}	×
32
33	if (exportTypes.count(record.d_type) == 0) {	×
34	return;	×
35	}	×
36
37	protozero::pbf_writer pbf_rr{d_response, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::ResponseField::rrs)};	×
38
39	encodeDNSName(pbf_rr, d_rspbuf, static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::name), record.d_name);	×
40	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::type), record.d_type);	×
41	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::class_), record.d_class);	×
42	pbf_rr.add_uint32(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::ttl), record.d_ttl);	×
43
44	auto add = [&](const std::string& str) {	×
45	if (size() + str.length() < std::numeric_limits<uint16_t>::max() / 2) {	×
46	pbf_rr.add_string(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), str);	×
47	}	×
48	};	×
49
50	switch (record.d_type) {	×
51	case QType::A: {	×
52	const auto& content = getRR<ARecordContent>(record);	×
53	if (!content) {	×
54	return;	×
55	}	×
56	ComboAddress data = content->getCA();	×
57	pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin4.sin_addr.s_addr), sizeof(data.sin4.sin_addr.s_addr)); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API	×
58	break;	×
59	}	×
60	case QType::AAAA: {	×
61	const auto& content = getRR<AAAARecordContent>(record);	×
62	if (!content) {	×
63	return;	×
64	}	×
65	ComboAddress data = content->getCA();	×
66	pbf_rr.add_bytes(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::rdata), reinterpret_cast<const char*>(&data.sin6.sin6_addr.s6_addr), sizeof(data.sin6.sin6_addr.s6_addr)); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API	×
67	break;	×
68	}	×
69	case QType::CNAME: {	×
70	const auto& content = getRR<CNAMERecordContent>(record);	×
71	if (!content) {	×
72	return;	×
73	}	×
74	add(content->getTarget().toString());	×
75	break;	×
76	}	×
77	case QType::TXT: {	×
78	const auto& content = getRR<TXTRecordContent>(record);	×
79	if (!content) {	×
80	return;	×
81	}	×
82	add(content->d_text);	×
83	break;	×
84	}	×
85	case QType::NS: {	×
86	const auto& content = getRR<NSRecordContent>(record);	×
87	if (!content) {	×
88	return;	×
89	}	×
90	add(content->getNS().toString());	×
91	break;	×
92	}	×
93	case QType::PTR: {	×
94	const auto& content = getRR<PTRRecordContent>(record);	×
95	if (!content) {	×
96	return;	×
97	}	×
98	add(content->getContent().toString());	×
99	break;	×
100	}	×
101	case QType::MX: {	×
102	const auto& content = getRR<MXRecordContent>(record);	×
103	if (!content) {	×
104	return;	×
105	}	×
106	add(content->d_mxname.toString());	×
107	break;	×
108	}	×
109	case QType::SPF: {	×
110	const auto& content = getRR<SPFRecordContent>(record);	×
111	if (!content) {	×
112	return;	×
113	}	×
114	add(content->getText());	×
115	break;	×
116	}	×
117	case QType::SRV: {	×
118	const auto& content = getRR<SRVRecordContent>(record);	×
119	if (!content) {	×
120	return;	×
121	}	×
122	add(content->d_target.toString());	×
123	break;	×
124	}	×
125	case QType::SVCB: {	×
126	const auto& content = getRR<SVCBRecordContent>(record);	×
127	if (!content) {	×
128	return;	×
129	}	×
130	add(content->getZoneRepresentation());	×
131	break;	×
132	}	×
133	case QType::HTTPS: {	×
134	const auto& content = getRR<HTTPSRecordContent>(record);	×
135	if (!content) {	×
136	return;	×
137	}	×
138	add(content->getZoneRepresentation());	×
139	break;	×
140	}	×
141	case QType::NAPTR: {	×
142	const auto& content = getRR<NAPTRRecordContent>(record);	×
143	if (!content) {	×
144	return;	×
145	}	×
146	add(content->getZoneRepresentation());	×
147	break;	×
148	}	×
149	default:	×
150	break;	×
151	}	×
152	#ifdef NOD_ENABLED	×
NEW 153	if (udr) {	×
NEW 154	pbf_rr.add_bool(static_cast<protozero::pbf_tag_type>(pdns::ProtoZero::Message::RRField::udr), *udr);	×
NEW 155	pbf_rr.commit();	×
156
157	// Save the offset of the byte containing the just added bool. We can do this since
158	// we know a bit about how protobuf's encoding works.
NEW 159	offsets.push_back(d_rspbuf.length() - 1);	×
NEW 160	}	×
161	#endif	×
162	}	×
163
164	#ifdef NOD_ENABLED
165	void pdns::ProtoZero::RecMessage::clearUDR(std::string& str)
166	{	×
167	for (auto offset : offsets) {	×
168	str.at(offset) = 0;	×
169	}	×
170	}	×
171	#endif
172
173	void pdns::ProtoZero::RecMessage::addEvents(const RecEventTrace& trace)
174	{	×
175	for (const auto& event : trace.getEvents()) {	×
176	protozero::pbf_writer pbf_trace{d_message, static_cast<protozero::pbf_tag_type>(Field::trace)};	×
177	pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::ts), event.d_ts);	×
178	pbf_trace.add_uint32(static_cast<protozero::pbf_tag_type>(Event::event), event.d_event);	×
179	pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::start), event.d_start);	×
180
181	const auto& value = event.d_value;	×
182	if (std::holds_alternative<std::nullopt_t>(value)) {	×
183	}	×
184	else if (std::holds_alternative<bool>(value)) {	×
185	pbf_trace.add_bool(static_cast<protozero::pbf_tag_type>(Event::boolVal), std::get<bool>(value));	×
186	}	×
187	else if (std::holds_alternative<int64_t>(value)) {	×
188	pbf_trace.add_int64(static_cast<protozero::pbf_tag_type>(Event::intVal), std::get<int64_t>(value));	×
189	}	×
190	else if (std::holds_alternative<std::string>(value)) {	×
191	pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::stringVal), std::get<std::string>(value));	×
192	}	×
193	else if (std::holds_alternative<PacketBuffer>(value)) {	×
194	const auto& packetBuffer = std::get<PacketBuffer>(value);	×
195	pbf_trace.add_bytes(static_cast<protozero::pbf_tag_type>(Event::bytesVal), reinterpret_cast<const char*>(packetBuffer.data()), packetBuffer.size()); // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast): it's the API	×
196	}	×
197	if (!event.d_custom.empty()) {	×
198	pbf_trace.add_string(static_cast<protozero::pbf_tag_type>(Event::custom), event.d_custom);	×
199	}	×
200	}	×
201	}	×

PowerDNS / pdns / 9480112502

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