From 9e4a931bceff7d794f1fb341599ae48ea2cae2a6 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Thu, 20 Feb 2025 20:32:42 +0100
Subject: [PATCH] Nits

---
 src/config.rs          | 61 ++++++++++++++++++++++--------------------
 src/libdoh/src/lib.rs  |  5 +---
 src/libdoh/src/odoh.rs |  2 +-
 src/libdoh/src/tls.rs  |  9 +++----
 4 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index 287cf8a..6d69671 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -240,39 +240,42 @@ pub fn parse_opts(globals: &mut Globals) {
             .or_else(|| globals.tls_cert_path.clone());
     }
 
-    if let Some(hostname) = matches.get_one::<String>("hostname") {
-        let mut builder =
-            dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string());
-        if let Some(public_address) = matches.get_one::<String>("public_address") {
-            builder = builder.with_address(public_address.to_string());
-        }
-        if let Some(public_port) = matches.get_one::<String>("public_port") {
-            let public_port = public_port.parse().expect("Invalid public port");
-            builder = builder.with_port(public_port);
-        }
-        println!(
-            "Test DNS stamp to reach [{}] over DoH: [{}]\n",
-            hostname,
-            builder.serialize().unwrap()
-        );
+    match matches.get_one::<String>("hostname") {
+        Some(hostname) => {
+            let mut builder =
+                dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string());
+            if let Some(public_address) = matches.get_one::<String>("public_address") {
+                builder = builder.with_address(public_address.to_string());
+            }
+            if let Some(public_port) = matches.get_one::<String>("public_port") {
+                let public_port = public_port.parse().expect("Invalid public port");
+                builder = builder.with_port(public_port);
+            }
+            println!(
+                "Test DNS stamp to reach [{}] over DoH: [{}]\n",
+                hostname,
+                builder.serialize().unwrap()
+            );
 
-        let mut builder =
-            dnsstamps::ODoHTargetBuilder::new(hostname.to_string(), globals.path.to_string());
-        if let Some(public_port) = matches.get_one::<String>("public_port") {
-            let public_port = public_port.parse().expect("Invalid public port");
-            builder = builder.with_port(public_port);
-        }
-        println!(
-            "Test DNS stamp to reach [{}] over Oblivious DoH: [{}]\n",
-            hostname,
-            builder.serialize().unwrap()
-        );
+            let mut builder =
+                dnsstamps::ODoHTargetBuilder::new(hostname.to_string(), globals.path.to_string());
+            if let Some(public_port) = matches.get_one::<String>("public_port") {
+                let public_port = public_port.parse().expect("Invalid public port");
+                builder = builder.with_port(public_port);
+            }
+            println!(
+                "Test DNS stamp to reach [{}] over Oblivious DoH: [{}]\n",
+                hostname,
+                builder.serialize().unwrap()
+            );
 
-        println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamps.\n")
-    } else {
-        println!(
+            println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamps.\n")
+        }
+        _ => {
+            println!(
             "Please provide a fully qualified hostname (-H <hostname> command-line option) to get \
              test DNS stamps for your server.\n"
         );
+        }
     }
 }
diff --git a/src/libdoh/src/lib.rs b/src/libdoh/src/lib.rs
index 4b6eea8..e6dd729 100644
--- a/src/libdoh/src/lib.rs
+++ b/src/libdoh/src/lib.rs
@@ -257,10 +257,7 @@ impl DoH {
         content_types: &[&'static str],
     ) -> Option<&'static str> {
         let accept = headers.get(hyper::header::ACCEPT);
-        let accept = match accept {
-            None => return None,
-            Some(accept) => accept,
-        };
+        let accept = accept?;
         for part in accept.to_str().unwrap_or("").split(',').map(|s| s.trim()) {
             if let Some(found) = part
                 .split(';')
diff --git a/src/libdoh/src/odoh.rs b/src/libdoh/src/odoh.rs
index 00bb95f..3f2c29e 100644
--- a/src/libdoh/src/odoh.rs
+++ b/src/libdoh/src/odoh.rs
@@ -77,7 +77,7 @@ impl ODoHPublicKey {
 
 impl ODoHQueryContext {
     pub fn encrypt_response(self, response_body: Vec<u8>) -> Result<Vec<u8>, DoHError> {
-        let response_nonce = rand::thread_rng().gen::<ResponseNonce>();
+        let response_nonce = rand::thread_rng().r#gen::<ResponseNonce>();
         let response_body_ = ObliviousDoHMessagePlaintext::new(response_body, 0);
         let encrypted_response = odoh_rs::encrypt_response(
             &self.query,
diff --git a/src/libdoh/src/tls.rs b/src/libdoh/src/tls.rs
index 7047f99..7c5509f 100644
--- a/src/libdoh/src/tls.rs
+++ b/src/libdoh/src/tls.rs
@@ -87,12 +87,9 @@ where
             let server_config_builder = ServerConfig::builder()
                 .with_safe_defaults()
                 .with_no_client_auth();
-            if let Ok(found_config) =
-                server_config_builder.with_single_cert(certs.clone(), certs_key)
-            {
-                Some(found_config)
-            } else {
-                None
+            match server_config_builder.with_single_cert(certs.clone(), certs_key) {
+                Ok(found_config) => Some(found_config),
+                _ => None,
             }
         })
         .ok_or_else(|| {