6974185635

Committed 23 Nov 2023 08:56PM UTC coverage: 57.386% (+0.001%) from 57.385%

Build # 6974185635

Build Type

push

github

Committed by

web-flow

Commit Message

Merge pull request #13528 from fredmorcos/various-cleanups-and-fixes

Various cleanups and fixes

Run Details

31424 of 85840 branches covered (0.0%)

Branch coverage included in aggregate %.

29 of 29 new or added lines in 6 files covered. (100.0%)

33 existing lines in 10 files now uncovered.

105985 of 153608 relevant lines covered (69.0%)

3892212.4 hits per line

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

65.11

/pdns/axfr-retriever.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 "axfr-retriever.hh"
#include "arguments.hh"
#include "dns_random.hh"
#include "utility.hh"
#include "resolver.hh"
#include "query-local-address.hh"

using pdns::resolver::parseResult;

AXFRRetriever::AXFRRetriever(const ComboAddress& remote,
                             const DNSName& domain,
                             const TSIGTriplet& tt, 
                             const ComboAddress* laddr,
                             size_t maxReceivedBytes,
                             uint16_t timeout)
  : d_buf(65536), d_tsigVerifier(tt, remote, d_trc), d_receivedBytes(0), d_maxReceivedBytes(maxReceivedBytes)
{
  ComboAddress local;
  if (laddr != nullptr) {
    local = ComboAddress(*laddr);
  } else {
    if (!pdns::isQueryLocalAddressFamilyEnabled(remote.sin4.sin_family)) {
      throw ResolverException("Unable to determine source address for AXFR request to " + remote.toStringWithPort() + " for " + domain.toLogString() + ". Address family is not configured for outgoing queries");
    }
    local = pdns::getQueryLocalAddress(remote.sin4.sin_family, 0);
  }
  d_sock = -1;
  try {
    d_sock = makeQuerySocket(local, false); // make a TCP socket
    if (d_sock < 0)
      throw ResolverException("Error creating socket for AXFR request to "+d_remote.toStringWithPort());

    d_remote = remote; // mostly for error reporting
    this->connect(timeout);
    d_soacount = 0;
  
    vector<uint8_t> packet;
    DNSPacketWriter pw(packet, domain, QType::AXFR);
    pw.getHeader()->id = dns_random_uint16();
  
    if(!tt.name.empty()) {
      if (tt.algo == DNSName("hmac-md5"))
        d_trc.d_algoName = tt.algo + DNSName("sig-alg.reg.int");
      else
        d_trc.d_algoName = tt.algo;
      d_trc.d_time = time(nullptr);
      d_trc.d_fudge = 300;
      d_trc.d_origID=ntohs(pw.getHeader()->id);
      d_trc.d_eRcode=0;
      addTSIG(pw, d_trc, tt.name, tt.secret, "", false);
    }
  
    uint16_t replen=htons(packet.size());
    Utility::iovec iov[2];
    iov[0].iov_base=reinterpret_cast<char*>(&replen);
    iov[0].iov_len=2;
    iov[1].iov_base=packet.data();
    iov[1].iov_len=packet.size();
  
    int ret=Utility::writev(d_sock, iov, 2);
    if(ret < 0)
      throw ResolverException("Error sending question to "+d_remote.toStringWithPort()+": "+stringerror());
    if(ret != (int)(2+packet.size())) {
      throw ResolverException("Partial write on AXFR request to "+d_remote.toStringWithPort());
    }
  
    int res = waitForData(d_sock, timeout, 0);
    
    if(!res)
      throw ResolverException("Timeout waiting for answer from "+d_remote.toStringWithPort()+" during AXFR");
    if(res<0)
      throw ResolverException("Error waiting for answer from "+d_remote.toStringWithPort()+": "+stringerror());
  }
  catch(...) {
    if(d_sock >= 0)
      close(d_sock);
    d_sock = -1;
    throw;
  }
}

AXFRRetriever::~AXFRRetriever()
{
  close(d_sock);
}



