filip/Stalwart
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bump to hickory-resolver 0.26

Browse Source
This commit is contained in:
mdecimus
2025-06-03 11:56:53 +02:00
parent fb1b95bb2a
commit acba129cd6
12 changed files with 52 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/cli/Cargo.toml
View File

@@ -29,4 +29,4 @@ human-size = "0.4.2"
futures = "0.3.28"
pwhash = "1.0.0"
rand = "0.9.0"
mail-auth = { version = "0.7" }
mail-auth = { version = "0.7.1" }

4
crates/common/Cargo.toml
View File

@@ -15,7 +15,7 @@ imap_proto = { path = "../imap-proto" }
sieve-rs = { version = "0.7", features = ["rkyv", "serde"] }
mail-parser = { version = "0.11", features = ["full_encoding"] }
mail-builder = { version = "0.4" }
mail-auth = { version = "0.7" }
mail-auth = { version = "0.7.1" }
mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] }
smtp-proto = { version = "0.1", features = ["rkyv"] }
dns-update = { version = "0.1" }
@@ -57,7 +57,7 @@ unicode-security = "0.1.0"
infer = "0.19"
bincode = { version = "2.0", features = ["serde"] }
hostname = "0.4.0"
zip = "3.0"
zip = "4.0"
pwhash = "1.0.0"
xxhash-rust = { version = "0.8.5", features = ["xxh3"] }
psl = "2"

17
crates/common/src/config/smtp/resolver.rs
View File

@@ -15,9 +15,8 @@ use mail_auth::{
MessageAuthenticator,
hickory_resolver::{
TokioResolver,
config::{NameServerConfig, ResolverConfig, ResolverOpts},
config::{NameServerConfig, ProtocolConfig, ResolverConfig, ResolverOpts},
name_server::TokioConnectionProvider,
proto::xfer::Protocol,
system_conf::read_system_conf,
},
};
@@ -119,7 +118,7 @@ impl Resolvers {
})
.unwrap_or_else(|_| (ResolverConfig::cloudflare(), ResolverOpts::default())),
"custom" => {
let mut resolver_config = ResolverConfig::new();
let mut resolver_config = ResolverConfig::default();
for url in config
.values("resolver.custom")
.map(|(_, v)| v.to_string())
@@ -131,21 +130,23 @@ impl Resolvers {
{
(
match proto.as_str() {
"udp" => Protocol::Udp,
"tcp" => Protocol::Tcp,
"tls" => Protocol::Tls,
"udp" => ProtocolConfig::Udp,
"tcp" => ProtocolConfig::Tcp,
"tls" => ProtocolConfig::Tls {
server_name: host.clone().into(),
},
_ => {
config.new_parse_error(
"resolver.custom",
format!("Invalid custom resolver protocol {url:?}"),
);
Protocol::Udp
ProtocolConfig::Udp
}
},
host.to_string(),
)
} else {
(Protocol::Udp, url)
(ProtocolConfig::Udp, url)
};
let (host, port) = if let Some(host) = host.strip_prefix('[') {

2
crates/http/Cargo.toml
View File

@@ -22,7 +22,7 @@ services = { path = "../services" }
smtp-proto = { version = "0.1" }
mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] }
mail-builder = { version = "0.4" }
mail-auth = { version = "0.7", features = ["generate"] }
mail-auth = { version = "0.7.1", features = ["generate"] }
mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] }
tokio = { version = "1.45", features = ["rt"] }
hyper = { version = "1.0.1", features = ["server", "http1", "http2"] }

2
crates/jmap/Cargo.toml
View File

@@ -21,7 +21,7 @@ smtp-proto = { version = "0.1" }
mail-parser = { version = "0.11", features = ["full_encoding", "rkyv"] }
mail-builder = { version = "0.4" }
mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] }
mail-auth = { version = "0.7", features = ["generate"] }
mail-auth = { version = "0.7.1", features = ["generate"] }
sieve-rs = { version = "0.7", features = ["rkyv"] }
serde = { version = "1.0", features = ["derive"]}
serde_json = "1.0"

2
crates/migration/Cargo.toml
View File

@@ -15,7 +15,7 @@ email = { path = "../email" }
directory = { path = "../directory" }
smtp = { path = "../smtp" }
mail-parser = { version = "0.11", features = ["full_encoding"] }
mail-auth = { version = "0.7", features = ["rkyv"] }
mail-auth = { version = "0.7.1", features = ["rkyv"] }
sieve-rs = { version = "0.7", features = ["rkyv"] }
tokio = { version = "1.45", features = ["net", "macros"] }
serde = { version = "1.0", features = ["derive"]}

2
crates/smtp/Cargo.toml
View File

@@ -20,7 +20,7 @@ common = { path = "../common" }
email = { path = "../email" }
spam-filter = { path = "../spam-filter" }
trc = { path = "../trc" }
mail-auth = { version = "0.7", features = ["rkyv"] }
mail-auth = { version = "0.7.1", features = ["rkyv"] }
mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] }
mail-parser = { version = "0.11", features = ["full_encoding"] }
mail-builder = { version = "0.4" }

2
crates/spam-filter/Cargo.toml
View File

@@ -13,7 +13,7 @@ common = { path = "../common" }
smtp-proto = { version = "0.1", features = ["rkyv"] }
mail-parser = { version = "0.11", features = ["full_encoding"] }
mail-builder = { version = "0.4" }
mail-auth = { version = "0.7" }
mail-auth = { version = "0.7.1" }
mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] }
tokio = { version = "1.45", features = ["net", "macros"] }
psl = "2"

2
crates/trc/Cargo.toml
View File

@@ -6,7 +6,7 @@ resolver = "2"
[dependencies]
event_macro = { path = "./event-macro" }
mail-auth = { version = "0.7" }
mail-auth = { version = "0.7.1" }
mail-parser = { version = "0.11", features = ["full_encoding"] }
base64 = "0.22.1"
serde = "1.0"

2
crates/utils/Cargo.toml
View File

@@ -12,7 +12,7 @@ rustls-pki-types = { version = "1" }
tokio = { version = "1.45", features = ["net", "macros", "signal"] }
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "tls12"] }
serde = { version = "1.0", features = ["derive"]}
mail-auth = { version = "0.7" }
mail-auth = { version = "0.7.1" }
smtp-proto = { version = "0.1" }
mail-send = { version = "0.5", default-features = false, features = ["cram-md5", "ring", "tls12"] }
ahash = { version = "0.8", features = ["serde"] }