1 files changed, 31 insertions, 6 deletions

diff --git a/src/lib/list.rs b/src/lib/list.rs
index b867858..639140e 100644
--- a/src/lib/list.rs
+++ b/src/lib/list.rs
@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, path::PathBuf, str::FromStr};
 
 use anyhow::{Result, anyhow};
 use auth_git2::GitAuthenticator;
@@ -59,10 +59,12 @@ pub fn list_from_remote(
             .as_str(),
         )?;
 
-        let formatted_url = server_url.format_as(protocol, &decoded_nostr_url.user)?;
+        let formatted_url = server_url.format_as(protocol)?;
+
         let res = list_from_remote_url(
             git_repo,
             &formatted_url,
+            decoded_nostr_url.ssh_key_file_path().as_ref(),
             [ServerProtocol::UnauthHttps, ServerProtocol::UnauthHttp].contains(protocol),
             term,
         );
@@ -86,9 +88,18 @@ pub fn list_from_remote(
             }
             Err(error) => {
                 term.clear_last_lines(1)?;
-                term.write_line(
-                    format!("list: {formatted_url} failed over {protocol}: {error}").as_str(),
-                )?;
+                term.write_line(&format!(
+                    "list: {formatted_url} failed over {protocol}{}: {error}",
+                    if protocol == &ServerProtocol::Ssh {
+                        if let Some(ssh_key_file) = &decoded_nostr_url.ssh_key_file_path() {
+                            format!(" with ssh key from {ssh_key_file}")
+                        } else {
+                            String::new()
+                        }
+                    } else {
+                        String::new()
+                    }
+                ))?;
                 failed_protocols.push(protocol);
             }
         }
@@ -117,6 +128,7 @@ pub fn list_from_remote(
 fn list_from_remote_url(
     git_repo: &Repo,
     git_server_remote_url: &str,
+    ssh_key_file: Option<&String>,
     dont_authenticate: bool,
     term: &console::Term,
 ) -> Result<HashMap<String, String>> {
@@ -124,7 +136,20 @@ fn list_from_remote_url(
 
     let mut git_server_remote = git_repo.git_repo.remote_anonymous(git_server_remote_url)?;
     // authentication may be required
-    let auth = GitAuthenticator::default();
+    let auth = {
+        if dont_authenticate {
+            GitAuthenticator::default()
+        } else if git_server_remote_url.contains("git@") {
+            if let Some(ssh_key_file) = ssh_key_file {
+                GitAuthenticator::default()
+                    .add_ssh_key_from_file(PathBuf::from_str(ssh_key_file)?, None)
+            } else {
+                GitAuthenticator::default()
+            }
+        } else {
+            GitAuthenticator::default()
+        }
+    };
     let mut remote_callbacks = git2::RemoteCallbacks::new();
     if !dont_authenticate {
         remote_callbacks.credentials(auth.credentials(&git_config));