int AXFRRetriever::getChunk(Resolver::res_t &res, vector<DNSRecord>* records, uint16_t timeout) // Implementation is making sure RFC2845 4.4 is followed.
{
  if(d_soacount > 1)
    return false;

  // d_sock is connected and is about to spit out a packet
  int len=getLength(timeout);
  if(len<0)
    throw ResolverException("EOF trying to read axfr chunk from remote TCP client");

  if (d_maxReceivedBytes > 0 && (d_maxReceivedBytes - d_receivedBytes) < (size_t) len)
    throw ResolverException("Reached the maximum number of received bytes during AXFR");

  timeoutReadn(len, timeout);

  d_receivedBytes += (uint16_t) len;

  MOADNSParser mdp(false, d_buf.data(), len);

  int err = mdp.d_header.rcode;

  if(err) {
    throw ResolverException("AXFR chunk error: " + RCode::to_s(err));
  }

  if(mdp.d_header.tc) {
    throw ResolverException("AXFR chunk had TC bit set");
  }

  try {
    d_tsigVerifier.check(std::string(d_buf.data(), len), mdp);
  }
  catch(const std::runtime_error& re) {
    throw ResolverException(re.what());
  }

  if(!records) {
    err = parseResult(mdp, DNSName(), 0, 0, &res);

    if (!err) {
      for(const auto& answer :  mdp.d_answers)
        if (answer.first.d_type == QType::SOA)
          d_soacount++;
    }
  }
  else {
    records->clear();
    records->reserve(mdp.d_answers.size());

    for(auto& r: mdp.d_answers) {
      if (r.first.d_type == QType::SOA) {
        d_soacount++;
      }

      records->push_back(std::move(r.first));
    }
  }

  return true;
}

void AXFRRetriever::timeoutReadn(uint16_t bytes, uint16_t timeoutsec)
{
  time_t start=time(nullptr);
  int n=0;
  int numread;
  while(n<bytes) {
    int res=waitForData(d_sock, timeoutsec-(time(nullptr)-start));
    if(res<0)
      throw ResolverException("Reading data from remote nameserver over TCP: "+stringerror());
    if(!res)
      throw ResolverException("Timeout while reading data from remote nameserver over TCP");

    numread=recv(d_sock, &d_buf.at(n), bytes-n, 0);
    if(numread<0)
      throw ResolverException("Reading data from remote nameserver over TCP: "+stringerror());
    if(numread==0)
      throw ResolverException("Remote nameserver closed TCP connection");
    n+=numread;
  }
}

void AXFRRetriever::connect(uint16_t timeout)
{
  setNonBlocking( d_sock );

  int err;

  if((err=::connect(d_sock,(struct sockaddr*)&d_remote, d_remote.getSocklen()))<0 && errno!=EINPROGRESS) {
    try {
      closesocket(d_sock);
    }
    catch(const PDNSException& e) {
      d_sock=-1;
      throw ResolverException("Error closing AXFR socket after connect() failed: "+e.reason);
    }

    throw ResolverException("connect: "+stringerror());
  }

  if(!err)
    goto done;

  err=waitForRWData(d_sock, false, timeout, 0); // wait for writeability
  
  if(!err) {
    try {
      closesocket(d_sock); // timeout
    }
    catch(const PDNSException& e) {
      d_sock=-1;
      throw ResolverException("Error closing AXFR socket after timeout: "+e.reason);
    }

    d_sock=-1;
    errno=ETIMEDOUT;
    
    throw ResolverException("Timeout connecting to server");
  }
  else if(err < 0) {
    throw ResolverException("Error connecting: "+stringerror());
  }
  else {
    Utility::socklen_t len=sizeof(err);
    if(getsockopt(d_sock, SOL_SOCKET,SO_ERROR,(char *)&err,&len)<0)
      throw ResolverException("Error connecting: "+stringerror()); // Solaris

    if(err)
      throw ResolverException("Error connecting: "+string(strerror(err)));
  }
  
 done:
  setBlocking( d_sock );
  // d_sock now connected
}

