Format Rust code using rustfmt

.github/workflows/release.yml

@@ -104,7 +104,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           allowUpdates: true
-          body: "Release rexec ${{ env.VERSION }}. Static build for Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
+          body: "Релиз rexec версии ${{ env.VERSION }}. Статические сборки для Linux (x86_64), Windows (x86_64) и MacOS (arm64)."
 
   upload:
     name: Upload Release Assets

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rexec"
-version = "1.4.0"
+version = "1.2.0"
 readme = "https://github.com/house-of-vanity/rexec#readme"
 edition = "2021"
 description = "Parallel SSH executor"
@@ -13,15 +13,17 @@ authors = ["AB <gh@hexor.ru>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dns-lookup = "2"
+dns-lookup = "2.0.2"
 rayon = "1.10"
-log = "0.4"
+log = "0.4.0"
-env_logger = "0.11"
+env_logger = "0.10.0"
-whoami = "1"
+massh = "0.6.3"
-lazy-st = "1"
+whoami = "1.4.0"
+lazy-st = "0.2.2"
 regex = "1"
-clap = { version = "4.5", features = ["derive"] }
+clap = { version = "4.3.4", features = ["derive"] }
-colored = "3"
+colored = "2.0.0"
-itertools = "0.14"
+itertools = "0.10.5"
 brace-expand = "0.1.0"
 question = "0.2.2"
+openssl = { version = "0.10", features = ["vendored"] }

src/main.rs

@@ -1,32 +1,31 @@
+#[macro_use]
 extern crate log;
 
+use std::collections::HashMap;
 use std::fs::read_to_string;
 use std::hash::Hash;
-use std::io::{BufRead, BufReader};
 use std::net::IpAddr;
-use std::process::{self, Command, Stdio};
+use std::process;
 use std::sync::{Arc, Mutex};
-use std::thread;
 
 use clap::Parser;
 use colored::*;
 use dns_lookup::lookup_host;
 use env_logger::Env;
 use itertools::Itertools;
-use log::{error, info, warn};
+use log::{error, info};
+use massh::{MasshClient, MasshConfig, MasshHostConfig, SshAuth};
 use question::{Answer, Question};
 use rayon::prelude::*;
 use regex::Regex;
 
-// Define command-line arguments using the clap library
+// Define args
 #[derive(Parser, Debug)]
 #[command(author = "AB ab@hexor.ru", version, about = "Parallel SSH executor in Rust", long_about = None)]
 struct Args {
-    /// Username for SSH connections (defaults to current system user)
+    #[arg(short, long, default_value_t = whoami::username())]
-    #[arg(short = 'u', short_alias = 'l', long, default_value_t = whoami::username())]
     username: String,
 
-    /// Flag to use known_hosts file for server discovery instead of pattern expansion
     #[arg(
         short,
         long,
@@ -34,8 +33,6 @@ struct Args {
     )]
     known_hosts: bool,
 
-    /// Server name patterns with expansion syntax
-    /// Examples: 'web-[1:12]-io-{prod,dev}' expands to multiple servers
     #[arg(
         short,
         long,
@@ -44,15 +41,12 @@ struct Args {
     )]
     expression: Vec<String>,
 
-    /// Command to execute on each server
     #[arg(short, long, help = "Command to execute on servers")]
     command: String,
 
-    /// Display only exit codes without command output
     #[arg(long, default_value_t = false, help = "Show exit code ONLY")]
     code: bool,
 
-    /// Skip confirmation prompt before executing commands
     #[arg(
         short = 'f',
         long,
@@ -61,104 +55,21 @@ struct Args {
     )]
     noconfirm: bool,
 
-    /// Maximum number of parallel SSH connections
     #[arg(short, long, default_value_t = 100)]
     parallel: i32,
 }
 
-/// Host representation for both known_hosts entries and expanded patterns
+// Represent line from known_hosts file
 #[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
 struct Host {
-    /// Hostname or IP address as a string
     name: String,
-    /// Resolved IP address (if available)
     ip: Option<IpAddr>,
 }
 
