feat!: update to [email protected] (#41)

* feat: update to [email protected]

* fixup

* update iroh-metrics

* update to released version

* happy deny

Author: dignifiedquire

Cargo.lock

@@ -40,10 +40,10 @@ genawaiter = { version = "0.99.1", features = ["futures03"] }
 hashlink = { version = "0.9.0", optional = true }
 hex = "0.4.3"
 indicatif = { version = "0.17.8", optional = true }
-iroh-base = { version = "0.29.0" }
+iroh-base = { version = "0.30" }
 iroh-io = { version = "0.6.0", features = ["stats"] }
-iroh-metrics = { version = "0.29.0", default-features = false }
-iroh = "0.29.0"
+iroh-metrics = { version = "0.30.0", default-features = false }
+iroh = "0.30"
 nested_enum_utils = { version = "0.1.0", optional = true }
 num_cpus = "1.15.0"
 oneshot = "0.1.8"
@@ -66,6 +66,7 @@ serde = { version = "1", features = ["derive"] }
 serde-error = "0.1.3"
 smallvec = { version = "1.10.0", features = ["serde", "const_new"] }
 strum = { version = "0.26.3", optional = true }
+ssh-key = { version = "0.6", optional = true, features = ["ed25519"] }
 tempfile = { version = "3.10.0", optional = true }
 thiserror = "2"
 tokio = { version = "1", features = ["fs"] }
@@ -79,8 +80,8 @@ console = { version = "0.15.8", optional = true }
 
 [dev-dependencies]
 http-body = "1.0"
-iroh-test = { version = "0.29" }
-iroh = { version = "0.29", features = ["test-utils"] }
+iroh-test = { version = "0.30" }
+iroh = { version = "0.30", features = ["test-utils"] }
 futures-buffered = "0.2.4"
 proptest = "1.0.0"
 serde_json = "1.0.107"
@@ -103,14 +104,15 @@ metrics = ["iroh-metrics/metrics"]
 redb = ["dep:redb"]
 cli = ["rpc", "dep:clap", "dep:indicatif", "dep:console"]
 rpc = [
-    "dep:quic-rpc",
-    "dep:quic-rpc-derive",
-    "dep:nested_enum_utils",
-    "dep:strum",
-    "dep:futures-util",
-    "dep:portable-atomic",
-    "dep:walkdir",
-    "downloader",
+  "dep:quic-rpc",
+  "dep:quic-rpc-derive",
+  "dep:nested_enum_utils",
+  "dep:strum",
+  "dep:futures-util",
+  "dep:portable-atomic",
+  "dep:walkdir",
+  "dep:ssh-key",
+  "downloader",
 ]
 
 example-iroh = [
@@ -182,7 +184,3 @@ debug-assertions = false
 opt-level = 3
 panic = 'abort'
 incremental = false
-
-[patch.crates-io]
-iroh-base = { git = "https://github.com/n0-computer/iroh" }
-iroh = { git = "https://github.com/n0-computer/iroh" }

Cargo.toml

@@ -37,6 +37,4 @@ ignore = [
 ]
 
 [sources]
-allow-git = [
-    "https://github.com/n0-computer/iroh.git",
-]
+allow-git = []

deny.toml

@@ -56,6 +56,7 @@ async fn main() -> Result<()> {
         "node relay server url: {:?}",
         node.endpoint()
             .home_relay()
+            .get()?
             .expect("a default relay url should be provided")
             .to_string()
     );

examples/hello-world-fetch.rs

@@ -61,7 +61,7 @@ async fn main() -> anyhow::Result<()> {
     setup_logging();
     let cli = Cli::parse();
 
-    let key = SecretKey::generate();
+    let key = SecretKey::generate(rand::rngs::OsRng);
     let discovery = LocalSwarmDiscovery::new(key.public())?;
 
     println!("Starting iroh node with local node discovery...");

examples/local-swarm-discovery.rs

@@ -76,7 +76,7 @@ async fn smoke_test() {
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
 
     // send a request and make sure the peer is requested the corresponding download
-    let peer = SecretKey::generate().public();
+    let peer = SecretKey::generate(rand::thread_rng()).public();
     let kind: DownloadKind = HashAndFormat::raw(Hash::new([0u8; 32])).into();
     let req = DownloadRequest::new(kind, vec![peer]);
     let handle = downloader.queue(req).await;
@@ -101,7 +101,7 @@ async fn deduplication() {
     let (downloader, _lp) =
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
 
-    let peer = SecretKey::generate().public();
+    let peer = SecretKey::generate(rand::thread_rng()).public();
     let kind: DownloadKind = HashAndFormat::raw(Hash::new([0u8; 32])).into();
     let mut handles = Vec::with_capacity(10);
     for _ in 0..10 {
@@ -134,7 +134,7 @@ async fn cancellation() {
     let (downloader, _lp) =
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
 
-    let peer = SecretKey::generate().public();
+    let peer = SecretKey::generate(rand::thread_rng()).public();
     let kind_1: DownloadKind = HashAndFormat::raw(Hash::new([0u8; 32])).into();
     let req = DownloadRequest::new(kind_1, vec![peer]);
     let handle_a = downloader.queue(req.clone()).await;
@@ -175,7 +175,7 @@ async fn max_concurrent_requests_total() {
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
 
     // send the downloads
-    let peer = SecretKey::generate().public();
+    let peer = SecretKey::generate(rand::thread_rng()).public();
     let mut handles = Vec::with_capacity(5);
     let mut expected_history = Vec::with_capacity(5);
     for i in 0..5 {
@@ -219,7 +219,7 @@ async fn max_concurrent_requests_per_peer() {
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
 
     // send the downloads
-    let peer = SecretKey::generate().public();
+    let peer = SecretKey::generate(rand::thread_rng()).public();
     let mut handles = Vec::with_capacity(5);
     for i in 0..5 {
         let kind = HashAndFormat::raw(Hash::new([i; 32]));
@@ -275,7 +275,7 @@ async fn concurrent_progress() {
     let (downloader, _lp) =
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), Default::default());
 
-    let peer = SecretKey::generate().public();
+    let peer = SecretKey::generate(rand::thread_rng()).public();
     let hash = Hash::new([0u8; 32]);
     let kind_1 = HashAndFormat::raw(hash);
 
@@ -369,11 +369,12 @@ async fn long_queue() {
 
     let (downloader, _lp) =
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
+    let mut rng = rand::thread_rng();
     // send the downloads
     let nodes = [
-        SecretKey::generate().public(),
-        SecretKey::generate().public(),
-        SecretKey::generate().public(),
+        SecretKey::generate(&mut rng).public(),
+        SecretKey::generate(&mut rng).public(),
+        SecretKey::generate(&mut rng).public(),
     ];
     let mut handles = vec![];
     for i in 0..100usize {
@@ -417,7 +418,7 @@ async fn fail_while_running() {
         .boxed()
     }));
 
-    let node = SecretKey::generate().public();
+    let node = SecretKey::generate(rand::thread_rng()).public();
     let req_success = DownloadRequest::new(blob_success, vec![node]);
     let req_fail = DownloadRequest::new(blob_fail, vec![node]);
     let handle_success = downloader.queue(req_success).await;
@@ -437,7 +438,7 @@ async fn retry_nodes_simple() {
     let getter = getter::TestingGetter::default();
     let (downloader, _lp) =
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), Default::default());
-    let node = SecretKey::generate().public();
+    let node = SecretKey::generate(rand::thread_rng()).public();
     let dial_attempts = Arc::new(AtomicUsize::new(0));
     let dial_attempts2 = dial_attempts.clone();
     // fail on first dial, then succeed
@@ -467,7 +468,7 @@ async fn retry_nodes_fail() {
         Default::default(),
         config,
     );
-    let node = SecretKey::generate().public();
+    let node = SecretKey::generate(rand::thread_rng()).public();
     // fail always
     dialer.set_dial_outcome(move |_node| false);
 
@@ -504,8 +505,9 @@ async fn retry_nodes_jump_queue() {
     let (downloader, _lp) =
         Downloader::spawn_for_test(dialer.clone(), getter.clone(), concurrency_limits);
 
-    let good_node = SecretKey::generate().public();
-    let bad_node = SecretKey::generate().public();
+    let mut rng = rand::thread_rng();
+    let good_node = SecretKey::generate(&mut rng).public();
+    let bad_node = SecretKey::generate(&mut rng).public();
 
     dialer.set_dial_outcome(move |node| node == good_node);
     let kind1 = HashAndFormat::raw(Hash::new([0u8; 32]));

src/downloader/test.rs

@@ -2,7 +2,6 @@
 
 use std::{borrow::Borrow, fmt, str::FromStr};
 
-use iroh_base::base32::{self, parse_array_hex_or_base32, HexOrBase32ParseError};
 use postcard::experimental::max_size::MaxSize;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 
@@ -52,10 +51,10 @@ impl Hash {
         self.0.to_hex().to_string()
     }
 
-    /// Convert to a base32 string limited to the first 10 bytes for a friendly string
+    /// Convert to a hex string limited to the first 5bytes for a friendly string
     /// representation of the hash.
     pub fn fmt_short(&self) -> String {
-        base32::fmt_short(self.as_bytes())
+        data_encoding::HEXLOWER.encode(&self.as_bytes()[..5])
     }
 }
 
@@ -134,11 +133,35 @@ impl fmt::Display for Hash {
     }
 }
 
+#[derive(Debug, thiserror::Error)]
+pub enum HexOrBase32ParseError {
+    #[error("Invalid length")]
+    DecodeInvalidLength,
+    #[error("Failed to decode {0}")]
+    Decode(#[from] data_encoding::DecodeError),
+}
+
 impl FromStr for Hash {
     type Err = HexOrBase32ParseError;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
-        parse_array_hex_or_base32(s).map(Hash::from)
+        let mut bytes = [0u8; 32];
+
+        let res = if s.len() == 64 {
+            // hex
+            data_encoding::HEXLOWER.decode_mut(s.as_bytes(), &mut bytes)
+        } else {
+            data_encoding::BASE32_NOPAD.decode_mut(s.to_ascii_uppercase().as_bytes(), &mut bytes)
+        };
+        match res {
+            Ok(len) => {
+                if len != 32 {
+                    return Err(HexOrBase32ParseError::DecodeInvalidLength);
+                }
+            }
+            Err(partial) => return Err(partial.error.into()),
+        }
+        Ok(Self(blake3::Hash::from_bytes(bytes)))
     }
 }
 

src/hash.rs

@@ -1903,15 +1903,17 @@ mod tests {
         let (relay_map, _relay_url, _guard) = iroh::test_utils::run_relay_server().await?;
         let dns_pkarr_server = DnsPkarrServer::run().await?;
 
-        let secret1 = SecretKey::generate();
+        let mut rng = rand::thread_rng();
+
+        let secret1 = SecretKey::generate(&mut rng);
         let endpoint1 = iroh::Endpoint::builder()
             .relay_mode(RelayMode::Custom(relay_map.clone()))
             .insecure_skip_relay_cert_verify(true)
             .dns_resolver(dns_pkarr_server.dns_resolver())
             .secret_key(secret1.clone())
             .discovery(dns_pkarr_server.discovery(secret1));
         let node1 = Node::memory().endpoint(endpoint1).spawn().await?;
-        let secret2 = SecretKey::generate();
+        let secret2 = SecretKey::generate(&mut rng);
         let endpoint2 = iroh::Endpoint::builder()
             .relay_mode(RelayMode::Custom(relay_map.clone()))
             .insecure_skip_relay_cert_verify(true)

src/rpc/client/blobs.rs

@@ -154,14 +154,13 @@ mod tests {
     use std::net::SocketAddr;
 
     use iroh::{PublicKey, SecretKey};
-    use iroh_base::base32;
     use iroh_test::{assert_eq_hex, hexdump::parse_hexdump};
 
     use super::*;
 
     fn make_ticket() -> BlobTicket {
         let hash = Hash::new(b"hi there");
-        let peer = SecretKey::generate().public();
+        let peer = SecretKey::generate(rand::thread_rng()).public();
         let addr = SocketAddr::from_str("127.0.0.1:1234").unwrap();
         let relay_url = None;
         BlobTicket {
@@ -201,7 +200,11 @@ mod tests {
             format: BlobFormat::Raw,
             hash,
         };
-        let base32 = base32::parse_vec(ticket.to_string().strip_prefix("blob").unwrap()).unwrap();
+        let encoded = ticket.to_string();
+        let stripped = encoded.strip_prefix("blob").unwrap();
+        let base32 = data_encoding::BASE32_NOPAD
+            .decode(stripped.to_ascii_uppercase().as_bytes())
+            .unwrap();
         let expected = parse_hexdump("
             00 # discriminator for variant 0
             ae58ff8833241ac82d6ff7611046ed67b5072d142c588d0063e942d9a75502b6 # node id, 32 bytes, see above

src/ticket.rs

@@ -133,11 +133,21 @@ pub async fn load_secret_key(key_path: PathBuf) -> anyhow::Result<iroh::SecretKe
 
     if key_path.exists() {
         let keystr = tokio::fs::read(key_path).await?;
-        let secret_key = SecretKey::try_from_openssh(keystr).context("invalid keyfile")?;
+
+        let ser_key = ssh_key::private::PrivateKey::from_openssh(keystr)?;
+        let ssh_key::private::KeypairData::Ed25519(kp) = ser_key.key_data() else {
+            bail!("invalid key format");
+        };
+        let secret_key = SecretKey::from_bytes(&kp.private.to_bytes());
         Ok(secret_key)
     } else {
-        let secret_key = SecretKey::generate();
-        let ser_key = secret_key.to_openssh()?;
+        let secret_key = SecretKey::generate(rand::rngs::OsRng);
+        let ckey = ssh_key::private::Ed25519Keypair {
+            public: secret_key.public().public().into(),
+            private: secret_key.secret().into(),
+        };
+        let ser_key =
+            ssh_key::private::PrivateKey::from(ckey).to_openssh(ssh_key::LineEnding::default())?;
 
         // Try to canonicalize if possible
         let key_path = key_path.canonicalize().unwrap_or(key_path);