Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added missing v3 implementation #131

Merged
merged 4 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 123 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions core/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@ impl Config {
))
}

pub fn email(&self) -> String {
match self {
Config::V1 { settings, .. }
| Config::V2 { settings, .. }
| Config::V3 { settings, .. } => settings.admin.email.clone(),
}
}

pub fn admin_public_key(&self) -> VerifyingKey {
match self {
Config::V1 { settings, .. }
Expand Down
1 change: 1 addition & 0 deletions gen-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ rand = "0.8.5"
serde = { workspace = true }
serde_json = { workspace = true }
sha2 = "0.8"
clap = { version = "4.5.16", features = ["derive"] }
101 changes: 64 additions & 37 deletions gen-cli/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,45 +1,65 @@
use hpos_config_core::{config::Seed, public_key, Config};

use docopt::Docopt;
use clap::Parser;
use ed25519_dalek::*;
use failure::Error;
use rand::Rng;
use serde::*;
use sha2::{Digest, Sha512Trunc256};
use std::{env, fs::File, io, path::PathBuf};
use std::{fs::File, io};

const USAGE: &str = "
Usage: hpos-config-gen-cli --email EMAIL --password STRING --registration-code STRING --derivation-path STRING --device-bundle STRING [--seed-from PATH]
hpos-config-gen-cli --help

Creates HoloPortOS config file that contains seed and admin email/password.

Options:
--email EMAIL HoloPort admin email address
--password STRING HoloPort admin password
--registration-code CODE HoloPort admin password
--derivation-path STRING Derivation path of the seed
--device-bundle STRING Device Bundle
--seed-from PATH Use SHA-512 hash of given file truncated to 256 bits as seed
";

#[derive(Deserialize)]
struct Args {
flag_email: String,
flag_password: String,
flag_registration_code: String,
flag_revocation_pub_key: VerifyingKey,
flag_derivation_path: String,
flag_device_bundle: String,
flag_seed_from: Option<PathBuf>,
#[derive(Parser, Clone)]
#[command(about = "Creates HoloPortOS config file that contains seed and admin email/password.")]
struct ClapArgs {
#[arg(
long,
value_parser,
value_name = "EMAIL",
help = "HoloPort admin email address"
)]
email: String,
#[arg(
long,
value_parser,
value_name = "PASSWORD",
help = "HoloPort admin password"
)]
password: String,
#[arg(
long,
value_parser,
value_name = "CODE",
help = "HoloPort registration code"
)]
registration_code: String,
#[arg(long, value_parser, value_name = "STRING", help = "Revocation key")]
revocation_key: Option<String>,
#[arg(
long,
value_parser,
value_name = "PATH",
help = "Derivation path of the seed"
)]
derivation_path: String,
#[arg(
long,
value_parser,
value_name = "STRING",
help = "HoloPort Device bundle"
)]
device_bundle: String,
#[arg(
long,
value_parser,
value_name = "PATH",
help = "Use SHA-512 hash of given file, truncated to 256 bits, as seed"
)]
seed_from: Option<String>,
}

fn main() -> Result<(), Error> {
let args: Args = Docopt::new(USAGE)
.and_then(|d| d.argv(env::args()).deserialize())
.unwrap_or_else(|e| e.exit());
let args = ClapArgs::parse();

let seed = match args.flag_seed_from {
let seed = match args.seed_from {
None => rand::thread_rng().gen::<Seed>(),
Some(path) => {
let mut hasher = Sha512Trunc256::new();
Expand All @@ -52,14 +72,21 @@ fn main() -> Result<(), Error> {
};

let secret_key = SigningKey::from_bytes(&seed);
let revocation_key = match &args.revocation_key {
None => VerifyingKey::from(&secret_key),
Some(rk) => {
let public_key_bytes: &[u8; PUBLIC_KEY_LENGTH] = rk.as_bytes().try_into()?;
VerifyingKey::from_bytes(public_key_bytes)?
}
};

let (config, public_key) = Config::new(
args.flag_email,
args.flag_password,
args.flag_registration_code,
args.flag_revocation_pub_key,
args.flag_derivation_path,
args.flag_device_bundle,
args.email,
args.password,
args.registration_code,
revocation_key,
args.derivation_path,
args.device_bundle,
VerifyingKey::from(&secret_key),
)?;
eprintln!("{}", public_key::to_url(&public_key)?);
Expand Down
12 changes: 10 additions & 2 deletions seed-encoder/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,16 @@ async fn main() -> Result<()> {
))?;
println!("{}", encrypt_key(&secret, &secret.verifying_key()));
}
// todo!("V3 not implemented"),
Config::V3 { .. } => todo!("V3 not implemented"),
Config::V3 { device_bundle, .. } => {
// take in password
let secret = unlock(&device_bundle, Some(password))
.await
.context(format!(
"unable to unlock the device bundle from {}",
&config_path.to_string_lossy()
))?;
println!("{}", encrypt_key(&secret, &secret.verifying_key()));
}
}

Ok(())
Expand Down
Loading