-/// Find common domain suffix across all hostnames to simplify output display
+// Read known_hosts file
-///
-/// This function analyzes all hostnames to identify a common domain suffix
-/// which can be shortened during display to improve readability.
-///
-/// # Arguments
-/// * `hostnames` - A slice of strings containing all server hostnames
-///
-/// # Returns
-/// * `Option<String>` - The common suffix if found, or None
-fn find_common_suffix(hostnames: &[String]) -> Option<String> {
-    if hostnames.is_empty() {
-        return None;
-    }
-
-    // Don't truncate if only one host
-    if hostnames.len() == 1 {
-        return None;
-    }
-
-    let first = &hostnames[0];
-
-    // Start with assumption that the entire first hostname is the common suffix
-    let mut common = first.clone();
-
-    // Iterate through remaining hostnames, reducing the common part
-    for hostname in hostnames.iter().skip(1) {
-        // Exit early if no common part remains
-        if common.is_empty() {
-            return None;
-        }
-
-        // Find common suffix with current hostname
-        let mut new_common = String::new();
-
-        // Search for common suffix by comparing characters from right to left
-        let mut common_chars = common.chars().rev();
-        let mut hostname_chars = hostname.chars().rev();
-
-        loop {
-            match (common_chars.next(), hostname_chars.next()) {
-                (Some(c1), Some(c2)) if c1 == c2 => new_common.insert(0, c1),
-                _ => break,
-            }
-        }
-
-        common = new_common;
-    }
-
-    // Ensure the common part is a valid domain suffix (starts with a dot)
-    if common.is_empty() || !common.starts_with('.') {
-        return None;
-    }
-
-    // Return the identified common suffix
-    Some(common)
-}
-
-/// Shorten hostname by removing the common suffix and replacing with an asterisk
-///
-/// # Arguments
-/// * `hostname` - The original hostname
-/// * `common_suffix` - Optional common suffix to remove
-///
-/// # Returns
-/// * `String` - Shortened hostname or original if no common suffix
-fn shorten_hostname(hostname: &str, common_suffix: &Option<String>) -> String {
-    match common_suffix {
-        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> {
     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()
@@ -173,45 +84,18 @@ fn read_known_hosts() -> Vec<Host> {
     result
 }
 
-/// Expand a numeric range in the format [start:end] to a list of strings
-///
-/// # Arguments
-/// * `start` - Starting number (inclusive)
-/// * `end` - Ending number (inclusive)
-///
-/// # Returns
-/// * `Vec<String>` - List of numbers as strings
 fn expand_range(start: i32, end: i32) -> Vec<String> {
     (start..=end).map(|i| i.to_string()).collect()
 }
 
-/// Expand a comma-separated list in the format {item1,item2,item3} to a list of strings
-///
-/// # Arguments
-/// * `list` - Comma-separated string to expand
-///
-/// # Returns
-/// * `Vec<String>` - List of expanded items
 fn expand_list(list: &str) -> Vec<String> {
     list.split(',').map(|s| s.to_string()).collect()
 }
 
-/// Expand a server pattern string with range and list notation into individual hostnames
-///
-/// Supports two expansion types:
-/// - Range expansion: server-[1:5] → server-1, server-2, server-3, server-4, server-5
-/// - List expansion: server-{prod,dev} → server-prod, server-dev
-///
-/// # Arguments
-/// * `s` - Pattern string to expand
-///
-/// # Returns
-/// * `Vec<Host>` - List of expanded Host objects
 fn expand_string(s: &str) -> Vec<Host> {
     let mut hosts: Vec<Host> = Vec::new();
     let mut result = vec![s.to_string()];
 
-    // First expand all range expressions [start:end]
     while let Some(r) = result.iter().find(|s| s.contains('[')) {
         let r = r.clone();
         let start = r.find('[').unwrap();
@@ -238,7 +122,6 @@ fn expand_string(s: &str) -> Vec<Host> {
         }
     }
 
-    // Then expand all list expressions {item1,item2}
     while let Some(r) = result.iter().find(|s| s.contains('{')) {
         let r = r.clone();
         let start = r.find('{').unwrap();
@@ -257,7 +140,6 @@ fn expand_string(s: &str) -> Vec<Host> {
         }
     }
 
-    // Convert all expanded strings to Host objects
     for hostname in result {
         hosts.push(Host {
             name: hostname.to_string(),
@@ -267,144 +149,14 @@ fn expand_string(s: &str) -> Vec<Host> {
     hosts
 }
 
-/// Execute a command on a single host using the system SSH client
-///
-/// This function runs an SSH command using the system's SSH client,
-/// capturing and displaying output in real-time with proper formatting.
-///
-/// # Arguments
-/// * `hostname` - Target server hostname
-/// * `username` - SSH username
-/// * `command` - Command to execute
-/// * `common_suffix` - Optional common suffix for hostname display formatting
-/// * `code_only` - Whether to display only exit codes
-///
-/// # 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> {
-    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")
-        .arg(format!("{}@{}", username, hostname))
-        .arg(command)
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped());
-
-    // Execute the command
-    let mut child = match ssh_cmd.spawn() {
-        Ok(child) => child,
-        Err(e) => return Err(format!("Failed to start SSH process: {}", e)),
-    };
-
-    // 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
-                        );
-                    }
-                }
-                Err(_) => break,
-            }
-        }
-    });
-
-    // Capture and display stderr in real-time using a dedicated thread
-    let stderr = child.stderr.take().unwrap();
-    let display_name_stderr = display_name.clone();
-    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
-                        );
-                    }
-                }
-                Err(_) => break,
-            }
-        }
-    });
-
-    // Wait for command to complete
-    let status = match child.wait() {
-        Ok(status) => status,
-        Err(e) => return Err(format!("Failed to wait for SSH process: {}", e)),
-    };
-
-    // Wait for stdout and stderr threads to complete
-    stdout_thread.join().unwrap();
-    stderr_thread.join().unwrap();
-
-    // 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 {
-        format!("{}", exit_code.to_string().green())
-    } else {
-        format!("{}", exit_code.to_string().red())
-    };
-
-    // Display completion message
-    println!(
-        "{} - COMPLETED (Exit code: [{}])",
-        display_name.yellow().bold(),
-        code_string
-    );
-
-    Ok(exit_code)
-}
-
-/// Main entry point for the application
 fn main() {
-    // Initialize logging with minimal formatting (no timestamp, no target)
     env_logger::Builder::from_env(Env::default().default_filter_or("info"))
         .format_timestamp(None)
         .format_target(false)
         .init();
-
-    // Parse command-line arguments
     let args = Args::parse();
 
-    // 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 mut all_hosts = Vec::new();
@@ -425,7 +177,6 @@ fn main() {
         }
         all_hosts
     } else {
-        // Use pattern expansion syntax (ranges and lists)
         info!("Using string expansion to build server list.");
         let mut all_hosts = Vec::new();
         for expression in args.expression.iter() {
@@ -434,10 +185,10 @@ fn main() {
         all_hosts
     };
 
-    // Remove duplicate hosts while preserving original order
+    // Dedup hosts from known_hosts file
     let matched_hosts: Vec<_> = hosts.into_iter().unique().collect();
 
-    // Log parallelism setting if not using the default
+    // Build MasshHostConfig hostnames list
     if args.parallel != 100 {
         warn!("Parallelism: {} thread{}", &args.parallel, {
             if args.parallel != 1 {
@@ -448,143 +199,144 @@ fn main() {
         });
     }
 
-    // Store hosts with their original indices to preserve ordering
-    let mut host_with_indices: Vec<(Host, usize)> = Vec::new();
-    for (idx, host) in matched_hosts.iter().enumerate() {
-        host_with_indices.push((host.clone(), idx));
-    }
-
     info!("Matched hosts:");
+    let resolved_ips = Arc::new(Mutex::new(Vec::<(String, IpAddr)>::new()));
 
-    // Perform DNS resolution for all hosts in parallel
+    matched_hosts
-    // 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) {
+        .for_each(|host| match lookup_host(&host.name) {
             Ok(ips) if !ips.is_empty() => {
                 let ip = ips[0];
-                let mut results = resolved_ips_with_indices.lock().unwrap();
+
-                results.push((host.name.clone(), ip, *idx));
+                info!("{} [{}]", &host.name, ip);
+
+                let mut results = resolved_ips.lock().unwrap();
+                results.push((host.name.clone(), ip));
             }
             Ok(_) => {
-                let mut results = resolved_ips_with_indices.lock().unwrap();
+                error!("DNS resolved, but IP not found: {}", &host.name.red());
-                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();
+                error!("DNS resolve failed: {}", &host.name.red());
-                results.push((
-                    host.name.clone(),
-                    IpAddr::V4(std::net::Ipv4Addr::new(0, 0, 0, 0)),
-                    *idx,
-                ));
             }
         });
 
-    // Sort hosts by original index to maintain consistent display order
+    let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new();
-    let mut resolved_hosts = resolved_ips_with_indices.lock().unwrap().clone();
+    let mut massh_hosts: Vec<MasshHostConfig> = Vec::new();
-    resolved_hosts.sort_by_key(|(_, _, idx)| *idx);
 
-    // Display all matched hosts with their resolved IPs
+    if let Ok(results) = resolved_ips.lock() {
-    for (hostname, ip, _) in &resolved_hosts {
+        for (hostname, ip) in results.iter() {
-        if ip.is_unspecified() {
+            hosts_and_ips.insert(*ip, hostname.clone());
-            error!("DNS resolve failed: {}", hostname.red());
+            massh_hosts.push(MasshHostConfig {
-        } else {
+                addr: *ip,
-            info!("{} [{}]", hostname, ip);
+                auth: None,
+                port: None,
+                user: None,
+            });
         }
     }
 
-    // Filter out hosts that couldn't be resolved
+    // Build MasshConfig using massh_hosts vector
-    let valid_hosts: Vec<(String, IpAddr, usize)> = resolved_hosts
+    let config = MasshConfig {
-        .into_iter()
+        default_auth: SshAuth::Agent,
-        .filter(|(_, ip, _)| !ip.is_unspecified())
+        default_port: 22,
-        .collect();
+        default_user: args.username,
+        threads: args.parallel as u64,
+        timeout: 0,
+        hosts: massh_hosts,
+    };
+    let massh = MasshClient::from(&config);
 
-    // Exit if no valid hosts remain
+    // Ask for confirmation
-    if valid_hosts.is_empty() {
+    if config.hosts.len() != 0
-        error!("No valid hosts to connect to");
+        && (args.noconfirm == true
-        process::exit(1);
+            || match Question::new(&*format!(
-    }
-
-    // Find common domain suffix to optimize display
-    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
-        );
-    }
-
-    // Ask for confirmation before proceeding (unless --noconfirm is specified)
-    if !args.noconfirm
-        && match Question::new(&*format!(
                 "Continue on following {} servers?",
-            &valid_hosts.len()
+                &config.hosts.len()
             ))
             .confirm()
             {
                 Answer::YES => true,
-            Answer::NO => {
+                Answer::NO => false,
-                warn!("Stopped");
-                process::exit(0);
-            }
                 _ => unreachable!(),
-        }
+            })
     {
-        info!("Run command on {} servers.", &valid_hosts.len());
+        info!("Run command on {} servers.", &config.hosts.len());
+
+        // Run a command on all the configured hosts.
+        // Receive the result of the command for each host and print its output.
+        let rx = massh.execute(args.command);
+
+        while let Ok((host, result)) = rx.recv() {
+            let ip: String = host.split('@').collect::<Vec<_>>()[1]
+                .split(':')
+                .collect::<Vec<_>>()[0]
+                .to_string();
+            let ip = ip.parse::<IpAddr>().unwrap();
+            println!(
+                "\n{}",
+                hosts_and_ips
+                    .get(&ip)
+                    .unwrap_or(&"Couldn't parse IP".to_string())
+                    .to_string()
+                    .yellow()
+                    .bold()
+                    .to_string()
+            );
+            let output = match result {
+                Ok(output) => output,
+                Err(e) => {
+                    error!("Can't access server: {}", e);
+                    continue;
                 }
+            };
+            let code_string = if output.exit_status == 0 {
+                format!("{}", output.exit_status.to_string().green())
+            } else {
+                format!("{}", output.exit_status.to_string().red())
+            };
+            println!(
+                "{}",
+                format!(
+                    "Exit code [{}] | std out/err [{}/{}] bytes",
+                    code_string,
+                    output.stdout.len(),
+                    output.stderr.len()
+                )
+                .bold()
+            );
 
-    // Execute commands using system SSH client
+            if !args.code {
-    let batch_size = args.parallel as usize;
+                match String::from_utf8(output.stdout) {
-    let mut processed = 0;
+                    Ok(stdout) => match stdout.as_str() {
-
+                        "" => {}
-    while processed < valid_hosts.len() {
+                        _ => {
-        let end = std::cmp::min(processed + batch_size, valid_hosts.len());
+                            let prefix = if output.exit_status != 0 {
-        let batch = &valid_hosts[processed..end];
+                                format!("{}", "│".cyan())
-
+                            } else {
-        // Create a thread for each host in the current batch
+                                format!("{}", "│".green())
-        let mut handles = Vec::new();
+                            };
-
+                            for line in stdout.lines() {
-        for (hostname, _, _) in batch {
+                                println!("{} {}", prefix, line);
-            let hostname = hostname.clone();
+                            }
-            let username = args.username.clone();
+                        }
-            let command = args.command.clone();
+                    },
-            let common_suffix_clone = common_suffix.clone();
+                    Err(_) => {}
-            let code_only = args.code;
+                }
-
+                match String::from_utf8(output.stderr) {
-            // Execute SSH command in a separate thread
+                    Ok(stderr) => match stderr.as_str() {
-            let handle = thread::spawn(move || {
+                        "" => {}
-                match execute_ssh_command(
+                        _ => {
-                    &hostname,
+                            for line in stderr.lines() {
-                    &username,
+                                println!("{} {}", "║".red(), line);
-                    &command,
+                            }
-                    &common_suffix_clone,
+                        }
-                    code_only,
+                    },
-                ) {
+                    Err(_) => {}
-                    Ok(_) => (),
+                }
-                    Err(e) => error!("Error executing command on {}: {}", hostname, e),
+            }
-                }
+        }
-            });
+    } else {
-
+        warn!("Stopped");
-            handles.push(handle);
-        }
-
-        // Wait for all threads in this batch to complete
-        for handle in handles {
-            handle.join().unwrap();
-        }
-
-        processed = end;
     }
 }