int AXFRRetriever::getLength(uint16_t timeout)
{
  timeoutReadn(2, timeout);
  return (unsigned char)d_buf.at(0)*256+(unsigned char)d_buf.at(1);
}


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 "axfr-retriever.hh"
24	#include "arguments.hh"
25	#include "dns_random.hh"
26	#include "utility.hh"
27	#include "resolver.hh"
28	#include "query-local-address.hh"
29
30	using pdns::resolver::parseResult;
31
32	AXFRRetriever::AXFRRetriever(const ComboAddress& remote,
33	const DNSName& domain,
34	const TSIGTriplet& tt,
35	const ComboAddress* laddr,
36	size_t maxReceivedBytes,
37	uint16_t timeout)
38	: d_buf(65536), d_tsigVerifier(tt, remote, d_trc), d_receivedBytes(0), d_maxReceivedBytes(maxReceivedBytes)
39	{	431✔
40	ComboAddress local;	431✔
41	if (laddr != nullptr) {	431!
42	local = ComboAddress(*laddr);	431✔
43	} else {	431✔
UNCOV 44	if (!pdns::isQueryLocalAddressFamilyEnabled(remote.sin4.sin_family)) {	×
45	throw ResolverException("Unable to determine source address for AXFR request to " + remote.toStringWithPort() + " for " + domain.toLogString() + ". Address family is not configured for outgoing queries");	×
46	}	×
UNCOV 47	local = pdns::getQueryLocalAddress(remote.sin4.sin_family, 0);	×
UNCOV 48	}	×
49	d_sock = -1;	431✔
50	try {	431✔
51	d_sock = makeQuerySocket(local, false); // make a TCP socket	431✔
52	if (d_sock < 0)	431!
53	throw ResolverException("Error creating socket for AXFR request to "+d_remote.toStringWithPort());	×
54
55	d_remote = remote; // mostly for error reporting	431✔
56	this->connect(timeout);	431✔
57	d_soacount = 0;	431✔
58
59	vector<uint8_t> packet;	431✔
60	DNSPacketWriter pw(packet, domain, QType::AXFR);	431✔
61	pw.getHeader()->id = dns_random_uint16();	431✔
62
63	if(!tt.name.empty()) {	431✔
64	if (tt.algo == DNSName("hmac-md5"))	23!
65	d_trc.d_algoName = tt.algo + DNSName("sig-alg.reg.int");	23✔
66	else	×
67	d_trc.d_algoName = tt.algo;	×
68	d_trc.d_time = time(nullptr);	23✔
69	d_trc.d_fudge = 300;	23✔
70	d_trc.d_origID=ntohs(pw.getHeader()->id);	23✔
71	d_trc.d_eRcode=0;	23✔
72	addTSIG(pw, d_trc, tt.name, tt.secret, "", false);	23✔
73	}	23✔
74
75	uint16_t replen=htons(packet.size());	431✔
76	Utility::iovec iov[2];	431✔
77	iov[0].iov_base=reinterpret_cast<char*>(&replen);	431✔
78	iov[0].iov_len=2;	431✔
79	iov[1].iov_base=packet.data();	431✔
80	iov[1].iov_len=packet.size();	431✔
81
82	int ret=Utility::writev(d_sock, iov, 2);	431✔
83	if(ret < 0)	431!
84	throw ResolverException("Error sending question to "+d_remote.toStringWithPort()+": "+stringerror());	×
85	if(ret != (int)(2+packet.size())) {	431!
86	throw ResolverException("Partial write on AXFR request to "+d_remote.toStringWithPort());	×
87	}	×
88
89	int res = waitForData(d_sock, timeout, 0);	431✔
90
91	if(!res)	431!
92	throw ResolverException("Timeout waiting for answer from "+d_remote.toStringWithPort()+" during AXFR");	×
93	if(res<0)	431!
94	throw ResolverException("Error waiting for answer from "+d_remote.toStringWithPort()+": "+stringerror());	×
95	}	431✔
96	catch(...) {	431✔
97	if(d_sock >= 0)	×
98	close(d_sock);	×
99	d_sock = -1;	×
100	throw;	×
101	}	×
102	}	431✔
103
104	AXFRRetriever::~AXFRRetriever()
105	{	431✔
106	close(d_sock);	431✔
107	}	431✔
108
109
110
111	int AXFRRetriever::getChunk(Resolver::res_t &res, vector<DNSRecord>* records, uint16_t timeout) // Implementation is making sure RFC2845 4.4 is followed.
112	{	20,236✔
113	if(d_soacount > 1)	20,236✔
114	return false;	429✔
115
116	// d_sock is connected and is about to spit out a packet
117	int len=getLength(timeout);	19,807✔
118	if(len<0)	19,807!
119	throw ResolverException("EOF trying to read axfr chunk from remote TCP client");	×
120
121	if (d_maxReceivedBytes > 0 && (d_maxReceivedBytes - d_receivedBytes) < (size_t) len)	19,807!
122	throw ResolverException("Reached the maximum number of received bytes during AXFR");	×
123
124	timeoutReadn(len, timeout);	19,807✔
125
126	d_receivedBytes += (uint16_t) len;	19,807✔
127
128	MOADNSParser mdp(false, d_buf.data(), len);	19,807✔
129
130	int err = mdp.d_header.rcode;	19,807✔
131
132	if(err) {	19,807!
133	throw ResolverException("AXFR chunk error: " + RCode::to_s(err));	×
134	}	×
135
136	if(mdp.d_header.tc) {	19,807!
137	throw ResolverException("AXFR chunk had TC bit set");	×
138	}	×
139
140	try {	19,807✔
141	d_tsigVerifier.check(std::string(d_buf.data(), len), mdp);	19,807✔
142	}	19,807✔
143	catch(const std::runtime_error& re) {	19,807✔
144	throw ResolverException(re.what());	×
145	}	×
146
147	if(!records) {	19,807✔
148	err = parseResult(mdp, DNSName(), 0, 0, &res);	19,801✔
149
150	if (!err) {	19,801!
151	for(const auto& answer : mdp.d_answers)	19,801✔
152	if (answer.first.d_type == QType::SOA)	1,500,766✔
153	d_soacount++;	849✔
154	}	19,801✔
155	}	19,801✔
156	else {	6✔
157	records->clear();	6✔
158	records->reserve(mdp.d_answers.size());	6✔
159
160	for(auto& r: mdp.d_answers) {	41✔
161	if (r.first.d_type == QType::SOA) {	41✔
162	d_soacount++;	12✔
163	}	12✔
164
165	records->push_back(std::move(r.first));	41✔
166	}	41✔
167	}	6✔
168
169	return true;	19,807✔
170	}	19,807✔
171
172	void AXFRRetriever::timeoutReadn(uint16_t bytes, uint16_t timeoutsec)
173	{	39,614✔
174	time_t start=time(nullptr);	39,614✔
175	int n=0;	39,614✔
176	int numread;	39,614✔
177	while(n<bytes) {	79,228✔
178	int res=waitForData(d_sock, timeoutsec-(time(nullptr)-start));	39,614✔
179	if(res<0)	39,614!
180	throw ResolverException("Reading data from remote nameserver over TCP: "+stringerror());	×
181	if(!res)	39,614!
182	throw ResolverException("Timeout while reading data from remote nameserver over TCP");	×
183
184	numread=recv(d_sock, &d_buf.at(n), bytes-n, 0);	39,614✔
185	if(numread<0)	39,614!
186	throw ResolverException("Reading data from remote nameserver over TCP: "+stringerror());	×
187	if(numread==0)	39,614!
188	throw ResolverException("Remote nameserver closed TCP connection");	×
189	n+=numread;	39,614✔
190	}	39,614✔
191	}	39,614✔
192
193	void AXFRRetriever::connect(uint16_t timeout)
194	{	431✔
195	setNonBlocking( d_sock );	431✔
196
197	int err;	431✔
198
199	if((err=::connect(d_sock,(struct sockaddr*)&d_remote, d_remote.getSocklen()))<0 && errno!=EINPROGRESS) {	431!
200	try {	×
201	closesocket(d_sock);	×
202	}	×
203	catch(const PDNSException& e) {	×
204	d_sock=-1;	×
205	throw ResolverException("Error closing AXFR socket after connect() failed: "+e.reason);	×
206	}	×
207
208	throw ResolverException("connect: "+stringerror());	×
209	}	×
210
211	if(!err)	431!
212	goto done;	×
213
214	err=waitForRWData(d_sock, false, timeout, 0); // wait for writeability	431✔
215
216	if(!err) {	431!
217	try {	×
218	closesocket(d_sock); // timeout	×
219	}	×
220	catch(const PDNSException& e) {	×
221	d_sock=-1;	×
222	throw ResolverException("Error closing AXFR socket after timeout: "+e.reason);	×
223	}	×
224
225	d_sock=-1;	×
226	errno=ETIMEDOUT;	×
227
228	throw ResolverException("Timeout connecting to server");	×
229	}	×
230	else if(err < 0) {	431!
231	throw ResolverException("Error connecting: "+stringerror());	×
232	}	×
233	else {	431✔
234	Utility::socklen_t len=sizeof(err);	431✔
235	if(getsockopt(d_sock, SOL_SOCKET,SO_ERROR,(char *)&err,&len)<0)	431!
236	throw ResolverException("Error connecting: "+stringerror()); // Solaris	×
237
238	if(err)	431!
239	throw ResolverException("Error connecting: "+string(strerror(err)));	×
240	}	431✔
241
242	done:	431✔
243	setBlocking( d_sock );	431✔
244	// d_sock now connected
245	}	431✔
246
247	int AXFRRetriever::getLength(uint16_t timeout)
248	{	19,807✔
249	timeoutReadn(2, timeout);	19,807✔
250	return (unsigned char)d_buf.at(0)*256+(unsigned char)d_buf.at(1);	19,807✔
251	}	19,807✔
252

PowerDNS / pdns / 6974185635

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