mirror of
https://github.com/danbulant/Portfolio
synced 2026-05-27 14:02:14 +00:00
Merge pull request #22 from EETagent/recovery_cli
This commit is contained in:
commit
ee3d3cfcb1
4 changed files with 227 additions and 4 deletions
41
Cargo.lock
generated
41
Cargo.lock
generated
|
|
@ -409,7 +409,7 @@ dependencies = [
|
||||||
"atty",
|
"atty",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"clap_derive",
|
"clap_derive",
|
||||||
"clap_lex",
|
"clap_lex 0.2.4",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
"strsim",
|
"strsim",
|
||||||
|
|
@ -417,6 +417,20 @@ dependencies = [
|
||||||
"textwrap",
|
"textwrap",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap"
|
||||||
|
version = "4.0.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0eb41c13df48950b20eb4cd0eefa618819469df1bffc49d11e8487c4ba0037e5"
|
||||||
|
dependencies = [
|
||||||
|
"atty",
|
||||||
|
"bitflags",
|
||||||
|
"clap_lex 0.3.0",
|
||||||
|
"once_cell",
|
||||||
|
"strsim",
|
||||||
|
"termcolor",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "clap_derive"
|
name = "clap_derive"
|
||||||
version = "3.2.18"
|
version = "3.2.18"
|
||||||
|
|
@ -439,6 +453,15 @@ dependencies = [
|
||||||
"os_str_bytes",
|
"os_str_bytes",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "clap_lex"
|
||||||
|
version = "0.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8"
|
||||||
|
dependencies = [
|
||||||
|
"os_str_bytes",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "codespan-reporting"
|
name = "codespan-reporting"
|
||||||
version = "0.11.1"
|
version = "0.11.1"
|
||||||
|
|
@ -1852,6 +1875,18 @@ dependencies = [
|
||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "portfolio-cli"
|
||||||
|
version = "0.1.0"
|
||||||
|
dependencies = [
|
||||||
|
"clap 4.0.23",
|
||||||
|
"portfolio-core",
|
||||||
|
"portfolio-entity",
|
||||||
|
"sea-orm",
|
||||||
|
"tokio",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "portfolio-core"
|
name = "portfolio-core"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
|
|
@ -2339,7 +2374,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "882af0d4cd3d6cc2f427d14a48e9f468b37c563b405ea486fd314ba18ca334d0"
|
checksum = "882af0d4cd3d6cc2f427d14a48e9f468b37c563b405ea486fd314ba18ca334d0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"clap",
|
"clap 3.2.23",
|
||||||
"dotenvy",
|
"dotenvy",
|
||||||
"regex",
|
"regex",
|
||||||
"sea-schema",
|
"sea-schema",
|
||||||
|
|
@ -2368,7 +2403,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "86fe6e594b078712e1e797b951b9b56e55d3cfa04aac8ea76eb4bed7c94c5910"
|
checksum = "86fe6e594b078712e1e797b951b9b56e55d3cfa04aac8ea76eb4bed7c94c5910"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"clap",
|
"clap 3.2.23",
|
||||||
"dotenvy",
|
"dotenvy",
|
||||||
"sea-orm",
|
"sea-orm",
|
||||||
"sea-orm-cli",
|
"sea-orm-cli",
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ edition = "2021"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
members = [".", "api", "core", "entity", "migration"]
|
members = [".", "api", "core", "entity", "migration", "cli"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
portfolio-api = { path = "api" }
|
portfolio-api = { path = "api" }
|
||||||
|
|
|
||||||
26
cli/Cargo.toml
Normal file
26
cli/Cargo.toml
Normal file
|
|
@ -0,0 +1,26 @@
|
||||||
|
[package]
|
||||||
|
name = "portfolio-cli"
|
||||||
|
version = "0.1.0"
|
||||||
|
edition = "2021"
|
||||||
|
publish = false
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
url = "^2.3"
|
||||||
|
clap = { version = "^4.0", features = ["cargo"] }
|
||||||
|
|
||||||
|
portfolio-entity = { path = "../entity" }
|
||||||
|
portfolio-core = { path = "../core" }
|
||||||
|
|
||||||
|
[dependencies.tokio]
|
||||||
|
version = "^1.21"
|
||||||
|
features = [
|
||||||
|
"macros",
|
||||||
|
]
|
||||||
|
|
||||||
|
[dependencies.sea-orm]
|
||||||
|
version = "^0.10"
|
||||||
|
features = [
|
||||||
|
"sqlx-sqlite",
|
||||||
|
# TODO: Migrate to rustls for better compatibility with various OS
|
||||||
|
"runtime-tokio-native-tls"
|
||||||
|
]
|
||||||
162
cli/src/main.rs
Normal file
162
cli/src/main.rs
Normal file
|
|
@ -0,0 +1,162 @@
|
||||||
|
use std::path::PathBuf;
|
||||||
|
use url::Url;
|
||||||
|
|
||||||
|
use clap::{arg, command, value_parser, ArgAction, Command};
|
||||||
|
use sea_orm::{Database, DatabaseConnection};
|
||||||
|
|
||||||
|
use ::entity::candidate::Entity as Candidate;
|
||||||
|
use ::entity::parent::Entity as Parent;
|
||||||
|
use sea_orm::*;
|
||||||
|
|
||||||
|
#[tokio::main]
|
||||||
|
async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
|
let clap = command!()
|
||||||
|
.propagate_version(true)
|
||||||
|
.subcommand_required(true)
|
||||||
|
.arg_required_else_help(true)
|
||||||
|
.subcommand(
|
||||||
|
Command::new("portfolio")
|
||||||
|
.about("Database & Portfolio operations")
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-d --database <URL> "URL to the database or sql file with postgres:// or sqlite://"
|
||||||
|
)
|
||||||
|
.alias("url")
|
||||||
|
.required(true)
|
||||||
|
.value_parser(value_parser!(Url)),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-p --portfolio <PATH> "Path to the portfolio root"
|
||||||
|
)
|
||||||
|
.required(true)
|
||||||
|
.value_parser(value_parser!(PathBuf)),
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-k --key <KEY> "AGE private key for decryption"
|
||||||
|
)
|
||||||
|
.required(true),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.subcommand(
|
||||||
|
Command::new("hash")
|
||||||
|
.about("Hash operations")
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-i --input <INPUT> "Plaintext to hash"
|
||||||
|
)
|
||||||
|
.required(true)
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.subcommand(
|
||||||
|
Command::new("symmetric")
|
||||||
|
.about("Symmetric encryption operations")
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-d --decrypt ... "Decrypt flag"
|
||||||
|
)
|
||||||
|
.action(ArgAction::SetTrue)
|
||||||
|
.required(false)
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-i --input <INPUT> "Plaintext to encrypt/decrypt"
|
||||||
|
)
|
||||||
|
.required(true)
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-k --key <KEY> "Key for encryption/decryption"
|
||||||
|
)
|
||||||
|
.required(true),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.subcommand(
|
||||||
|
Command::new("asymmetric")
|
||||||
|
.about("Asymmetric encryption operations")
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-d --decrypt ... "Decrypt flag"
|
||||||
|
)
|
||||||
|
.action(ArgAction::SetTrue)
|
||||||
|
.required(false)
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-i --input <INPUT> "Plaintext to encrypt/decrypt"
|
||||||
|
)
|
||||||
|
.required(true)
|
||||||
|
)
|
||||||
|
.arg(
|
||||||
|
arg!(
|
||||||
|
-k --key <KEY> "Public key / Private key"
|
||||||
|
)
|
||||||
|
.required(true),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.get_matches();
|
||||||
|
|
||||||
|
match clap.subcommand() {
|
||||||
|
Some(("portfolio", sub_matches)) => {
|
||||||
|
let sqlite_url = sub_matches.get_one::<Url>("database").unwrap();
|
||||||
|
|
||||||
|
println!("Connecting to {:?}", sqlite_url);
|
||||||
|
|
||||||
|
if sqlite_url.scheme() != "sqlite" && sqlite_url.scheme() != "postgres" {
|
||||||
|
return Err("URL scheme postgres:// or sqlite:// required")?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let db: DatabaseConnection = Database::connect(sqlite_url.as_str()).await?;
|
||||||
|
|
||||||
|
let entries = Candidate::find()
|
||||||
|
.join_rev(
|
||||||
|
JoinType::InnerJoin,
|
||||||
|
Parent::belongs_to(Candidate)
|
||||||
|
.from(::entity::parent::Column::Application)
|
||||||
|
.to(::entity::candidate::Column::Application)
|
||||||
|
.into(),
|
||||||
|
)
|
||||||
|
.all(&db)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
println!("Found {} entries", entries.len());
|
||||||
|
}
|
||||||
|
Some(("hash", sub_matches)) => {
|
||||||
|
let input = sub_matches.get_one::<String>("input").unwrap();
|
||||||
|
|
||||||
|
let hash = portfolio_core::crypto::hash_password(input.to_string()).await?;
|
||||||
|
|
||||||
|
println!("{}", hash);
|
||||||
|
}
|
||||||
|
Some(("symmetric", sub_matches)) => {
|
||||||
|
let decrypt = sub_matches.get_one::<bool>("decrypt").unwrap();
|
||||||
|
let input = sub_matches.get_one::<String>("input").unwrap();
|
||||||
|
let key = sub_matches.get_one::<String>("key").unwrap();
|
||||||
|
|
||||||
|
let result = if !*decrypt {
|
||||||
|
portfolio_core::crypto::encrypt_password(input.to_string(), key.to_string()).await?
|
||||||
|
} else {
|
||||||
|
portfolio_core::crypto::decrypt_password(input.to_string(), key.to_string()).await?
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("{}", result);
|
||||||
|
}
|
||||||
|
Some(("asymmetric", sub_matches)) => {
|
||||||
|
let decrypt = sub_matches.get_one::<bool>("decrypt").unwrap();
|
||||||
|
let input = sub_matches.get_one::<String>("input").unwrap();
|
||||||
|
let key = sub_matches.get_one::<String>("key").unwrap();
|
||||||
|
|
||||||
|
let result = if !*decrypt {
|
||||||
|
portfolio_core::crypto::encrypt_password_with_recipients(input, &vec![key]).await?
|
||||||
|
} else {
|
||||||
|
portfolio_core::crypto::decrypt_password_with_private_key(input, key).await.map_err(|e| e.to_string())?
|
||||||
|
};
|
||||||
|
|
||||||
|
println!("{}", result);
|
||||||
|
}
|
||||||
|
_ => unreachable!("Exhausted list of subcommands and subcommand_required prevents `None`"),
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue