Merge branch 'main' into blobs-1g-test

Author: rklaehn

Cargo.lock

@@ -58,8 +58,6 @@ quinn = { package = "iroh-quinn", version = "0.12", features = ["ring"] }
 rand = "0.8"
 range-collections = "0.4.0"
 redb = { version = "2.2.0", optional = true }
-redb_v1 = { package = "redb", version = "1.5.1", optional = true }
-ref-cast = { version = "1.0.23", optional = true }
 reflink-copy = { version = "0.1.8", optional = true }
 self_cell = "1.0.1"
 serde = { version = "1", features = ["derive"] }
@@ -88,7 +86,7 @@ serde_test = "1.0.176"
 testresult = "0.4.0"
 tokio = { version = "1", features = ["macros", "test-util"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-rcgen = "0.12"
+rcgen = "0.13"
 rustls = { version = "0.23", default-features = false, features = ["ring"] }
 tempfile = "3.10.0"
 futures-util = "0.3.30"
@@ -98,7 +96,7 @@ testdir = "0.9.1"
 default = ["fs-store", "net_protocol"]
 downloader = ["dep:parking_lot", "tokio-util/time", "dep:hashlink"]
 net_protocol = ["downloader", "dep:futures-util"]
-fs-store = ["dep:reflink-copy", "redb", "dep:redb_v1", "dep:tempfile"]
+fs-store = ["dep:reflink-copy", "redb", "dep:tempfile"]
 metrics = ["iroh-metrics/metrics"]
 redb = ["dep:redb"]
 cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console"]
@@ -108,7 +106,6 @@ rpc = [
     "dep:nested_enum_utils",
     "dep:strum",
     "dep:futures-util",
-    "dep:ref-cast",
     "dep:portable-atomic",
     "dep:walkdir",
     "downloader",

Cargo.toml

@@ -34,6 +34,7 @@ license-files = [
 ignore = [
       "RUSTSEC-2024-0370", # unmaintained, no upgrade available
       "RUSTSEC-2024-0384", # unmaintained, no upgrade available
+      "RUSTSEC-2024-0421", # we store dns packets by key, and don't do anything else with them. Todo: remove 
 ]
 
 [sources]

deny.toml

@@ -3,6 +3,7 @@ use std::{path::PathBuf, sync::Arc};
 
 use anyhow::{bail, Context, Result};
 use quinn::crypto::rustls::{QuicClientConfig, QuicServerConfig};
+use rustls::pki_types::{CertificateDer, PrivatePkcs8KeyDer};
 use tokio::fs;
 
 pub const EXAMPLE_ALPN: &[u8] = b"n0/iroh/examples/bytes/0";
@@ -40,22 +41,19 @@ pub async fn make_and_write_certs() -> Result<(
     let key_path = path.join("key.der");
     let cert_path = path.join("cert.der");
 
-    let key = cert.serialize_private_key_der();
-    let cert = cert.serialize_der().unwrap();
+    let key = PrivatePkcs8KeyDer::from(cert.key_pair.serialize_der());
+    let cert: CertificateDer = cert.cert.into();
     tokio::fs::create_dir_all(path)
         .await
         .context("failed to create certificate directory")?;
     tokio::fs::write(cert_path, &cert)
         .await
         .context("failed to write certificate")?;
-    tokio::fs::write(key_path, &key)
+    tokio::fs::write(key_path, key.secret_pkcs8_der())
         .await
         .context("failed to write private key")?;
 
-    Ok((
-        rustls::pki_types::PrivateKeyDer::try_from(key).unwrap(),
-        rustls::pki_types::CertificateDer::from(cert),
-    ))
+    Ok((rustls::pki_types::PrivateKeyDer::from(key), cert))
 }
 
 // derived from `quinn/examples/client.rs`

examples/connect/mod.rs

@@ -87,7 +87,6 @@ use smallvec::SmallVec;
 use tokio::io::AsyncWriteExt;
 use tracing::trace_span;
 
-mod migrate_redb_v1_v2;
 mod tables;
 #[doc(hidden)]
 pub mod test_support;
@@ -1510,7 +1509,9 @@ impl Actor {
         let db = match redb::Database::create(path) {
             Ok(db) => db,
             Err(DatabaseError::UpgradeRequired(1)) => {
-                migrate_redb_v1_v2::run(path).map_err(ActorError::Migration)?
+                return Err(ActorError::Migration(anyhow::anyhow!(
+                    "migration from v1 no longer supported"
+                )))
             }
             Err(err) => return Err(err.into()),
         };