summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorKaveh <hamidrkp@riseup.net>2024-11-07 03:19:32 +0330
committerGitHub <noreply@github.com>2024-11-06 15:49:32 -0800
commitdb53ec230d2de1b3be50230d4c00e83a03df686f (patch)
tree213a4e55fed1385ac4c0d8e48a0d5af14a37ff80 /ext
parentb3a3d84ce249ff126f92e7a0849ec0a6ce26e973 (diff)
refactor(ext/net): Use hickory dns instead of unmaintained trust-dns (#26741)
This PR replaces the unmaintained and rebranded `trust-dns` to `hickory` for resolver in `deno_net`.
Diffstat (limited to 'ext')
-rw-r--r--ext/net/Cargo.toml4
-rw-r--r--ext/net/ops.rs50
2 files changed, 27 insertions, 27 deletions
diff --git a/ext/net/Cargo.toml b/ext/net/Cargo.toml
index b22fbe7b5..61bb5701a 100644
--- a/ext/net/Cargo.toml
+++ b/ext/net/Cargo.toml
@@ -17,11 +17,11 @@ path = "lib.rs"
deno_core.workspace = true
deno_permissions.workspace = true
deno_tls.workspace = true
+hickory-proto = "0.24"
+hickory-resolver = { version = "0.24", features = ["tokio-runtime", "serde-config"] }
pin-project.workspace = true
rustls-tokio-stream.workspace = true
serde.workspace = true
socket2.workspace = true
thiserror.workspace = true
tokio.workspace = true
-trust-dns-proto = "0.23"
-trust-dns-resolver = { version = "0.23", features = ["tokio-runtime", "serde-config"] }
diff --git a/ext/net/ops.rs b/ext/net/ops.rs
index 35bcff8dc..9a8b70f0f 100644
--- a/ext/net/ops.rs
+++ b/ext/net/ops.rs
@@ -18,6 +18,16 @@ use deno_core::OpState;
use deno_core::RcRef;
use deno_core::Resource;
use deno_core::ResourceId;
+use hickory_proto::rr::rdata::caa::Value;
+use hickory_proto::rr::record_data::RData;
+use hickory_proto::rr::record_type::RecordType;
+use hickory_resolver::config::NameServerConfigGroup;
+use hickory_resolver::config::ResolverConfig;
+use hickory_resolver::config::ResolverOpts;
+use hickory_resolver::error::ResolveError;
+use hickory_resolver::error::ResolveErrorKind;
+use hickory_resolver::system_conf;
+use hickory_resolver::AsyncResolver;
use serde::Deserialize;
use serde::Serialize;
use socket2::Domain;
@@ -33,16 +43,6 @@ use std::rc::Rc;
use std::str::FromStr;
use tokio::net::TcpStream;
use tokio::net::UdpSocket;
-use trust_dns_proto::rr::rdata::caa::Value;
-use trust_dns_proto::rr::record_data::RData;
-use trust_dns_proto::rr::record_type::RecordType;
-use trust_dns_resolver::config::NameServerConfigGroup;
-use trust_dns_resolver::config::ResolverConfig;
-use trust_dns_resolver::config::ResolverOpts;
-use trust_dns_resolver::error::ResolveError;
-use trust_dns_resolver::error::ResolveErrorKind;
-use trust_dns_resolver::system_conf;
-use trust_dns_resolver::AsyncResolver;
#[derive(Serialize, Clone, Debug)]
#[serde(rename_all = "camelCase")]
@@ -828,6 +828,21 @@ mod tests {
use deno_core::JsRuntime;
use deno_core::RuntimeOptions;
use deno_permissions::PermissionCheckError;
+ use hickory_proto::rr::rdata::a::A;
+ use hickory_proto::rr::rdata::aaaa::AAAA;
+ use hickory_proto::rr::rdata::caa::KeyValue;
+ use hickory_proto::rr::rdata::caa::CAA;
+ use hickory_proto::rr::rdata::mx::MX;
+ use hickory_proto::rr::rdata::name::ANAME;
+ use hickory_proto::rr::rdata::name::CNAME;
+ use hickory_proto::rr::rdata::name::NS;
+ use hickory_proto::rr::rdata::name::PTR;
+ use hickory_proto::rr::rdata::naptr::NAPTR;
+ use hickory_proto::rr::rdata::srv::SRV;
+ use hickory_proto::rr::rdata::txt::TXT;
+ use hickory_proto::rr::rdata::SOA;
+ use hickory_proto::rr::record_data::RData;
+ use hickory_proto::rr::Name;
use socket2::SockRef;
use std::net::Ipv4Addr;
use std::net::Ipv6Addr;
@@ -836,21 +851,6 @@ mod tests {
use std::path::PathBuf;
use std::sync::Arc;
use std::sync::Mutex;
- use trust_dns_proto::rr::rdata::a::A;
- use trust_dns_proto::rr::rdata::aaaa::AAAA;
- use trust_dns_proto::rr::rdata::caa::KeyValue;
- use trust_dns_proto::rr::rdata::caa::CAA;
- use trust_dns_proto::rr::rdata::mx::MX;
- use trust_dns_proto::rr::rdata::name::ANAME;
- use trust_dns_proto::rr::rdata::name::CNAME;
- use trust_dns_proto::rr::rdata::name::NS;
- use trust_dns_proto::rr::rdata::name::PTR;
- use trust_dns_proto::rr::rdata::naptr::NAPTR;
- use trust_dns_proto::rr::rdata::srv::SRV;
- use trust_dns_proto::rr::rdata::txt::TXT;
- use trust_dns_proto::rr::rdata::SOA;
- use trust_dns_proto::rr::record_data::RData;
- use trust_dns_proto::rr::Name;
#[test]
fn rdata_to_return_record_a() {