Hexor/rexec
1
0
Fork 0
mirror of https://github.com/house-of-vanity/rexec.git synced 2025-07-07 00:54:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed brace expansion

Browse Source
This commit is contained in:
Alexandr Bogomyakov
2023-08-23 21:33:14 +03:00
parent 3cf1e79883
commit 98c48af331
2 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PKGBUILD
View File

@ -1,6 +1,6 @@
# Maintainer: AB <gh@hexor.ru> # Maintainer: AB <gh@hexor.ru>
pkgname=rexec pkgname=rexec
pkgver=1.0.1.r9.g0d95364 pkgver=1.0.4.r0.g3cf1e79
pkgrel=1 pkgrel=1
pkgdesc="Parallel SSH executor" pkgdesc="Parallel SSH executor"
url="https://github.com/house-of-vanity/rexec" url="https://github.com/house-of-vanity/rexec"

41
src/main.rs
View File

@ -24,7 +24,11 @@ struct Args {
#[arg(short, long, default_value_t = whoami::username())] #[arg(short, long, default_value_t = whoami::username())]
username: String, username: String,
#[arg(short, long, help = "Use known_hosts to build servers list instead of string expansion.")] #[arg(
short,
long,
help = "Use known_hosts to build servers list instead of string expansion."
)]
known_hosts: bool, known_hosts: bool,
#[arg( #[arg(
@ -91,20 +95,26 @@ fn expand_string(s: &str) -> Vec<Host> {
while let Some(r) = result.iter().find(|s| s.contains('[')) { while let Some(r) = result.iter().find(|s| s.contains('[')) {
let r = r.clone(); let r = r.clone();
let start = r.find(']').unwrap(); let start = r.find('[').unwrap();
let end = match r.find(']') { let end = match r[start..].find(']') {
None => { None => {
error!("Error parsing host expression. Wrong range expansion '[a:b]'"); error!("Error parsing host expression. Wrong range expansion '[a:b]'");
process::exit(1); process::exit(1);
} }
Some(s) => s Some(s) => s + start,
}; };
let colon = r.find(':').unwrap(); let colon = match r[start..end].find(':') {
let low = r[start+1..colon].parse::<i32>().unwrap(); None => {
let high = r[colon+1..end].parse::<i32>().unwrap(); error!("Error parsing host expression. Missing colon in range expansion '[a:b]'");
process::exit(1);
}
Some(c) => c + start,
};
let low = r[start + 1..colon].parse::<i32>().unwrap();
let high = r[colon + 1..end].parse::<i32>().unwrap();
result.retain(|s| s != &r); result.retain(|s| s != &r);
for val in expand_range(low, high) { for val in expand_range(low, high) {
let new_str = format!("{}{}{}", &r[..start], val, &r[end+1..]); let new_str = format!("{}{}{}", &r[..start], val, &r[end + 1..]);
result.push(new_str); result.push(new_str);
} }
} }
@ -117,12 +127,12 @@ fn expand_string(s: &str) -> Vec<Host> {
error!("Error parsing host expression. Wrong range expansion '{{one,two}}'"); error!("Error parsing host expression. Wrong range expansion '{{one,two}}'");
process::exit(1); process::exit(1);
} }
Some(s) => s Some(s) => s,
}; };
let list = &r[start+1..end]; let list = &r[start + 1..end];
result.retain(|s| s != &r); result.retain(|s| s != &r);
for val in expand_list(list) { for val in expand_list(list) {
let new_str = format!("{}{}{}", &r[..start], val, &r[end+1..]); let new_str = format!("{}{}{}", &r[..start], val, &r[end + 1..]);
result.push(new_str); result.push(new_str);
} }
} }
@ -136,7 +146,6 @@ fn expand_string(s: &str) -> Vec<Host> {
hosts hosts
} }
fn main() { fn main() {
env_logger::Builder::from_env(Env::default().default_filter_or("info")) env_logger::Builder::from_env(Env::default().default_filter_or("info"))
.format_timestamp(None) .format_timestamp(None)
@ -172,7 +181,13 @@ fn main() {
let mut massh_hosts: Vec<MasshHostConfig> = vec![]; let mut massh_hosts: Vec<MasshHostConfig> = vec![];
let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new(); let mut hosts_and_ips: HashMap<IpAddr, String> = HashMap::new();
if args.parallel != 100 { if args.parallel != 100 {
warn!("Parallelism: {} thread{}", &args.parallel, {if args.parallel != 1 {"s."} else {"."}}); warn!("Parallelism: {} thread{}", &args.parallel, {
if args.parallel != 1 {
"s."
} else {
"."
}
});
} }
info!("Matched hosts:"); info!("Matched hosts:");