feat(core,gen-cli): add utils to generate device bundle use it in gen…

…-cli

this works for v2 configs for now as that's what is still used on
holoports as of now. even though that's about to change in the
short-term, it might come in handy to generate v2 configs to test the
tranisitioning to v3 configs.

core/Cargo.toml

@@ -21,6 +21,10 @@ serde = { workspace = true }
 url = "2.1.0"
 base36 = "=0.0.1"
 
+tokio = { version = "1.12.0", features = [ "full" ] }
+hc_seed_bundle = "0.2.3"
+sodoken = "=0.0.11"
+
 [dependencies.argon2min]
 git = "https://github.com/Holo-Host/argon2min"
 rev = "28e765e4369e19bc0126bb46acaacadf1303de22"

core/src/lib.rs

@@ -1,4 +1,5 @@
 pub mod config;
 pub mod public_key;
+pub mod utils;
 
 pub use config::{admin_keypair_from, Config};

core/src/utils.rs

@@ -0,0 +1,25 @@
+/// Generate a new device bundle and lock it with the given passphrase.
+pub fn generate_device_bundle(
+    passphrase: &str,
+    maybe_derivation_path: Option<u32>,
+) -> Result<Box<[u8]>, failure::Error> {
+    let rt = tokio::runtime::Runtime::new()?;
+    let passphrase = sodoken::BufRead::from(passphrase.as_bytes());
+    rt.block_on(async move {
+        let master = hc_seed_bundle::UnlockedSeedBundle::new_random()
+            .await
+            .unwrap();
+
+        let derivation_path = maybe_derivation_path.unwrap_or(DEFAULT_DERIVATION_PATH_V2);
+
+        let device_bundle = master.derive(derivation_path).await.unwrap();
+        device_bundle
+            .lock()
+            .add_pwhash_cipher(passphrase)
+            .lock()
+            .await
+    })
+    .map_err(Into::into)
+}
+
+pub const DEFAULT_DERIVATION_PATH_V2: u32 = 3;

core/tests/configuration.rs

@@ -40,13 +40,18 @@ mod tests {
         let revocation_pub_key = VerifyingKey::from_bytes(&rev_key_bytes).unwrap();
         let holoport_id_bytes = holoport_id[0..32].try_into().unwrap();
         let holoport_id = VerifyingKey::from_bytes(&holoport_id_bytes).unwrap();
-        let hpos_config = Config::new(
+        let hpos_config = Config::new_v2(
+            // email: String,
             email.clone(),
+            // password: String,
             password,
+            // registration_code: String,
             registration_code,
-            revocation_pub_key,
+            // derivation_path: String,
             device_derivation_path.to_string(),
-            device_bundle_base64.clone(),
+            // device_bundle: String,
+            device_bundle_base64,
+            // device_pub_key: VerifyingKey,
             holoport_id,
         )
         .unwrap();

gen-cli/Cargo.toml

@@ -17,3 +17,4 @@ rand = "0.8.5"
 serde = { workspace = true }
 serde_json = { workspace = true }
 sha2 = "0.8"
+base64 = { workspace = true }

gen-cli/src/main.rs

@@ -9,7 +9,7 @@ use sha2::{Digest, Sha512Trunc256};
 use std::{env, fs::File, io, path::PathBuf};
 
 const USAGE: &str = "
-Usage: hpos-config-gen-cli --email EMAIL --password STRING --registration-code STRING --derivation-path STRING --device-bundle STRING [--seed-from PATH]
+Usage: hpos-config-gen-cli --email EMAIL --password STRING --registration-code STRING [--derivation-path NUMBER] [--device-bundle STRING] [--seed-from PATH]
        hpos-config-gen-cli --help
 
 Creates HoloPortOS config file that contains seed and admin email/password.
@@ -18,7 +18,7 @@ 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
+  --derivation-path NUMBER      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
 ";
@@ -29,8 +29,8 @@ struct Args {
     flag_password: String,
     flag_registration_code: String,
     flag_revocation_pub_key: VerifyingKey,
-    flag_derivation_path: String,
-    flag_device_bundle: String,
+    flag_derivation_path: Option<u32>,
+    flag_device_bundle: Option<String>,
     flag_seed_from: Option<PathBuf>,
 }
 
@@ -51,15 +51,36 @@ fn main() -> Result<(), Error> {
         }
     };
 
+    let derivation_path = if let Some(derivation_path) = args.flag_derivation_path {
+        derivation_path
+    } else {
+        hpos_config_core::utils::DEFAULT_DERIVATION_PATH_V2
+    };
+
+    let device_bundle = if let Some(device_bundle) = args.flag_device_bundle {
+        device_bundle
+    } else {
+        let passphrase = "pass";
+        let locked_device_bundle_encoded_bytes =
+            hpos_config_core::utils::generate_device_bundle(passphrase, Some(derivation_path))?;
+
+        base64::encode(&locked_device_bundle_encoded_bytes)
+    };
+
     let secret_key = SigningKey::from_bytes(&seed);
 
-    let (config, public_key) = Config::new(
+    let (config, public_key) = Config::new_v2(
+        // email: String,
         args.flag_email,
+        // password: String,
         args.flag_password,
+        // registration_code: String,
         args.flag_registration_code,
-        args.flag_revocation_pub_key,
-        args.flag_derivation_path,
-        args.flag_device_bundle,
+        // derivation_path: String,
+        derivation_path.to_string(),
+        // device_bundle: String,
+        device_bundle,
+        // device_pub_key: VerifyingKey,
         VerifyingKey::from(&secret_key),
     )?;
     eprintln!("{}", public_key::to_url(&public_key)?);