feat: make iroh-relay server work without default crypto provider

Author: Frando

Cargo.lock

@@ -46,3 +46,4 @@ portmapper = { git = "https://github.com/n0-computer/net-tools", branch = "main"
 noq = { git = "https://github.com/n0-computer/noq", branch = "main" }
 noq-udp = { git = "https://github.com/n0-computer/noq", branch = "main" }
 noq-proto = { git = "https://github.com/n0-computer/noq", branch = "main" }
+tokio-rustls-acme = { git = "https://github.com/n0-computer/tokio-rustls-acme", branch = "Frando/crypto-provider"}

Cargo.toml

@@ -18,6 +18,7 @@ use iroh_relay::{
         DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT, DEFAULT_METRICS_PORT, DEFAULT_RELAY_QUIC_PORT,
     },
     server::{self as relay, ClientRateLimit, QuicConfig},
+    tls::CaRootsConfig,
 };
 use n0_error::{Result, StdResultExt, bail_any};
 use n0_future::FutureExt;
@@ -496,14 +497,6 @@ async fn main() -> Result<()> {
         .with(EnvFilter::from_default_env())
         .init();
 
-    // Install `ring` as default crypto provider for rustls.
-    // `ring` is enabled by the `tls-ring` feature, which is included in the `server`
-    // feature, which is required for the main.rs binary.
-    // Therefore, this does not need any feature flags.
-    rustls::crypto::ring::default_provider()
-        .install_default()
-        .expect("failed to set default crypto provider");
-
     let cli = Cli::parse();
     let mut cfg = Config::load(&cli).await?;
     if cfg.enable_quic_addr_discovery && cfg.tls.is_none() {
@@ -542,12 +535,11 @@ async fn maybe_load_tls(
     let Some(ref tls) = cfg.tls else {
         return Ok(None);
     };
-    let server_config = rustls::ServerConfig::builder_with_provider(std::sync::Arc::new(
-        rustls::crypto::ring::default_provider(),
-    ))
-    .with_safe_default_protocol_versions()
-    .expect("protocols supported by ring")
-    .with_no_client_auth();
+    let crypto_provider = Arc::new(rustls::crypto::ring::default_provider());
+    let server_config = rustls::ServerConfig::builder_with_provider(crypto_provider.clone())
+        .with_safe_default_protocol_versions()
+        .expect("protocols supported by ring")
+        .with_no_client_auth();
     let (cert_config, server_config) = match tls.cert_mode {
         CertMode::Manual => {
             let cert_path = tls.cert_path();
@@ -574,10 +566,14 @@ async fn maybe_load_tls(
                 .contact
                 .clone()
                 .std_context("LetsEncrypt needs a contact email")?;
-            let config = AcmeConfig::new(vec![hostname.clone()])
-                .contact([format!("mailto:{contact}")])
-                .cache_option(Some(DirCache::new(tls.cert_dir())))
-                .directory_lets_encrypt(tls.prod_tls);
+            let client_config = CaRootsConfig::default().client_config(crypto_provider.clone())?;
+            let config = AcmeConfig::new_with_client_tls_config(
+                vec![hostname.clone()],
+                Arc::new(client_config),
+            )
+            .contact([format!("mailto:{contact}")])
+            .cache_option(Some(DirCache::new(tls.cert_dir())))
+            .directory_lets_encrypt(tls.prod_tls);
             let state = config.state();
             let resolver = state.resolver().clone();
             let server_config = server_config.with_cert_resolver(resolver);
@@ -626,6 +622,7 @@ async fn maybe_load_tls(
         cert: cert_config,
         server_config,
         quic_bind_addr: tls.quic_bind_addr(cfg),
+        crypto_provider,
     }))
 }
 

iroh-relay/src/main.rs

@@ -28,6 +28,7 @@ use iroh_base::EndpointId;
 use iroh_base::RelayUrl;
 use n0_error::{e, stack_error};
 use n0_future::{StreamExt, future::Boxed};
+use rustls::crypto::CryptoProvider;
 use serde::Serialize;
 use tokio::{
     net::TcpListener,
@@ -194,6 +195,8 @@ pub struct TlsConfig<EC: fmt::Debug, EA: fmt::Debug = EC> {
     pub cert: CertConfig<EC, EA>,
     /// The server configuration.
     pub server_config: rustls::ServerConfig,
+    /// The rustls crypto provider to use for all crypto.
+    pub crypto_provider: Arc<CryptoProvider>,
 }
 
 /// Rate limits.
@@ -391,8 +394,11 @@ impl Server {
                     Some(tls_config) => {
                         let server_tls_config = match tls_config.cert {
                             CertConfig::LetsEncrypt { mut state } => {
-                                let acceptor =
-                                    http_server::TlsAcceptor::LetsEncrypt(state.acceptor());
+                                let acceptor = http_server::TlsAcceptor::LetsEncrypt(
+                                    state.acceptor_with_crypto_provider(
+                                        tls_config.crypto_provider.clone(),
+                                    ),
+                                );
                                 tasks.spawn(
                                     async move {
                                         while let Some(event) = state.next().await {

iroh-relay/src/server.rs

@@ -1,5 +1,5 @@
 //! Exposes functions to quickly configure a server suitable for testing.
-use std::net::Ipv4Addr;
+use std::{net::Ipv4Addr, sync::Arc};
 
 use super::{AccessConfig, CertConfig, QuicConfig, RelayConfig, ServerConfig, TlsConfig};
 
@@ -44,6 +44,7 @@ pub fn tls_config() -> TlsConfig<()> {
         cert: CertConfig::<(), ()>::Manual { certs },
         https_bind_addr: (Ipv4Addr::LOCALHOST, 0).into(),
         quic_bind_addr: (Ipv4Addr::UNSPECIFIED, 0).into(),
+        crypto_provider: Arc::new(rustls::crypto::ring::default_provider()),
     }
 }
 

iroh-relay/src/server/testing.rs

@@ -1,5 +1,5 @@
 //! Internal utilities to support testing.
-use std::net::Ipv4Addr;
+use std::{net::Ipv4Addr, sync::Arc};
 
 use iroh_base::RelayUrl;
 use iroh_relay::{
@@ -49,6 +49,7 @@ pub async fn run_relay_server_with(quic: bool) -> Result<(RelayMap, RelayUrl, Se
         https_bind_addr: (Ipv4Addr::LOCALHOST, 0).into(),
         quic_bind_addr: (Ipv4Addr::LOCALHOST, 0).into(),
         server_config,
+        crypto_provider: Arc::new(rustls::crypto::ring::default_provider()),
     };
     let quic = if quic {
         Some(QuicConfig {

iroh/src/test_utils.rs

@@ -396,7 +396,10 @@ fn addr_relay_only(addr: EndpointAddr) -> EndpointAddr {
 }
 
 mod relay {
-    use std::net::{IpAddr, Ipv6Addr};
+    use std::{
+        net::{IpAddr, Ipv6Addr},
+        sync::Arc,
+    };
 
     use iroh_base::RelayUrl;
     use iroh_relay::{
@@ -423,6 +426,7 @@ mod relay {
             https_bind_addr: (bind_ip, 443).into(),
             quic_bind_addr: (bind_ip, 7842).into(),
             server_config,
+            crypto_provider: Arc::new(rustls::crypto::ring::default_provider()),
         };
         let quic = Some(QuicConfig {
             server_config: tls.server_config.clone(),