v0.7.1

Author: mdecimus

CHANGELOG.md

@@ -1,13 +1,18 @@
+mail-auth 0.7.1
+================================
+- Bump `hickory-resolver`to 0.26.0-alpha.1
+- Bump `zip` to 4.0
+
 mail-auth 0.7.0
 ================================
-- Bump to `mail-parser` 0.11.
-- Bump to `hickory-resolver` 0.25.
+- Bump `mail-parser` to 0.11.
+- Bump `hickory-resolver` to 0.25.
 - Added `rkyv` support.
 - Make `zip` dependency optional.
 
 mail-auth 0.6.1
 ================================
-- Bump to `mail-parser` 0.10.0.
+- Bump `mail-parser` to 0.10.0.
 
 mail-auth 0.6.0
 ================================

Cargo.toml

@@ -1,9 +1,9 @@
 [package]
 name = "mail-auth"
 description = "DKIM, ARC, SPF and DMARC library for Rust"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
-authors = [ "Stalwart Labs <[email protected]>"]
+authors = [ "Stalwart Labs LLC <[email protected]>"]
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/stalwartlabs/mail-auth"
 homepage = "https://github.com/stalwartlabs/mail-auth"
@@ -37,8 +37,8 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha1 = { version = "0.10", features = ["oid"], optional = true }
 sha2 = { version = "0.10.6", features = ["oid"], optional = true }
-hickory-resolver = { version = "0.25", features = ["tls-ring", "dnssec-ring"] }
-zip = { version = "2.1.1", optional = true }
+hickory-resolver = { version = "=0.26.0-alpha.1", features = ["tls-ring", "dnssec-ring"] }
+zip = { version = "4.0", optional = true }
 rand = { version = "0.8.5", optional = true }
 quick_cache = "0.6.9"
 rkyv = { version = "0.8.10", optional = true }

src/common/resolver.rs

@@ -14,9 +14,9 @@ use std::{
 use hickory_resolver::{
     config::{ResolverConfig, ResolverOpts},
     name_server::TokioConnectionProvider,
-    proto::ProtoErrorKind,
+    proto::{ProtoError, ProtoErrorKind},
     system_conf::read_system_conf,
-    Name, ResolveError, ResolveErrorKind, TokioResolver,
+    Name, TokioResolver,
 };
 
 use crate::{
@@ -35,32 +35,32 @@ pub struct DnsEntry<T> {
 }
 
 impl MessageAuthenticator {
-    pub fn new_cloudflare_tls() -> Result<Self, ResolveError> {
+    pub fn new_cloudflare_tls() -> Result<Self, ProtoError> {
         Self::new(ResolverConfig::cloudflare_tls(), ResolverOpts::default())
     }
 
-    pub fn new_cloudflare() -> Result<Self, ResolveError> {
+    pub fn new_cloudflare() -> Result<Self, ProtoError> {
         Self::new(ResolverConfig::cloudflare(), ResolverOpts::default())
     }
 
-    pub fn new_google() -> Result<Self, ResolveError> {
+    pub fn new_google() -> Result<Self, ProtoError> {
         Self::new(ResolverConfig::google(), ResolverOpts::default())
     }
 
-    pub fn new_quad9() -> Result<Self, ResolveError> {
+    pub fn new_quad9() -> Result<Self, ProtoError> {
         Self::new(ResolverConfig::quad9(), ResolverOpts::default())
     }
 
-    pub fn new_quad9_tls() -> Result<Self, ResolveError> {
+    pub fn new_quad9_tls() -> Result<Self, ProtoError> {
         Self::new(ResolverConfig::quad9_tls(), ResolverOpts::default())
     }
 
-    pub fn new_system_conf() -> Result<Self, ResolveError> {
+    pub fn new_system_conf() -> Result<Self, ProtoError> {
         let (config, options) = read_system_conf()?;
         Self::new(config, options)
     }
 
-    pub fn new(config: ResolverConfig, options: ResolverOpts) -> Result<Self, ResolveError> {
+    pub fn new(config: ResolverConfig, options: ResolverOpts) -> Result<Self, ProtoError> {
         Ok(MessageAuthenticator(
             TokioResolver::builder_with_config(config, TokioConnectionProvider::default())
                 .with_options(options)
@@ -406,28 +406,19 @@ impl MessageAuthenticator {
                 )
             })),
             Err(err) => match err.kind() {
-                ResolveErrorKind::Proto(proto) => {
-                    if let ProtoErrorKind::NoRecordsFound { .. } = proto.kind() {
-                        Ok(false)
-                    } else {
-                        Err(err.into())
-                    }
-                }
+                ProtoErrorKind::NoRecordsFound { .. } => Ok(false),
                 _ => Err(err.into()),
             },
         }
     }
 }
 
-impl From<ResolveError> for Error {
-    fn from(err: ResolveError) -> Self {
+impl From<ProtoError> for Error {
+    fn from(err: ProtoError) -> Self {
         match err.kind() {
-            ResolveErrorKind::Proto(proto) => match proto.kind() {
-                ProtoErrorKind::NoRecordsFound { response_code, .. } => {
-                    Error::DnsRecordNotFound(*response_code)
-                }
-                _ => Error::DnsError(err.to_string()),
-            },
+            ProtoErrorKind::NoRecordsFound(response_code) => {
+                Error::DnsRecordNotFound(response_code.response_code)
+            }
             _ => Error::DnsError(err.to_string()),
         }
     }

src/lib.rs

@@ -10,10 +10,7 @@ use arc::Set;
 use common::{crypto::HashAlgorithm, headers::Header, verify::DomainKey};
 use dkim::{Atps, Canonicalization, DomainKeyReport};
 use dmarc::Dmarc;
-use hickory_resolver::{
-    proto::{op::ResponseCode, ProtoError},
-    TokioResolver,
-};
+use hickory_resolver::{proto::op::ResponseCode, TokioResolver};
 use mta_sts::{MtaSts, TlsRpt};
 use spf::{Macro, Spf};
 use std::{
@@ -352,12 +349,6 @@ impl From<io::Error> for Error {
     }
 }
 
-impl From<ProtoError> for Error {
-    fn from(err: ProtoError) -> Self {
-        Error::DnsError(err.to_string())
-    }
-}
-
 #[cfg(feature = "rsa")]
 impl From<rsa::errors::Error> for Error {
     fn from(err: rsa::errors::Error) -> Self {