blah/blahrs
1
0
Fork 0
mirror of https://github.com/Blah-IM/blahrs.git synced 2025-05-01 08:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow using userkey literal in ctl commands

Browse source
This commit is contained in:
oxalica 2024-08-26 23:45:56 -04:00
parent bcfac0c6b6
commit 482432758c
3 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -249,6 +249,7 @@ dependencies = [
"blah", "blah",
"clap", "clap",
"ed25519-dalek", "ed25519-dalek",
"hex",
"rand", "rand",
"reqwest", "reqwest",
"rusqlite", "rusqlite",

1
blahctl/Cargo.toml
View file

@ -9,6 +9,7 @@ bitflags = "2.6.0"
blah.path = ".." blah.path = ".."
clap = { version = "4.5.16", features = ["derive"] } clap = { version = "4.5.16", features = ["derive"] }
ed25519-dalek = { version = "2.1.1", features = ["pkcs8", "pem", "rand_core"] } ed25519-dalek = { version = "2.1.1", features = ["pkcs8", "pem", "rand_core"] }
hex = "0.4"
rand = "0.8.5" rand = "0.8.5"
reqwest = { version = "0.12.7", features = ["json"] } reqwest = { version = "0.12.7", features = ["json"] }
rusqlite = "0.32.1" rusqlite = "0.32.1"

25
blahctl/src/main.rs
View file

@ -7,7 +7,7 @@ use bitflags::Flags;
use blah::types::{ChatPayload, CreateRoomPayload, ServerPermission, UserKey, WithSig}; use blah::types::{ChatPayload, CreateRoomPayload, ServerPermission, UserKey, WithSig};
use ed25519_dalek::pkcs8::spki::der::pem::LineEnding; use ed25519_dalek::pkcs8::spki::der::pem::LineEnding;
use ed25519_dalek::pkcs8::{DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey}; use ed25519_dalek::pkcs8::{DecodePrivateKey, DecodePublicKey, EncodePrivateKey, EncodePublicKey};
use ed25519_dalek::{SigningKey, VerifyingKey}; use ed25519_dalek::{SigningKey, VerifyingKey, PUBLIC_KEY_LENGTH};
use rand::rngs::OsRng; use rand::rngs::OsRng;
use reqwest::Url; use reqwest::Url;
use rusqlite::{named_params, Connection}; use rusqlite::{named_params, Connection};
@ -65,7 +65,7 @@ enum DbCommand {
fn flag_parser<T: Flags>(s: &str) -> clap::error::Result<T> { fn flag_parser<T: Flags>(s: &str) -> clap::error::Result<T> {
bitflags::parser::from_str_strict(s) bitflags::parser::from_str_strict(s)
.map_err(|_| clap::error::Error::new(clap::error::ErrorKind::InvalidValue)) .map_err(|_| clap::Error::new(clap::error::ErrorKind::InvalidValue))
} }
#[derive(Debug, clap::Subcommand)] #[derive(Debug, clap::Subcommand)]
@ -95,18 +95,33 @@ enum ApiCommand {
#[derive(Debug, clap::Args)] #[derive(Debug, clap::Args)]
#[clap(group = clap::ArgGroup::new("user").required(true).multiple(false))] #[clap(group = clap::ArgGroup::new("user").required(true).multiple(false))]
struct User { struct User {
/// The path to a user public key. /// Hex-encoded public key.
#[arg(long, group = "user", value_parser = userkey_parser)]
key: Option<VerifyingKey>,
/// Path to a user public key.
#[arg(long, short = 'f', group = "user")] #[arg(long, short = 'f', group = "user")]
public_key_file: Option<PathBuf>, public_key_file: Option<PathBuf>,
/// The user domain where `/.well-known/blah/key` is hosted. /// User's URL where `/.well-known/blah/key` is hosted.
#[arg(long, group = "user")] #[arg(long, group = "user")]
url: Option<Url>, url: Option<Url>,
} }
fn userkey_parser(s: &str) -> clap::error::Result<VerifyingKey> {
(|| {
let mut buf = [0u8; PUBLIC_KEY_LENGTH];
hex::decode_to_slice(s, &mut buf).ok()?;
VerifyingKey::from_bytes(&buf).ok()
})()
.ok_or_else(|| clap::Error::new(clap::error::ErrorKind::InvalidValue))
}
impl User { impl User {
async fn fetch_key(&self) -> Result<UserKey> { async fn fetch_key(&self) -> Result<UserKey> {
let rawkey = if let Some(path) = &self.public_key_file { let rawkey = if let Some(key) = &self.key {
return Ok(UserKey(key.to_bytes()));
} else if let Some(path) = &self.public_key_file {
fs::read_to_string(path).context("failed to read key file")? fs::read_to_string(path).context("failed to read key file")?
} else if let Some(url) = &self.url { } else if let Some(url) = &self.url {
let url = url.join(KEY_URL_SUBPATH)?; let url = url.join(KEY_URL_SUBPATH)?;