Merge branch 'main' into workspace_dependency_table

bin/Cargo.toml

@@ -2,9 +2,10 @@
 name = "trust-dns"
 version = "0.22.0"
 authors = ["Benjamin Fry <benjaminfry@me.com>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64.0"
 
+
 # A short blurb about the package. This is not rendered in any format when
 # uploaded to crates.io (aka this is not markdown)
 description = """

bin/src/trust-dns.rs

@@ -577,11 +577,18 @@ fn config_https(
     }
 
     for https_listener in &https_sockaddrs {
-        info!(
-            "loading cert for DNS over TLS named {} from {:?}",
-            tls_cert_config.get_endpoint_name(),
-            tls_cert_config.get_path()
-        );
+        if let Some(endpoint_name) = tls_cert_config.get_endpoint_name() {
+            info!(
+                "loading cert for DNS over TLS named {} from {:?}",
+                endpoint_name,
+                tls_cert_config.get_path()
+            );
+        } else {
+            info!(
+                "loading cert for DNS over TLS from {:?}",
+                tls_cert_config.get_path()
+            );
+        }
         // TODO: see about modifying native_tls to impl Clone for Pkcs12
         let tls_cert = dnssec::load_cert(zone_dir, tls_cert_config)
             .expect("error loading tls certificate file");
@@ -605,7 +612,7 @@ fn config_https(
                 https_listener,
                 config.get_tcp_request_timeout(),
                 tls_cert,
-                tls_cert_config.get_endpoint_name().to_string(),
+                tls_cert_config.get_endpoint_name().map(|s| s.to_string()),
             )
             .expect("could not register HTTPS listener");
     }
@@ -636,11 +643,18 @@ fn config_quic(
     }
 
     for quic_listener in &quic_sockaddrs {
-        info!(
-            "loading cert for DNS over TLS named {} from {:?}",
-            tls_cert_config.get_endpoint_name(),
-            tls_cert_config.get_path()
-        );
+        if let Some(endpoint_name) = tls_cert_config.get_endpoint_name() {
+            info!(
+                "loading cert for DNS over QUIC named {} from {:?}",
+                endpoint_name,
+                tls_cert_config.get_path()
+            );
+        } else {
+            info!(
+                "loading cert for DNS over QUIC from {:?}",
+                tls_cert_config.get_path()
+            );
+        }
         // TODO: see about modifying native_tls to impl Clone for Pkcs12
         let tls_cert = dnssec::load_cert(zone_dir, tls_cert_config)
             .expect("error loading tls certificate file");
@@ -664,7 +678,7 @@ fn config_quic(
                 quic_listener,
                 config.get_tcp_request_timeout(),
                 tls_cert,
-                tls_cert_config.get_endpoint_name().to_string(),
+                tls_cert_config.get_endpoint_name().map(|s| s.to_string()),
             )
             .expect("could not register QUIC listener");
     }

crates/async-std-resolver/Cargo.toml

@@ -2,7 +2,7 @@
 name = "async-std-resolver"
 version = "0.22.0"
 authors = ["Benjamin Fry <benjaminfry@me.com>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64.0"
 
 # A short blurb about the package. This is not rendered in any format when

crates/client/Cargo.toml

@@ -2,7 +2,7 @@
 name = "trust-dns-client"
 version = "0.22.0"
 authors = ["Benjamin Fry <benjaminfry@me.com>"]
-edition = "2018"
+edition = "2021"
 rust-version = "1.64.0"
 
 # A short blurb about the package. This is not rendered in any format when

crates/proto/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "trust-dns-proto"
 version = "0.22.0"
-edition = "2018"
+edition = "2021"
 rust-version = "1.64.0"
 authors = ["Benjamin Fry <benjaminfry@me.com>"]
 

crates/proto/src/https/https_client_stream.rs

@@ -5,7 +5,6 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-use std::convert::TryInto;
 use std::fmt::{self, Display};
 use std::future::Future;
 use std::io;

crates/proto/src/https/https_server.rs

@@ -7,7 +7,6 @@
 
 //! HTTPS related server items
 
-use std::borrow::Borrow;
 use std::fmt::Debug;
 use std::str::FromStr;
 use std::sync::Arc;
@@ -26,15 +25,15 @@ use crate::https::HttpsError;
 /// To allow downstream clients to do something interesting with the lifetime of the bytes, this doesn't
 ///   perform a conversion to a Message, only collects all the bytes.
 pub async fn message_from<R>(
-    this_server_name: Arc<str>,
+    this_server_name: Option<Arc<str>>,
     request: Request<R>,
 ) -> Result<BytesMut, HttpsError>
 where
     R: Stream<Item = Result<Bytes, h2::Error>> + 'static + Send + Debug + Unpin,
 {
     debug!("Received request: {:#?}", request);
 
-    let this_server_name = this_server_name.borrow();
+    let this_server_name = this_server_name.as_deref();
     match crate::https::request::verify(this_server_name, &request) {
         Ok(_) => (),
         Err(err) => return Err(err),
@@ -127,7 +126,7 @@ mod tests {
         let request = request::new("ns.example.com", len).unwrap();
         let request = request.map(|()| stream);
 
-        let from_post = message_from(Arc::from("ns.example.com"), request);
+        let from_post = message_from(Some(Arc::from("ns.example.com")), request);
         let bytes = match block_on(from_post) {
             Ok(bytes) => bytes,
             e => panic!("{:#?}", e),

crates/proto/src/https/request.rs

@@ -66,7 +66,7 @@ pub fn new(name_server_name: &str, message_len: usize) -> HttpsResult<Request<()
 }
 
 /// Verifies the request is something we know what to deal with
-pub fn verify<T>(name_server: &str, request: &Request<T>) -> HttpsResult<()> {
+pub fn verify<T>(name_server: Option<&str>, request: &Request<T>) -> HttpsResult<()> {
     // Verify all HTTP parameters
     let uri = request.uri();
 
@@ -86,12 +86,14 @@ pub fn verify<T>(name_server: &str, request: &Request<T>) -> HttpsResult<()> {
     }
 
     // the authority must match our nameserver name
-    if let Some(authority) = uri.authority() {
-        if authority.host() != name_server {
-            return Err("incorrect authority".into());
+    if let Some(name_server) = name_server {
+        if let Some(authority) = uri.authority() {
+            if authority.host() != name_server {
+                return Err("incorrect authority".into());
+            }
+        } else {
+            return Err("no authority in HTTPS request".into());
         }
-    } else {
-        return Err("no authority in HTTPS request".into());
     }
 
     // TODO: switch to mime::APPLICATION_DNS when that stabilizes
@@ -150,6 +152,6 @@ mod tests {
     #[test]
     fn test_new_verify() {
         let request = new("ns.example.com", 512).expect("error converting to http");
-        assert!(verify("ns.example.com", &request).is_ok());
+        assert!(verify(Some("ns.example.com"), &request).is_ok());
     }
 }

crates/proto/src/op/op_code.rs

@@ -60,7 +60,6 @@ impl fmt::Display for OpCode {
 /// Convert from `OpCode` to `u8`
 ///
 /// ```
-/// use std::convert::From;
 /// use trust_dns_proto::op::op_code::OpCode;
 ///
 /// let var: u8 = From::from(OpCode::Query);
@@ -86,7 +85,6 @@ impl From<OpCode> for u8 {
 /// Convert from `u8` to `OpCode`
 ///
 /// ```
-/// use std::convert::From;
 /// use trust_dns_proto::op::op_code::OpCode;
 ///
 /// let var: OpCode = OpCode::from_u8(0).unwrap();

crates/proto/src/op/response_code.rs

@@ -197,7 +197,6 @@ impl Display for ResponseCode {
 /// Convert from `ResponseCode` to `u16`
 ///
 /// ```
-/// use std::convert::From;
 /// use trust_dns_proto::op::response_code::ResponseCode;
 ///
 /// let var: ResponseCode = From::from(0);
@@ -242,7 +241,6 @@ impl From<ResponseCode> for u16 {
 /// Convert from `u16` to `ResponseCode`
 ///
 /// ```
-/// use std::convert::From;
 /// use trust_dns_proto::op::response_code::ResponseCode;
 ///
 /// let var: u16 = From::from(ResponseCode::NoError);

crates/proto/src/quic/quic_stream.rs

@@ -5,8 +5,6 @@
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 
-use std::convert::{TryFrom, TryInto};
-
 use bytes::{Bytes, BytesMut};
 use quinn::{RecvStream, SendStream, VarInt};
 use tracing::debug;

crates/proto/src/rr/dns_class.rs

@@ -9,9 +9,7 @@
 #![allow(clippy::use_self)]
 
 use std::cmp::Ordering;
-use std::convert::From;
-use std::fmt;
-use std::fmt::{Display, Formatter};
+use std::fmt::{self, Display, Formatter};
 use std::str::FromStr;
 
 #[cfg(feature = "serde-config")]

crates/proto/src/rr/dnssec/rdata/tsig.rs

@@ -8,7 +8,6 @@
 //! TSIG for secret key authentication of transaction
 #![allow(clippy::use_self)]
 
-use std::convert::TryInto;
 use std::fmt;
 
 #[cfg(feature = "serde-config")]

crates/proto/src/rr/dnssec/supported_algorithm.rs

@@ -16,9 +16,7 @@
 
 //! bitmap for expressing the set of supported algorithms in edns.
 
-use std::convert::From;
-use std::fmt;
-use std::fmt::{Display, Formatter};
+use std::fmt::{self, Display, Formatter};
 
 #[cfg(feature = "serde-config")]
 use serde::{Deserialize, Serialize};