Skip to content

Commit

Permalink
Upgrade trust-dns-resolver -> hickory-resolver (#1263)
Browse files Browse the repository at this point in the history
  • Loading branch information
svix-jplatte authored Mar 11, 2024
1 parent bc42ee7 commit f1fd0a9
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 70 deletions.
110 changes: 49 additions & 61 deletions server/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/svix-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jsonschema = "0.17.1"
aide = { version = "0.12.0", features = ["axum", "redoc", "macros", "axum-headers"] }
schemars = { version = "0.8.11", features = ["chrono", "url", "preserve_order"] }
indexmap = "1.9.2"
trust-dns-resolver = "0.22.0"
hickory-resolver = "0.24.0"
ipnet = { version = "2.5", features = ["serde"] }
urlencoding = "2.1.2"
form_urlencoded = "1.1.0"
Expand Down
14 changes: 6 additions & 8 deletions server/svix-server/src/core/webhook_http_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ use std::{
use axum::headers::{authorization::Credentials, Authorization};
use bytes::Bytes;
use futures::{future::BoxFuture, FutureExt};
use hickory_resolver::{
error::ResolveError, lookup_ip::LookupIpIntoIter, AsyncResolver, TokioAsyncResolver,
};
use http::header::HeaderName;
use http::{HeaderMap, HeaderValue, Method, Response, StatusCode, Version};
use hyper::{
Expand All @@ -26,10 +29,6 @@ use serde::Serialize;
use thiserror::Error;
use tokio::sync::Mutex;
use tower::Service;
use trust_dns_resolver::{
error::ResolveError, lookup_ip::LookupIpIntoIter, AsyncResolver, TokioConnection,
TokioConnectionProvider, TokioHandle,
};

pub type CaseSensitiveHeaderMap = HashMap<String, HeaderValue>;

Expand Down Expand Up @@ -461,7 +460,7 @@ struct NonLocalDnsResolver {
#[derive(Clone, Debug)]
enum DnsState {
Init,
Ready(Arc<AsyncResolver<TokioConnection, TokioConnectionProvider>>),
Ready(Arc<TokioAsyncResolver>),
}

impl NonLocalDnsResolver {
Expand Down Expand Up @@ -556,9 +555,8 @@ impl Iterator for SocketAddrs {
}
}

async fn new_resolver(
) -> Result<Arc<AsyncResolver<TokioConnection, TokioConnectionProvider>>, ResolveError> {
Ok(Arc::new(AsyncResolver::from_system_conf(TokioHandle)?))
async fn new_resolver() -> Result<Arc<TokioAsyncResolver>, ResolveError> {
Ok(Arc::new(AsyncResolver::tokio_from_system_conf()?))
}

fn is_allowed(addr: IpAddr) -> bool {
Expand Down

0 comments on commit f1fd0a9

Please sign in to comment.