dns: add TLSA record query and parsing · nodejs/node@21d795a · GitHub
Skip to content

Commit 21d795a

Browse files
rithvikvibhutargos
rithvikvibhu
authored and
targos
committed
dns: add TLSA record query and parsing
PR-URL: #52983 Refs: #39569 Reviewed-By: Paolo Insogna <paolo@cowtech.it> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Ethan Arrowood <ethan@arrowood.dev>
1 parent cc1cafd commit 21d795a

9 files changed

Lines changed: 226 additions & 0 deletions

File tree

‎doc/api/dns.md‎

Lines changed: 71 additions & 0 deletions

‎lib/internal/dns/utils.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ const resolverKeys = [
235235
'resolvePtr',
236236
'resolveSoa',
237237
'resolveSrv',
238+
'resolveTlsa',
238239
'resolveTxt',
239240
'reverse',
240241
];
@@ -300,6 +301,7 @@ function createResolverClass(resolver) {
300301
Resolver.prototype.resolveCname = resolveMap.CNAME = resolver('queryCname');
301302
Resolver.prototype.resolveMx = resolveMap.MX = resolver('queryMx');
302303
Resolver.prototype.resolveNs = resolveMap.NS = resolver('queryNs');
304+
Resolver.prototype.resolveTlsa = resolveMap.TLSA = resolver('queryTlsa');
303305
Resolver.prototype.resolveTxt = resolveMap.TXT = resolver('queryTxt');
304306
Resolver.prototype.resolveSrv = resolveMap.SRV = resolver('querySrv');
305307
Resolver.prototype.resolvePtr = resolveMap.PTR = resolver('queryPtr');

‎src/cares_wrap.cc‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@
4040
#include <vector>
4141
#include <unordered_set>
4242

43+
#ifndef T_TLSA
44+
#define T_TLSA 52 /* TLSA certificate association */
45+
#endif
46+
4347
#ifndef T_CAA
4448
# define T_CAA 257 /* Certification Authority Authorization */
4549
#endif
@@ -57,6 +61,7 @@ namespace node {
5761
namespace cares_wrap {
5862

5963
using v8::Array;
64+
using v8::ArrayBuffer;
6065
using v8::Context;
6166
using v8::EscapableHandleScope;
6267
using v8::Exception;
@@ -352,6 +357,65 @@ int ParseCaaReply(
352357
return ARES_SUCCESS;
353358
}
354359

360+
int ParseTlsaReply(Environment* env,
361+
unsigned char* buf,
362+
int len,
363+
Local<Array> ret) {
364+
EscapableHandleScope handle_scope(env->isolate());
365+
366+
ares_dns_record_t* dnsrec = nullptr;
367+
368+
int status = ares_dns_parse(buf, len, 0, &dnsrec);
369+
if (status != ARES_SUCCESS) {
370+
ares_dns_record_destroy(dnsrec);
371+
return status;
372+
}
373+
374+
uint32_t offset = ret->Length();
375+
size_t rr_count = ares_dns_record_rr_cnt(dnsrec, ARES_SECTION_ANSWER);
376+
377+
for (size_t i = 0; i < rr_count; i++) {
378+
const ares_dns_rr_t* rr =
379+
ares_dns_record_rr_get(dnsrec, ARES_SECTION_ANSWER, i);
380+
381+
if (ares_dns_rr_get_type(rr) != ARES_REC_TYPE_TLSA) continue;
382+
383+
unsigned char certusage = ares_dns_rr_get_u8(rr, ARES_RR_TLSA_CERT_USAGE);
384+
unsigned char selector = ares_dns_rr_get_u8(rr, ARES_RR_TLSA_SELECTOR);
385+
unsigned char match = ares_dns_rr_get_u8(rr, ARES_RR_TLSA_MATCH);
386+
size_t data_len;
387+
const unsigned char* data =
388+
ares_dns_rr_get_bin(rr, ARES_RR_TLSA_DATA, &data_len);
389+
if (!data || data_len == 0) continue;
390+
391+
Local<ArrayBuffer> data_ab = ArrayBuffer::New(env->isolate(), data_len);
392+
memcpy(data_ab->Data(), data, data_len);
393+
394+
Local<Object> tlsa_rec = Object::New(env->isolate());
395+
tlsa_rec
396+
->Set(env->context(),
397+
env->cert_usage_string(),
398+
Integer::NewFromUnsigned(env->isolate(), certusage))
399+
.Check();
400+
tlsa_rec
401+
->Set(env->context(),
402+
env->selector_string(),
403+
Integer::NewFromUnsigned(env->isolate(), selector))
404+
.Check();
405+
tlsa_rec
406+
->Set(env->context(),
407+
env->match_string(),
408+
Integer::NewFromUnsigned(env->isolate(), match))
409+
.Check();
410+
tlsa_rec->Set(env->context(), env->data_string(), data_ab).Check();
411+
412+
ret->Set(env->context(), offset + i, tlsa_rec).Check();
413+
}
414+
415+
ares_dns_record_destroy(dnsrec);
416+
return ARES_SUCCESS;
417+
}
418+
355419
int ParseTxtReply(
356420
Environment* env,
357421
const unsigned char* buf,
@@ -861,6 +925,11 @@ int NsTraits::Send(QueryWrap<NsTraits>* wrap, const char* name) {
861925
return ARES_SUCCESS;
862926
}
863927

928+
int TlsaTraits::Send(QueryWrap<TlsaTraits>* wrap, const char* name) {
929+
wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_TLSA);
930+
return ARES_SUCCESS;
931+
}
932+
864933
int TxtTraits::Send(QueryWrap<TxtTraits>* wrap, const char* name) {
865934
wrap->AresQuery(name, ARES_CLASS_IN, ARES_REC_TYPE_TXT);
866935
return ARES_SUCCESS;
@@ -1045,6 +1114,10 @@ int AnyTraits::Parse(
10451114
if (!soa_record.IsEmpty())
10461115
ret->Set(env->context(), ret->Length(), soa_record).Check();
10471116

1117+
/* Parse TLSA records */
1118+
status = ParseTlsaReply(env, buf, len, ret);
1119+
if (status != ARES_SUCCESS && status != ARES_ENODATA) return status;
1120+
10481121
/* Parse CAA records */
10491122
status = ParseCaaReply(env, buf, len, ret, true);
10501123
if (status != ARES_SUCCESS && status != ARES_ENODATA)
@@ -1219,6 +1292,27 @@ int NsTraits::Parse(
12191292
return ARES_SUCCESS;
12201293
}
12211294

1295+
int TlsaTraits::Parse(QueryTlsaWrap* wrap,
1296+
const std::unique_ptr<ResponseData>& response) {
1297+
if (response->is_host) [[unlikely]] {
1298+
return ARES_EBADRESP;
1299+
}
1300+
1301+
unsigned char* buf = response->buf.data;
1302+
int len = response->buf.size;
1303+
1304+
Environment* env = wrap->env();
1305+
HandleScope handle_scope(env->isolate());
1306+
Context::Scope context_scope(env->context());
1307+
1308+
Local<Array> tlsa_records = Array::New(env->isolate());
1309+
int status = ParseTlsaReply(env, buf, len, tlsa_records);
1310+
if (status != ARES_SUCCESS) return status;
1311+
1312+
wrap->CallOnComplete(tlsa_records);
1313+
return ARES_SUCCESS;
1314+
}
1315+
12221316
int TxtTraits::Parse(
12231317
QueryTxtWrap* wrap,
12241318
const std::unique_ptr<ResponseData>& response) {
@@ -1998,6 +2092,7 @@ void Initialize(Local<Object> target,
19982092
SetProtoMethod(isolate, channel_wrap, "queryCname", Query<QueryCnameWrap>);
19992093
SetProtoMethod(isolate, channel_wrap, "queryMx", Query<QueryMxWrap>);
20002094
SetProtoMethod(isolate, channel_wrap, "queryNs", Query<QueryNsWrap>);
2095+
SetProtoMethod(isolate, channel_wrap, "queryTlsa", Query<QueryTlsaWrap>);
20012096
SetProtoMethod(isolate, channel_wrap, "queryTxt", Query<QueryTxtWrap>);
20022097
SetProtoMethod(isolate, channel_wrap, "querySrv", Query<QuerySrvWrap>);
20032098
SetProtoMethod(isolate, channel_wrap, "queryPtr", Query<QueryPtrWrap>);
@@ -2029,6 +2124,7 @@ void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
20292124
registry->Register(Query<QueryCnameWrap>);
20302125
registry->Register(Query<QueryMxWrap>);
20312126
registry->Register(Query<QueryNsWrap>);
2127+
registry->Register(Query<QueryTlsaWrap>);
20322128
registry->Register(Query<QueryTxtWrap>);
20332129
registry->Register(Query<QuerySrvWrap>);
20342130
registry->Register(Query<QueryPtrWrap>);

‎src/cares_wrap.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,13 @@ struct NsTraits final {
460460
const std::unique_ptr<ResponseData>& response);
461461
};
462462

463+
struct TlsaTraits final {
464+
static constexpr const char* name = "resolveTlsa";
465+
static int Send(QueryWrap<TlsaTraits>* wrap, const char* name);
466+
static int Parse(QueryWrap<TlsaTraits>* wrap,
467+
const std::unique_ptr<ResponseData>& response);
468+
};
469+
463470
struct TxtTraits final {
464471
static constexpr const char* name = "resolveTxt";
465472
static int Send(QueryWrap<TxtTraits>* wrap, const char* name);
@@ -515,6 +522,7 @@ using QueryCaaWrap = QueryWrap<CaaTraits>;
515522
using QueryCnameWrap = QueryWrap<CnameTraits>;
516523
using QueryMxWrap = QueryWrap<MxTraits>;
517524
using QueryNsWrap = QueryWrap<NsTraits>;
525+
using QueryTlsaWrap = QueryWrap<TlsaTraits>;
518526
using QueryTxtWrap = QueryWrap<TxtTraits>;
519527
using QuerySrvWrap = QueryWrap<SrvTraits>;
520528
using QueryPtrWrap = QueryWrap<PtrTraits>;

‎src/env_properties.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
V(cached_data_rejected_string, "cachedDataRejected") \
9292
V(cached_data_string, "cachedData") \
9393
V(cache_key_string, "cacheKey") \
94+
V(cert_usage_string, "certUsage") \
9495
V(change_string, "change") \
9596
V(changes_string, "changes") \
9697
V(channel_string, "channel") \
@@ -135,6 +136,7 @@
135136
V(dns_ptr_string, "PTR") \
136137
V(dns_soa_string, "SOA") \
137138
V(dns_srv_string, "SRV") \
139+
V(dns_tlsa_string, "TLSA") \
138140
V(dns_txt_string, "TXT") \
139141
V(done_string, "done") \
140142
V(duration_string, "duration") \
@@ -237,6 +239,7 @@
237239
V(line_number_string, "lineNumber") \
238240
V(loop_count, "loopCount") \
239241
V(mac_string, "mac") \
242+
V(match_string, "match") \
240243
V(max_buffer_string, "maxBuffer") \
241244
V(max_concurrent_streams_string, "maxConcurrentStreams") \
242245
V(message_port_constructor_string, "MessagePort") \
@@ -336,6 +339,7 @@
336339
V(script_id_string, "scriptId") \
337340
V(script_name_string, "scriptName") \
338341
V(search_string, "search") \
342+
V(selector_string, "selector") \
339343
V(serial_number_string, "serialNumber") \
340344
V(serial_string, "serial") \
341345
V(servername_string, "servername") \

‎test/common/internet.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ const addresses = {
3838
CNAME_HOST: 'blog.nodejs.org',
3939
// A host with NS records registered
4040
NS_HOST: 'nodejs.org',
41+
// A host with TLSA records registered
42+
TLSA_HOST: '_443._tcp.fedoraproject.org',
4143
// A host with TXT records registered
4244
TXT_HOST: 'nodejs.org',
4345
// An accessible IPv4 DNS server

‎test/internet/test-dns-cares-domains.js‎

Lines changed: 1 addition & 0 deletions

0 commit comments

Comments
 (0)