From 0403de66f16544281d648482d7a9a3ac9cbbd873 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 6 Mar 2021 22:21:19 +0100
Subject: [PATCH] Compute a preliminary stamp

---
 Cargo.toml            |  1 +
 src/config.rs         | 32 +++++++++++++++++++++++++++++++-
 src/libdoh/Cargo.toml |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 851ee39..003944d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,6 +18,7 @@ tls = ["libdoh/tls"]
 [dependencies]
 libdoh = { path = "src/libdoh", version = "0.3.8", default-features = false }
 clap = "2.33.3"
+dnsstamps = "0.1.5"
 jemallocator = "0.3.2"
 
 [package.metadata.deb]
diff --git a/src/config.rs b/src/config.rs
index 551ef8a..34b7f9a 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -21,6 +21,20 @@ pub fn parse_opts(globals: &mut Globals) {
 
     let _ = include_str!("../Cargo.toml");
     let options = app_from_crate!()
+        .arg(
+            Arg::with_name("hostname")
+                .short("H")
+                .long("hostname")
+                .takes_value(true)
+                .help("Host name (not IP address) DoH clients will use to connect"),
+        )
+        .arg(
+            Arg::with_name("public_address")
+                .short("g")
+                .long("public-address")
+                .takes_value(true)
+                .help("External IP address DoH clients will connect to"),
+        )
         .arg(
             Arg::with_name("listen_address")
                 .short("l")
@@ -123,7 +137,9 @@ pub fn parse_opts(globals: &mut Globals) {
                 .short("i")
                 .long("tls-cert-path")
                 .takes_value(true)
-                .help("Path to the PEM-encoded certificates (only required for built-in TLS)"),
+                .help(
+                    "Path to the PEM/PKCS#8-encoded certificates (only required for built-in TLS)",
+                ),
         )
         .arg(
             Arg::with_name("tls_cert_key_path")
@@ -176,4 +192,18 @@ pub fn parse_opts(globals: &mut Globals) {
             .map(PathBuf::from)
             .or_else(|| globals.tls_cert_path.clone());
     }
+
+    if let Some(hostname) = matches.value_of("hostname") {
+        let mut builder =
+            dnsstamps::DoHBuilder::new(hostname.to_string(), globals.path.to_string());
+        if let Some(public_address) = matches.value_of("public_address") {
+            builder = builder.with_address(public_address.to_string());
+        }
+        println!(
+            "Test DNS stamp to reach [{}]: [{}]",
+            hostname,
+            builder.serialize().unwrap()
+        );
+        println!("Check out https://dnscrypt.info/stamps/ to compute the actual stamp.\n")
+    }
 }
diff --git a/src/libdoh/Cargo.toml b/src/libdoh/Cargo.toml
index cdc845f..be30591 100644
--- a/src/libdoh/Cargo.toml
+++ b/src/libdoh/Cargo.toml
@@ -18,7 +18,7 @@ tls = ["tokio-rustls"]
 anyhow = "1.0.38"
 byteorder = "1.4.2"
 base64 = "0.13.0"
-futures = "0.3.12"
+futures = "0.3.13"
 hyper = { version = "0.14.4", default-features = false, features = ["server", "http1", "http2", "stream"] }
 tokio = { version = "1.2.0", features = ["net", "rt-multi-thread", "parking_lot", "time", "sync"] }
 tokio-rustls = { version = "0.22.0", features = ["early-data"], optional = true }