Merge pull request #2 from cryptidtech/ml/repl

Add new REPL to CLI when no command is given

Author: dhuseby

.gitignore

@@ -12,3 +12,4 @@ Cargo.lock
 
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
+.idea/

cli/Cargo.toml

@@ -21,6 +21,8 @@ async-trait = "0.1"
 best-practices.workspace = true
 bs.workspace = true
 clap = { version = "4.5.36", features = ["cargo"] }
+colored = "3.0.0"
+csv = "1.3.1"
 directories = "6.0.0"
 ed25519-dalek = "2.1.1"
 elliptic-curve.workspace = true
@@ -36,6 +38,7 @@ provenance-log.workspace = true
 rand.workspace = true
 rand_core_6.workspace = true
 rng.workspace = true
+rustyline = { version = "15.0.0", features = ["derive"] }
 serde = { workspace = true, optional = true }
 serde_cbor.workspace = true
 serde_json.workspace = true

cli/src/bin/bs.rs

@@ -54,34 +54,7 @@ struct Opt {
 
     /// Subcommand
     #[structopt(subcommand)]
-    cmd: Command,
-}
-
-#[derive(Debug, StructOpt)]
-enum Command {
-    /// Config commands
-    #[structopt(name = "config")]
-    Config {
-        /// Config sub-command
-        #[structopt(subcommand)]
-        cmd: Option<subcmds::config::Command>,
-    },
-    /*
-    /// Key operations
-    #[structopt(name = "key")]
-    Key {
-        /// Key subcommand
-        #[structopt(subcommand)]
-        cmd: KeyCommand,
-    },
-    */
-    /// Provenance log operations
-    #[structopt(name = "plog")]
-    Plog {
-        /// Provenance log subcommand
-        #[structopt(subcommand)]
-        cmd: Box<subcmds::plog::Command>,
-    },
+    cmd: Option<Command>,
 }
 
 /*
@@ -114,10 +87,13 @@ async fn main() -> Result<(), Error> {
     let config = Config::from_path(opt.config, opt.keyfile, opt.sshagent, opt.sshagentenv)?;
 
     let ret = match opt.cmd {
-        // process a config command
-        Command::Config { cmd } => subcmds::config::go(cmd, &config).await,
-        // process a plog command
-        Command::Plog { cmd } => subcmds::plog::go(*cmd, &config).await,
+        Some(cmd) => match cmd {
+            // process a config command
+            Command::Config { cmd } => subcmds::config::go(cmd, &config).await,
+            // process a plog command
+            Command::Plog { cmd } => subcmds::plog::go(*cmd, &config).await,
+        },
+        None => repl::ReplHelper::run().await,
     };
 
     if let Err(ref e) = ret {

cli/src/cmds.rs

@@ -0,0 +1,30 @@
+use crate::subcmds;
+use structopt::StructOpt;
+
+/// CLI commands for BetterSign
+#[derive(Debug, StructOpt)]
+pub enum Command {
+    /// Config commands
+    #[structopt(name = "config")]
+    Config {
+        /// Config sub-command
+        #[structopt(subcommand)]
+        cmd: Option<subcmds::config::Command>,
+    },
+    /*
+    /// Key operations
+    #[structopt(name = "key")]
+    Key {
+        /// Key subcommand
+        #[structopt(subcommand)]
+        cmd: KeyCommand,
+    },
+    */
+    /// Provenance log operations
+    #[structopt(name = "plog")]
+    Plog {
+        /// Provenance log subcommand
+        #[structopt(subcommand)]
+        cmd: Box<subcmds::plog::Command>,
+    },
+}

cli/src/error.rs

@@ -67,6 +67,10 @@ pub enum Error {
     #[error("Deserialization error: {0}")]
     Deserialization(String),
 
+    /// Rustyline error
+    #[error(transparent)]
+    RustylineReadLineError(#[from] rustyline::error::ReadlineError),
+
     /// No valid application config path found
     #[error("No valid config path found")]
     NoHome,

cli/src/keychain.rs

@@ -39,16 +39,28 @@ impl fmt::Display for KeyEntry {
             msg.push_str(&format!("╭──── pubkey  {}\n", kh));
             msg.push_str(&format!("├───── codec  {}\n", self.pubkey.codec()));
             msg.push_str(&format!("├─── comment  {}\n", self.pubkey.comment));
-            msg.push_str(&format!("├─ threshold  {} of {}\n", self.threshold, self.secret_keys.len()));
+            msg.push_str(&format!(
+                "├─ threshold  {} of {}\n",
+                self.threshold,
+                self.secret_keys.len()
+            ));
             msg.push_str("╰─┬── shares\n");
             for i in (0..self.secret_keys.len()).rev() {
                 let skh = {
                     let cv = self.secret_keys[i].conv_view().unwrap();
                     let pk = cv.to_public_key().unwrap();
                     let fv = pk.fingerprint_view().unwrap();
-                    EncodedMultihash::new(Base::Base32Lower, fv.fingerprint(Codec::Sha3256).unwrap())
+                    EncodedMultihash::new(
+                        Base::Base32Lower,
+                        fv.fingerprint(Codec::Sha3256).unwrap(),
+                    )
                 };
-                let key = format!("{} / {}  {}", (self.secret_keys.len() - i), self.secret_keys.len(), skh);
+                let key = format!(
+                    "{} / {}  {}",
+                    (self.secret_keys.len() - i),
+                    self.secret_keys.len(),
+                    skh
+                );
                 if i == 0 {
                     msg.push_str(&format!("  ╰─── {}\n", key));
                 } else {

cli/src/lib.rs

@@ -36,6 +36,14 @@ pub use ssh_agent::SshAgent;
 
 /// cli subcommands
 pub mod subcmds;
+
+/// cli commands
+pub mod cmds;
+pub use cmds::Command;
+
+/// cli repl
+pub mod repl;
+
 pub use subcmds::prelude::*;
 
 /// ...and in the darkness bind them