2 Commits

Author SHA1 Message Date
AB
3ca8e27ded Bump version in Cargo.toml 2024-09-25 15:40:40 +03:00
AB
2b7b3b9a22 Fix help text. Added nix-shell to build locally 2024-09-25 15:24:21 +03:00
3 changed files with 30 additions and 19 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "khm"
version = "0.2.0"
version = "0.2.1"
edition = "2021"
authors = ["AB <ab@hexor.cy>", "ChatGPT-4o"]
@ -15,4 +15,4 @@ tokio = { version = "1", features = ["full"] }
tokio-postgres = { version = "0.7", features = ["with-chrono-0_4"] }
clap = { version = "4", features = ["derive"] }
chrono = "0.4.38"
reqwest = { version = "0.12", features = ["json"] }
reqwest = { version = "0.12", features = ["json"] }

11
shell.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
buildInputs = [
pkgs.openssl
pkgs.pkg-config
];
shellHook = ''
unset OPENSSL_DIR
'';
}

View File

@ -20,11 +20,26 @@ use log::{error, info};
khm --server --ip 0.0.0.0 --port 1337 --db-host psql.psql.svc --db-name khm --db-user admin --db-password <SECRET> --flows work,home\n\
\n\
Running in client mode to send diff and sync ~/.ssh/known_hosts with remote flow in place:\n\
khm --host http://kh.example.com:8080 --known-hosts ~/.ssh/known_hosts --in-place\n\
khm --host https://khm.example.com/default/keys --known-hosts ~/.ssh/known_hosts --in-place\n\
\n\
"
)]
struct Args {
/// Run in server mode (default: false)
#[arg(long, help = "Run in server mode")]
server: bool,
/// Update the known_hosts file with keys from the server after sending keys (default: false)
#[arg(
long,
help = "Server mode: Sync the known_hosts file with keys from the server"
)]
in_place: bool,
/// Comma-separated list of flows to manage (default: default)
#[arg(long, default_value = "default", value_parser, num_args = 1.., value_delimiter = ',', help = "Server mode: Comma-separated list of flows to manage")]
flows: Vec<String>,
/// IP address to bind the server or client to (default: 127.0.0.1)
#[arg(
short,
@ -79,14 +94,10 @@ struct Args {
#[arg(
long,
required_if_eq("server", "false"),
help = "Client mode: Host address of the server to connect to"
help = "Client mode: Full host address of the server to connect to. Like https://khm.example.com/flow_name/keys"
)]
host: Option<String>,
/// Run in server mode (default: false)
#[arg(long, help = "Run in server mode")]
server: bool,
/// Path to the known_hosts file (default: ~/.ssh/known_hosts)
#[arg(
long,
@ -94,17 +105,6 @@ struct Args {
help = "Client mode: Path to the known_hosts file"
)]
known_hosts: String,
/// Update the known_hosts file with keys from the server after sending keys (default: false)
#[arg(
long,
help = "Server mode: Sync the known_hosts file with keys from the server"
)]
in_place: bool,
/// Comma-separated list of flows to manage (default: default)
#[arg(long, default_value = "default", value_parser, num_args = 1.., value_delimiter = ',', help = "Comma-separated list of flows to manage")]
flows: Vec<String>,
}
#[actix_web::main]