Fixed --known-host option on MacOS

Cargo.lock

@@ -266,6 +266,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2a61bcce320b4968c46542aabe3d14e4d40ad6a6089eeced644326e73f6279a"
 
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
 [[package]]
 name = "libc"
 version = "0.2.172"
@@ -395,7 +401,7 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "rexec"
-version = "1.4.0"
+version = "1.5.1"
 dependencies = [
  "brace-expand",
  "clap",
@@ -404,6 +410,7 @@ dependencies = [
  "env_logger",
  "itertools",
  "lazy-st",
+ "lazy_static",
  "log",
  "question",
  "rayon",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.4.0"
+version = "1.5.2"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -25,3 +25,4 @@ colored = "3"
 itertools = "0.14"
 brace-expand = "0.1.0"
 question = "0.2.2"
+lazy_static = "1.5.0"

src/main.rs

@@ -2,8 +2,9 @@ extern crate log;
 
 use std::fs::read_to_string;
 use std::hash::Hash;
-use std::io::{BufRead, BufReader};
+use std::io::{self, BufRead, BufReader};
 use std::net::IpAddr;
+use std::path::{Path, PathBuf};
 use std::process::{self, Command, Stdio};
 use std::sync::{Arc, Mutex};
 use std::thread;
@@ -13,11 +14,17 @@ use colored::*;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
+use lazy_static::lazy_static;
 use log::{error, info, warn};
 use question::{Answer, Question};
 use rayon::prelude::*;
 use regex::Regex;
 
+// Global state to track the currently open block
+lazy_static! {
+    static ref CURRENT_BLOCK: Arc<Mutex<Option<String>>> = Arc::new(Mutex::new(None));
+}
+
 // Define command-line arguments using the clap library
 #[derive(Parser, Debug)]
 #[command(author = "AB ab@hexor.ru", version, about = "Parallel SSH executor in Rust", long_about = None)]
@@ -146,33 +153,85 @@ fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
         Some(suffix) if hostname.ends_with(suffix) => {
             let short_name = hostname[..hostname.len() - suffix.len()].to_string();
             format!("{}{}", short_name, "*")
-        },
+        }
         _ => hostname.to_string(),
     }
 }
 
