iroh 0.90 no longer running

Author: rustonbsd

Cargo.lock

@@ -7,19 +7,19 @@ repository = "https://github.com/rustonbsd/iroh-ssh"
 readme = "README.md"
 keywords = ["networking"]
 categories = ["network-programming"]
-version = "0.2.6"
+version = "0.2.7"
 edition = "2024"
 
 [dependencies]
 anyhow = "1.0.100"
-iroh = "0.93.2"
+iroh = "0.94"
 ed25519-dalek = { version = "2.2.0", features = ["rand_core"] }
 rand = "0.9"
 tokio-stream = { version = "0.1.15", features = ["sync"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3.20", features = ["fmt", "ansi"] }
 tracing-appender = "0.2"
-tokio = { version = "1.47.1", features = [
+tokio = { version = "1.48", features = [
     "macros",
     "io-util",
     "sync",

Cargo.toml

@@ -37,23 +37,23 @@ Download and setup the binary automatically for your operating system from [GitH
 Linux
 ```bash
 # Linux
-wget https://github.com/rustonbsd/iroh-ssh/releases/download/0.2.6/iroh-ssh.linux
+wget https://github.com/rustonbsd/iroh-ssh/releases/download/0.2.7/iroh-ssh.linux
 chmod +x iroh-ssh.linux
 sudo mv iroh-ssh.linux /usr/local/bin/iroh-ssh
 ```
 
 macOS
 ```bash
 # macOS arm
-curl -LJO https://github.com/rustonbsd/iroh-ssh/releases/download/0.2.6/iroh-ssh.macos
+curl -LJO https://github.com/rustonbsd/iroh-ssh/releases/download/0.2.7/iroh-ssh.macos
 chmod +x iroh-ssh.macos
 sudo mv iroh-ssh.macos /usr/local/bin/iroh-ssh
 ```
 
 Windows
 ```bash
 # Windows x86 64bit
-curl -L -o iroh-ssh.exe https://github.com/rustonbsd/iroh-ssh/releases/download/0.2.6/iroh-ssh.exe
+curl -L -o iroh-ssh.exe https://github.com/rustonbsd/iroh-ssh/releases/download/0.2.7/iroh-ssh.exe
 mkdir %LOCALAPPDATA%\iroh-ssh
 move iroh-ssh.exe %LOCALAPPDATA%\iroh-ssh\
 setx PATH "%PATH%;%LOCALAPPDATA%\iroh-ssh"
@@ -135,7 +135,7 @@ Display its Node ID and share it to allow connection
 > iroh-ssh info
 
     Your iroh-ssh nodeid: 38b7dc10df96005255c3beaeaeef6cfebd88344aa8c85e1dbfc1ad5e50f372ac
-    iroh-ssh version 0.2.4
+    iroh-ssh version 0.2.7
     https://github.com/rustonbsd/iroh-ssh
 
     Your server iroh-ssh nodeid:
@@ -194,12 +194,8 @@ Display its Node ID and share it to allow connection
 > iroh-ssh service uninstall                 # Uninstall service
 
 # Client connection
-> iroh-ssh user@<NODE_ID>                           # Connect to remote server
-> iroh-ssh connect user@<NODE_ID>                   # Explicit connect command
-> iroh-ssh -i ~/.ssh/id_rsa_my_cert user@<NODE_ID>  # Connect with certificate
-> iroh-ssh -L [bind_address:]port:host:hostport user@<NODE_ID>  # Forward connections made to client (bind_addr:port) to server (host:hostport)
-> iroh-ssh -R [bind_address:]port:host:hostport user@<NODE_ID>  # Forward connections made to server (bind_addr:port) to client (host:hostport)
-
+> iroh-ssh user@<NODE_ID>                    # Connect to remote server
+> iroh-ssh connect user@<NODE_ID>            # Explicit connect command, works with all standard ssh params and flags
 ```
 
 ## Security Model
@@ -217,9 +213,8 @@ Display its Node ID and share it to allow connection
 - [x] Add howto gifs
 - [x] Add -p flag for persistence
 - [x] Windows service mode
-- [x] Certificate support (`-i` flag)
+- [x] (almost) all ssh commands supported
 - [ ] MacOS service mode
-- [ ] Additional SSH features
 
 ## License
 

README.md

@@ -195,11 +195,7 @@ Mostrar su ID de nodo y compártalo para permitir la conexión
 
 # Conexión de cliente
 > iroh-ssh user@<NODE_ID>                           # Conectarse a un servidor remoto
-> iroh-ssh connect user@<NODE_ID>                   # Comando de conexión explicito
-> iroh-ssh -i ~/.ssh/id_rsa_my_cert user@<NODE_ID>  # Conectarse con certificado
-> iroh-ssh -L [bind_address:]port:host:hostport user@<NODE_ID>  # Redireccionamiento de conexión del cliente (bind_addr:port) al servidor (host:hostport)
-> iroh-ssh -R [bind_address:]port:host:hostport user@<NODE_ID>  # Redireccionamiento de conexión del servidor (bind_addr:port) al cliente (host:hostport)
-
+> iroh-ssh connect user@<NODE_ID>                   # Comando de conexión explicito, funciona con todos los parametros y banderas ssh estándar
 ```
 
 ## Modelo de seguridad
@@ -217,9 +213,8 @@ Mostrar su ID de nodo y compártalo para permitir la conexión
 - [x] Gifs con ejemplos
 - [x] Adicionar la opción -p para persistencia
 - [x] Modo servicio en Windows
-- [x] Soporte de certificados (opción `-i`)
+- [x] (además de casi) todos los comandos ssh soportados
 - [ ] Modo servicio en MacOS
-- [ ] Funcionalidades adicionales SSH
 
 ## Licencia
 

README_es.md

@@ -195,11 +195,7 @@ Exiba seu ID de nó e compartilhe-o para permitir a conexão
 
 # Conexão do cliente
 > iroh-ssh user@<NODE_ID>                           # Conectar-se a um servidor remoto
-> iroh-ssh connect user@<NODE_ID>                   # Comando de conexão explícito
-> iroh-ssh -i ~/.ssh/id_rsa_my_cert user@<NODE_ID>  # Conectar-se com certificado
-> iroh-ssh -L [bind_address:]port:host:hostport user@<NODE_ID>  # Redirecionamento de conexão do cliente (bind_addr:port) para o servidor (host:hostport)
-> iroh-ssh -R [bind_address:]port:host:hostport user@<NODE_ID>  # Redirecionamento de conexão do servidor (bind_addr:port) para o cliente (host:hostport)
-
+> iroh-ssh connect user@<NODE_ID>                   # Comando de conexão explícito, funciona com todos os parâmetros e flags ssh padrão
 ```
 
 ## Modelo de segurança
@@ -217,9 +213,8 @@ Exiba seu ID de nó e compartilhe-o para permitir a conexão
 - [x] Adicionar gifs com exemplos
 - [x] Adicionar flag -p para persistência
 - [x] Modo serviço no Windows
-- [x] Suporte a certificados (flag -i)
+- [x] (quase) todos os comandos ssh suportados
 - [ ] Modo serviço no macOS
-- [ ] Recursos SSH adicionais
 
 ## Licença
 

README_pt.md

@@ -2,7 +2,7 @@ use std::str::FromStr as _;
 
 use anyhow::bail;
 use homedir::my_home;
-use iroh::{NodeId, SecretKey};
+use iroh::{EndpointId, SecretKey};
 
 use crate::{
     IrohSsh,
@@ -109,14 +109,14 @@ pub async fn server_mode(server_args: ServerArgs, service: bool) -> anyhow::Resu
 
 pub async fn proxy_mode(proxy_args: ProxyArgs) -> anyhow::Result<()> {
     let iroh_ssh = IrohSsh::builder().accept_incoming(false).build().await?;
-    let node_id = NodeId::from_str(if proxy_args.node_id.len() == 64 {
+    let endpoint_id = EndpointId::from_str(if proxy_args.node_id.len() == 64 {
         &proxy_args.node_id
     } else if proxy_args.node_id.len() > 64 {
         &proxy_args.node_id[proxy_args.node_id.len() - 64..]
     } else {
         return Err(anyhow::anyhow!("invalid node id length"));
     })?;
-    iroh_ssh.connect(node_id).await
+    iroh_ssh.connect(endpoint_id).await
 }
 
 pub async fn client_mode(connect_args: ConnectArgs) -> anyhow::Result<()> {

src/api.rs

@@ -20,7 +20,7 @@ async fn main() -> anyhow::Result<()> {
         }
         Some(Cmd::Server(args)) => api::server_mode(args, false).await,
         Some(Cmd::Service { op }) => {
-            if self_runas::is_elevated() == false {
+            if !self_runas::is_elevated() {
                 self_runas::admin()?;
                 return Ok(())
             } else {

src/main.rs

@@ -1,6 +1,3 @@
-#[cfg(not(target_os = "windows"))]
-use anyhow::bail;
-
 #[cfg(target_os = "linux")]
 mod linux;
 #[cfg(target_os = "linux")]
@@ -34,12 +31,12 @@ pub trait Service {
     fn uninstall() -> impl std::future::Future<Output = anyhow::Result<()>> + Send;
 }
 
-pub async fn install_service(service_params: ServiceParams) -> anyhow::Result<()> {
+pub async fn install_service(_service_params: ServiceParams) -> anyhow::Result<()> {
     match std::env::consts::OS {
         #[cfg(target_os = "linux")]
-        "linux" => LinuxService::install(service_params).await,
+        "linux" => LinuxService::install(_service_params).await,
         #[cfg(target_os = "windows")]
-        "windows" => WindowsService::install(service_params).await,
+        "windows" => WindowsService::install(_service_params).await,
         _ => anyhow::bail!("service mode is only supported on linux and windows"),
     }
 }

src/service/mod.rs

@@ -5,9 +5,7 @@ use anyhow::bail;
 use ed25519_dalek::SECRET_KEY_LENGTH;
 use homedir::my_home;
 use iroh::{
-    Endpoint, NodeId, SecretKey,
-    endpoint::Connection,
-    protocol::{ProtocolHandler, Router},
+    endpoint::Connection, protocol::{ProtocolHandler, Router}, Endpoint, EndpointId, SecretKey
 };
 use tokio::{
     net::TcpStream,
@@ -56,8 +54,7 @@ impl Builder {
                     e
                 );
                 eprintln!(
-                    "Warning: Failed to load/create persistent SSH keys: {:#}",
-                    e
+                    "Warning: Failed to load/create persistent SSH keys: {e:#}"
                 );
                 eprintln!("Continuing with ephemeral keys...");
             }
@@ -70,12 +67,11 @@ impl Builder {
         let secret_key = SecretKey::from_bytes(&self.secret_key);
         let endpoint = Endpoint::builder()
             .secret_key(secret_key)
-            .discovery_n0()
             .bind()
             .await?;
 
         let mut iroh_ssh = IrohSsh {
-            public_key: *endpoint.node_id().as_bytes(),
+            public_key: *endpoint.id().as_bytes(),
             secret_key: self.secret_key,
             inner: None,
             ssh_port: self.accept_port.unwrap_or(22),
@@ -183,9 +179,9 @@ impl IrohSsh {
         Ok(ssh_process)
     }
 
-    pub async fn connect(&self, node_id: NodeId) -> anyhow::Result<()> {
+    pub async fn connect(&self, endpoint_id: EndpointId) -> anyhow::Result<()> {
         let inner = self.inner.as_ref().expect("inner not set");
-        let conn = inner.endpoint.connect(node_id, &IrohSsh::ALPN()).await?;
+        let conn = inner.endpoint.connect(endpoint_id, &IrohSsh::ALPN()).await?;
         let (mut iroh_send, mut iroh_recv) = conn.open_bi().await?;
         let (mut local_read, mut local_write) = (tokio::io::stdin(), tokio::io::stdout());
         let a_to_b = async move { tokio::io::copy(&mut local_read, &mut iroh_send).await };
@@ -202,22 +198,22 @@ impl IrohSsh {
         Ok(())
     }
 
-    pub fn node_id(&self) -> NodeId {
+    pub fn node_id(&self) -> EndpointId {
         self.inner
             .as_ref()
             .expect("inner not set")
             .endpoint
-            .node_id()
+            .id()
     }
 }
 
 impl ProtocolHandler for IrohSsh {
     async fn accept(&self, connection: Connection) -> Result<(), iroh::protocol::AcceptError> {
-        let node_id = connection.remote_node_id()?;
+        let endpoint_id = connection.remote_id()?;
 
         match connection.accept_bi().await {
             Ok((mut iroh_send, mut iroh_recv)) => {
-                println!("Accepted bidirectional stream from {node_id}");
+                println!("Accepted bidirectional stream from {endpoint_id}");
 
                 match TcpStream::connect(format!("127.0.0.1:{}", self.ssh_port)).await {
                     Ok(mut ssh_stream) => {
@@ -333,9 +329,8 @@ pub fn dot_ssh(
                 tracing::debug!("dot_ssh: Writing to pub_key: {}", pub_key.display());
                 tracing::debug!("dot_ssh: Writing to priv_key: {}", priv_key.display());
 
-                let key = default_secret_key.clone();
-                let secret_key = key.secret();
-                let public_key = key.public();
+                let secret_key = default_secret_key.clone();
+                let public_key = secret_key.public();
 
                 match std::fs::write(&pub_key, z32::encode(public_key.as_bytes())) {
                     Ok(_) => {
@@ -351,7 +346,7 @@ pub fn dot_ssh(
                     }
                 }
 
-                match std::fs::write(&priv_key, z32::encode(secret_key.as_bytes())) {
+                match std::fs::write(&priv_key, z32::encode(&secret_key.to_bytes())) {
                     Ok(_) => {
                         tracing::info!("dot_ssh: Successfully wrote priv_key");
                     }
@@ -365,7 +360,7 @@ pub fn dot_ssh(
                     }
                 }
 
-                Ok(key)
+                Ok(secret_key)
             }
         }
         (true, false) => {