3 Commits
rust ... main

Author SHA1 Message Date
14a6bc6e3d catch connect error 2024-08-19 00:50:29 +02:00
1f3dcbbc08 print port, remove new line from authorized_keys2 file 2024-08-19 00:41:39 +02:00
51ccf1c848 update warnings 2024-07-10 00:27:26 +02:00

View File

@@ -23,7 +23,7 @@ fn upload_config(h: &Host) -> Result<String, String> {
let username = h.username.lock().unwrap().to_owned();
let private_key = PathBuf::from("/Users/toby/.ssh/id_ed25519");
let content = h.content.lock().unwrap();
let connection_string = format!("{}@{}", username, host);
let connection_string = format!("{}@{}:{}", username, host, port);
let addr: SocketAddr = match format!("{}:{}", host, port).to_socket_addrs() {
Ok(mut addrs) => addrs.nth(0).expect(format!("Invalid host/port in `{}:{}`", host, port).as_str()),
@@ -40,7 +40,10 @@ fn upload_config(h: &Host) -> Result<String, String> {
sess.set_tcp_stream(tcp);
sess.handshake().unwrap();
sess.userauth_pubkey_file(&username, None, &private_key, None).unwrap();
match sess.userauth_pubkey_file(&username, None, &private_key, None) {
Err(_) => return Err(connection_string),
_ => {}
}
let mut remote_file = match sess.scp_send(Path::new(".ssh").join("authorized_keys2").as_path(), 0o644, content.len() as u64, None) {
Ok(rf) => rf,
@@ -61,7 +64,7 @@ fn upload_config(h: &Host) -> Result<String, String> {
}
fn generate_authorized_keys(host_keys: Vec<String>) -> String {
format!("###\n# Warning this file has been generated and will be overwritten!\n###\n\n{}\n", host_keys.join("\n"))
format!("###\n# Warning this file has been generated and will be overwritten!\n###\n{}\n", host_keys.join("\n"))
}
fn main() {
@@ -78,7 +81,7 @@ fn main() {
if user_data.contains_key("groups") {
for group in user_data["groups"].as_slice() {
if !config.groups.contains_key(group) {
println!("WARNING: Key-group \"{}\" not found!", group);
eprintln!("\x1b[93mWARNING\x1b[0m: Key-group \"{}\" not found! Skipping...", group);
continue;
}
for key_name in config.groups[group].as_slice() {
@@ -92,7 +95,7 @@ fn main() {
if user_data.contains_key("keys") {
for key_name in user_data["keys"].as_slice() {
if !config.keys.contains_key(key_name) {
println!("WARNING: Key \"{}\" not found!", key_name);
eprintln!("\x1b[93mWARNING\x1b[0m: Key \"{}\" not found! Skipping...", key_name);
continue;
}
host_keys.push(config.keys.get(key_name).unwrap().to_string())