-/// Read and parse the SSH known_hosts file to extract server names
-/// 
-/// # Returns
-/// * `Vec<Host>` - List of hosts found in the known_hosts file
-fn read_known_hosts() -> Vec<Host> {
+/// Resolve the default SSH known_hosts path for the current user.
+fn default_known_hosts_path() -> PathBuf {
+    let home = std::env::var_os("HOME")
+        .map(PathBuf::from)
+        .filter(|path| !path.as_os_str().is_empty())
+        .unwrap_or_else(|| PathBuf::from(format!("/home/{}", whoami::username())));
+
+    home.join(".ssh").join("known_hosts")
+}
+
+fn normalize_known_host_entry(entry: &str) -> Option<String> {
+    if entry.is_empty() || entry.starts_with('|') {
+        return None;
+    }
+
+    let hostname = entry
+        .strip_prefix('[')
+        .and_then(|value| value.split_once("]:").map(|(host, _)| host))
+        .unwrap_or(entry);
+
+    if hostname.is_empty() {
+        None
+    } else {
+        Some(hostname.to_string())
+    }
+}
+
+fn parse_known_hosts(content: &str) -> Vec<Host> {
     let mut result: Vec<Host> = Vec::new();
 
-    // Read known_hosts file from the user's home directory
-    for line in read_to_string(format!("/home/{}/.ssh/known_hosts", whoami::username()))
-        .unwrap()
-        .lines()
-    {
-        let line = line.split(" ").collect::<Vec<&str>>();
-        let hostname = line[0];
-        result.push(Host {
-            name: hostname.to_string(),
-            ip: None,
-        })
+    for line in content.lines() {
+        let line = line.trim();
+
+        if line.is_empty() || line.starts_with('#') {
+            continue;
         }
+
+        let mut fields = line.split_whitespace();
+        let first = match fields.next() {
+            Some(field) => field,
+            None => continue,
+        };
+
+        let hostnames = if first.starts_with('@') {
+            match fields.next() {
+                Some(field) => field,
+                None => continue,
+            }
+        } else {
+            first
+        };
+
+        for hostname in hostnames.split(',').filter_map(normalize_known_host_entry) {
+            result.push(Host {
+                name: hostname,
+                ip: None,
+            });
+        }
+    }
+
     result
 }
 
+/// Read and parse the SSH known_hosts file to extract server names
+///
+/// # Arguments
+/// * `path` - Path to the known_hosts file
+///
+/// # Returns
+/// * `io::Result<Vec<Host>>` - List of hosts found in the known_hosts file
+fn read_known_hosts(path: &Path) -> io::Result<Vec<Host>> {
+    read_to_string(path).map(|content| parse_known_hosts(&content))
+}
+
 /// Expand a numeric range in the format [start:end] to a list of strings
 ///
 /// # Arguments
@@ -281,16 +340,22 @@ fn expand_string(s: &str) -> Vec<Host> {
 ///
 /// # Returns
 /// * `Result<i32, String>` - Exit code on success or error message
-fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suffix: &Option<String>, code_only: bool) -> Result<i32, String> {
+fn execute_ssh_command(
+    hostname: &str,
+    username: &str,
+    command: &str,
+    common_suffix: &Option<String>,
+    code_only: bool,
+) -> Result<i32, String> {
     let display_name = shorten_hostname(hostname, common_suffix);
 
-    // Display execution start message with shortened hostname
-    println!("\n{} - STARTED", display_name.yellow().bold());
-    
     // Build the SSH command with appropriate options
     let mut ssh_cmd = Command::new("ssh");
-    ssh_cmd.arg("-o").arg("StrictHostKeyChecking=no")
-         .arg("-o").arg("BatchMode=yes")
+    ssh_cmd
+        .arg("-o")
+        .arg("StrictHostKeyChecking=no")
+        .arg("-o")
+        .arg("BatchMode=yes")
         .arg(format!("{}@{}", username, hostname))
         .arg(command)
         .stdout(Stdio::piped())
@@ -302,21 +367,59 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
         Err(e) => return Err(format!("Failed to start SSH process: {}", e)),
     };
 
+    // Function to handle output lines with proper block management
+    let handle_output = |line: String, display_name: &str, code_only: bool, is_stderr: bool| {
+        if !code_only {
+            let mut current_block = CURRENT_BLOCK.lock().unwrap();
+
+            // Check if we need to close the previous block and open a new one
+            match current_block.as_ref() {
+                Some(open_host) if open_host != display_name => {
+                    // Close the previous block
+                    println!("└ {} ┘", open_host.yellow());
+                    // Open new block
+                    println!("┌ {} ┐", display_name.yellow());
+                    *current_block = Some(display_name.to_string());
+                }
+                None => {
+                    // Open new block
+                    println!("┌ {} ┐", display_name.yellow());
+                    *current_block = Some(display_name.to_string());
+                }
+                Some(_) => {
+                    // Same host, continue with current block
+                }
+            }
+
+            // Print the log line with colored separator based on stream type
+            let separator = if is_stderr {
+                "│".red()
+            } else {
+                "│".green()
+            };
+            println!(
+                "{} {} {} {}",
+                separator,
+                display_name.yellow(),
+                separator,
+                line
+            );
+        }
+    };
+
     // Capture and display stdout in real-time using a dedicated thread
     let stdout = child.stdout.take().unwrap();
     let display_name_stdout = display_name.clone();
     let code_only_stdout = code_only;
     let stdout_thread = thread::spawn(move || {
         let reader = BufReader::new(stdout);
-        let prefix = format!("{}", "║".green());
 
         for line in reader.lines() {
             match line {
                 Ok(line) => {
-                    if !code_only_stdout {
-                        println!("{} {} {} {}", prefix, display_name_stdout.yellow(), prefix, line);
+                    handle_output(line, &display_name_stdout, code_only_stdout, false);
+                    // false = stdout
                 }
-                },
                 Err(_) => break,
             }
         }
@@ -328,15 +431,13 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
     let code_only_stderr = code_only;
     let stderr_thread = thread::spawn(move || {
         let reader = BufReader::new(stderr);
-        let prefix = format!("{}", "║".red());
 
         for line in reader.lines() {
             match line {
                 Ok(line) => {
-                    if !code_only_stderr {
-                        println!("{} {} {} {}", prefix, display_name_stderr.yellow(), prefix, line);
+                    handle_output(line, &display_name_stderr, code_only_stderr, true);
+                    // true = stderr
                 }
-                },
                 Err(_) => break,
             }
         }
@@ -352,6 +453,17 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
     stdout_thread.join().unwrap();
     stderr_thread.join().unwrap();
 
+    // Close the block if this host was the last one to output
+    if !code_only {
+        let mut current_block = CURRENT_BLOCK.lock().unwrap();
+        if let Some(open_host) = current_block.as_ref() {
+            if open_host == &display_name {
+                println!("└ {} ┘", display_name.yellow());
+                *current_block = None;
+            }
+        }
+    }
+
     // Format exit code with color (green for success, red for failure)
     let exit_code = status.code().unwrap_or(-1);
     let code_string = if exit_code == 0 {
@@ -360,8 +472,10 @@ fn execute_ssh_command(hostname: &str, username: &str, command: &str, common_suf
         format!("{}", exit_code.to_string().red())
     };
 
-    // Display completion message
-    println!("{} - COMPLETED (Exit code: [{}])", display_name.yellow().bold(), code_string);
+    // For code-only mode, just show hostname and exit code
+    if code_only {
+        println!("{}: [{}]", display_name.yellow(), code_string);
+    }
 
     Ok(exit_code)
 }
@@ -380,8 +494,19 @@ fn main() {
     // Build the list of target hosts based on user selection method
     let hosts = if args.known_hosts {
         // Use regex pattern matching against known_hosts file
-        info!("Using ~/.ssh/known_hosts to build server list.");
-        let known_hosts = read_known_hosts();
+        let known_hosts_path = default_known_hosts_path();
+        info!("Using {} to build server list.", known_hosts_path.display());
+        let known_hosts = match read_known_hosts(&known_hosts_path) {
+            Ok(hosts) => hosts,
+            Err(e) => {
+                error!(
+                    "Failed to read known_hosts file {}: {}",
+                    known_hosts_path.display(),
+                    e
+                );
+                process::exit(1);
+            }
+        };
         let mut all_hosts = Vec::new();
         for expression in args.expression.iter() {
             let re = match Regex::new(expression) {
@@ -435,8 +560,9 @@ fn main() {
     // Results are stored with original indices to maintain order
     let resolved_ips_with_indices = Arc::new(Mutex::new(Vec::<(String, IpAddr, usize)>::new()));
 
-    host_with_indices.par_iter().for_each(|(host, idx)| {
-        match lookup_host(&host.name) {
+    host_with_indices
+        .par_iter()
+        .for_each(|(host, idx)| match lookup_host(&host.name) {
             Ok(ips) if !ips.is_empty() => {
                 let ip = ips[0];
                 let mut results = resolved_ips_with_indices.lock().unwrap();
@@ -444,12 +570,19 @@ fn main() {
             }
             Ok(_) => {
                 let mut results = resolved_ips_with_indices.lock().unwrap();
-                results.push((host.name.clone(), IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), *idx));
+                results.push((
+                    host.name.clone(),
+                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
+                    *idx,
+                ));
             }
             Err(_) => {
                 let mut results = resolved_ips_with_indices.lock().unwrap();
-                results.push((host.name.clone(), IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)), *idx));
-            }
+                results.push((
+                    host.name.clone(),
+                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
+                    *idx,
+                ));
             }
         });
 
@@ -479,12 +612,18 @@ fn main() {
     }
 
     // Find common domain suffix to optimize display
-    let hostnames: Vec<String> = valid_hosts.iter().map(|(hostname, _, _)| hostname.clone()).collect();
+    let hostnames: Vec<String> = valid_hosts
+        .iter()
+        .map(|(hostname, _, _)| hostname.clone())
+        .collect();
     let common_suffix = find_common_suffix(&hostnames);
 
     // Inform user about display optimization if common suffix found
     if let Some(suffix) = &common_suffix {
-        info!("Common domain suffix found: '{}' (will be displayed as '*')", suffix);
+        info!(
+            "Common domain suffix found: '{}' (will be displayed as '*')",
+            suffix
+        );
     }
 
     // Ask for confirmation before proceeding (unless --noconfirm is specified)
@@ -526,7 +665,13 @@ fn main() {
 
             // Execute SSH command in a separate thread
             let handle = thread::spawn(move || {
-                match execute_ssh_command(&hostname, &username, &command, &common_suffix_clone, code_only) {
+                match execute_ssh_command(
+                    &hostname,
+                    &username,
+                    &command,
+                    &common_suffix_clone,
+                    code_only,
+                ) {
                     Ok(_) => (),
                     Err(e) => error!("Error executing command on {}: {}", hostname, e),
                 }
@@ -543,3 +688,41 @@ fn main() {
         processed = end;
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parse_known_hosts_extracts_usable_hosts() {
+        let content = r#"
+# comment
+admin.example.com ssh-ed25519 AAAA
+web.example.com,192.0.2.10 ecdsa-sha2-nistp256 AAAA
+@cert-authority *.example.com ssh-rsa AAAA
+|1|salt|hash ssh-ed25519 AAAA
+[custom.example.com]:2222 ssh-rsa AAAA
+"#;
+
+        let hosts: Vec<_> = parse_known_hosts(content)
+            .iter()
+            .map(|host| host.name.as_str())
+            .collect();
+
+        assert_eq!(
+            hosts,
+            vec![
+                "admin.example.com",
+                "web.example.com",
+                "192.0.2.10",
+                "*.example.com",
+                "custom.example.com"
+            ]
+        );
+    }
+
+    #[test]
+    fn normalize_known_host_entry_skips_hashed_entries() {
+        assert_eq!(normalize_known_host_entry("|1|salt|hash"), None);
+    }
+}