Add CLI parameters for disable/enable peer (#248)

* Add CLI parameters for disable/enable peer

Fixes tonarino/innernet#214.

* Formatting

* Remove redundant clones

* Require name for yes param

Yes param only makes sense if name is provided.

* Formatting

client/src/main.rs

@@ -10,9 +10,9 @@ use shared::{
     prompts,
     wg::{DeviceExt, PeerInfoExt},
     AddCidrOpts, AddDeleteAssociationOpts, AddPeerOpts, Association, AssociationContents, Cidr,
-    CidrTree, DeleteCidrOpts, Endpoint, EndpointContents, InstallOpts, Interface, IoErrorContext,
+    CidrTree, DeleteCidrOpts, EnableDisablePeerOpts, Endpoint, EndpointContents, InstallOpts,
-    ListenPortOpts, NatOpts, NetworkOpts, OverrideEndpointOpts, Peer, RedeemContents,
+    Interface, IoErrorContext, ListenPortOpts, NatOpts, NetworkOpts, OverrideEndpointOpts, Peer,
-    RenamePeerOpts, State, WrappedIoError, REDEEM_TRANSITION_WAIT,
+    RedeemContents, RenamePeerOpts, State, WrappedIoError, REDEEM_TRANSITION_WAIT,
 };
 use std::{
     fmt, io,
@@ -211,10 +211,20 @@ enum Command {
     },
 
     /// Disable an enabled peer
-    DisablePeer { interface: Interface },
+    DisablePeer {
+        interface: Interface,
+
+        #[clap(flatten)]
+        sub_opts: EnableDisablePeerOpts,
+    },
 
     /// Enable a disabled peer
-    EnablePeer { interface: Interface },
+    EnablePeer {
+        interface: Interface,
+
+        #[clap(flatten)]
+        sub_opts: EnableDisablePeerOpts,
+    },
 
     /// Add an association between CIDRs
     AddAssociation {
@@ -817,6 +827,7 @@ fn rename_peer(
 fn enable_or_disable_peer(
     interface: &InterfaceName,
     opts: &Opts,
+    sub_opts: EnableDisablePeerOpts,
     enable: bool,
 ) -> Result<(), Error> {
     let InterfaceConfig { server, .. } =
@@ -826,7 +837,7 @@ fn enable_or_disable_peer(
     log::info!("Fetching peers.");
     let peers: Vec<Peer> = api.http("GET", "/admin/peers")?;
 
-    if let Some(peer) = prompts::enable_or_disable_peer(&peers[..], enable)? {
+    if let Some(peer) = prompts::enable_or_disable_peer(&peers[..], &sub_opts, enable)? {
         let Peer { id, mut contents } = peer;
         contents.is_disabled = !enable;
         api.http_form("PUT", &format!("/admin/peers/{id}"), contents)?;
@@ -1245,8 +1256,14 @@ fn run(opts: &Opts) -> Result<(), Error> {
             sub_opts,
         } => delete_cidr(&interface, opts, sub_opts)?,
         Command::ListCidrs { interface, tree } => list_cidrs(&interface, opts, tree)?,
-        Command::DisablePeer { interface } => enable_or_disable_peer(&interface, opts, false)?,
+        Command::DisablePeer {
-        Command::EnablePeer { interface } => enable_or_disable_peer(&interface, opts, true)?,
+            interface,
+            sub_opts,
+        } => enable_or_disable_peer(&interface, opts, sub_opts, false)?,
+        Command::EnablePeer {
+            interface,
+            sub_opts,
+        } => enable_or_disable_peer(&interface, opts, sub_opts, true)?,
         Command::AddAssociation {
             interface,
             sub_opts,

server/src/main.rs

@@ -9,8 +9,8 @@ use parking_lot::{Mutex, RwLock};
 use rusqlite::Connection;
 use serde::{Deserialize, Serialize};
 use shared::{
-    get_local_addrs, AddCidrOpts, AddPeerOpts, DeleteCidrOpts, Endpoint, IoErrorContext,
+    get_local_addrs, AddCidrOpts, AddPeerOpts, DeleteCidrOpts, EnableDisablePeerOpts, Endpoint,
-    NetworkOpts, PeerContents, RenamePeerOpts, INNERNET_PUBKEY_HEADER,
+    IoErrorContext, NetworkOpts, PeerContents, RenamePeerOpts, INNERNET_PUBKEY_HEADER,
 };
 use std::{
     collections::{HashMap, VecDeque},
@@ -95,10 +95,20 @@ enum Command {
     },
 
     /// Disable an enabled peer
-    DisablePeer { interface: Interface },
+    DisablePeer {
+        interface: Interface,
+
+        #[clap(flatten)]
+        args: EnableDisablePeerOpts,
+    },
 
     /// Enable a disabled peer
-    EnablePeer { interface: Interface },
+    EnablePeer {
+        interface: Interface,
+
+        #[clap(flatten)]
+        args: EnableDisablePeerOpts,
+    },
 
     /// Rename an existing peer.
     RenamePeer {
@@ -271,11 +281,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         } => serve(*interface, &conf, routing).await?,
         Command::AddPeer { interface, args } => add_peer(&interface, &conf, args, opts.network)?,
         Command::RenamePeer { interface, args } => rename_peer(&interface, &conf, args)?,
-        Command::DisablePeer { interface } => {
+        Command::DisablePeer { interface, args } => {
-            enable_or_disable_peer(&interface, &conf, false, opts.network)?
+            enable_or_disable_peer(&interface, &conf, false, opts.network, args)?
         },
-        Command::EnablePeer { interface } => {
+        Command::EnablePeer { interface, args } => {
-            enable_or_disable_peer(&interface, &conf, true, opts.network)?
+            enable_or_disable_peer(&interface, &conf, true, opts.network, args)?
         },
         Command::AddCidr { interface, args } => add_cidr(&interface, &conf, args)?,
         Command::DeleteCidr { interface, args } => delete_cidr(&interface, &conf, args)?,
@@ -384,6 +394,7 @@ fn enable_or_disable_peer(
     conf: &ServerConfig,
     enable: bool,
     network: NetworkOpts,
+    opts: EnableDisablePeerOpts,
 ) -> Result<(), Error> {
     let conn = open_database_connection(interface, conf)?;
     let peers = DatabasePeer::list(&conn)?
@@ -391,7 +402,7 @@ fn enable_or_disable_peer(
         .map(|dp| dp.inner)
         .collect::<Vec<_>>();
 
-    if let Some(peer) = prompts::enable_or_disable_peer(&peers[..], enable)? {
+    if let Some(peer) = prompts::enable_or_disable_peer(&peers[..], &opts, enable)? {
         let mut db_peer = DatabasePeer::get(&conn, peer.id)?;
         db_peer.update(
             &conn,

shared/src/prompts.rs

@@ -1,8 +1,8 @@
 use crate::{
     interface_config::{InterfaceConfig, InterfaceInfo, ServerInfo},
     AddCidrOpts, AddDeleteAssociationOpts, AddPeerOpts, Association, Cidr, CidrContents, CidrTree,
-    DeleteCidrOpts, Endpoint, Error, Hostname, IpNetExt, ListenPortOpts, OverrideEndpointOpts,
+    DeleteCidrOpts, EnableDisablePeerOpts, Endpoint, Error, Hostname, IpNetExt, ListenPortOpts,
-    Peer, PeerContents, RenamePeerOpts, PERSISTENT_KEEPALIVE_INTERVAL_SECS,
+    OverrideEndpointOpts, Peer, PeerContents, RenamePeerOpts, PERSISTENT_KEEPALIVE_INTERVAL_SECS,
 };
 use anyhow::anyhow;
 use colored::*;
@@ -394,28 +394,41 @@ pub fn rename_peer(
 
 /// Presents a selection and confirmation of eligible peers for either disabling or enabling,
 /// and returns back the ID of the selected peer.
-pub fn enable_or_disable_peer(peers: &[Peer], enable: bool) -> Result<Option<Peer>, Error> {
+pub fn enable_or_disable_peer(
+    peers: &[Peer],
+    args: &EnableDisablePeerOpts,
+    enable: bool,
+) -> Result<Option<Peer>, Error> {
     let enabled_peers: Vec<_> = peers
         .iter()
         .filter(|peer| enable && peer.is_disabled || !enable && !peer.is_disabled)
         .collect();
 
-    let peer_selection: Vec<_> = enabled_peers
+    let peer = if let Some(ref name) = args.name {
-        .iter()
+        enabled_peers
-        .map(|peer| format!("{} ({})", &peer.name, &peer.ip))
+            .into_iter()
-        .collect();
+            .find(|p| &p.name == name)
-    let (index, _) = select(
+            .ok_or_else(|| anyhow!("Peer '{}' does not exist", name))?
-        &format!("Peer to {}able", if enable { "en" } else { "dis" }),
+    } else {
-        &peer_selection,
+        let peer_selection: Vec<_> = enabled_peers
-    )?;
+            .iter()
-    let peer = enabled_peers[index];
+            .map(|peer| format!("{} ({})", &peer.name, &peer.ip))
+            .collect();
+        let (index, _) = select(
+            &format!("Peer to {}able", if enable { "en" } else { "dis" }),
+            &peer_selection,
+        )?;
+        enabled_peers[index]
+    };
 
     Ok(
-        if confirm(&format!(
+        if args.yes
-            "{}able peer {}?",
+            || confirm(&format!(
-            if enable { "En" } else { "Dis" },
+                "{}able peer {}?",
-            peer.name.yellow()
+                if enable { "En" } else { "Dis" },
-        ))? {
+                peer.name.yellow()
+            ))?
+        {
             Some(peer.clone())
         } else {
             None

shared/src/types.rs

@@ -351,6 +351,17 @@ pub struct RenamePeerOpts {
     pub yes: bool,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Args)]
+pub struct EnableDisablePeerOpts {
+    /// Name of peer to enable/disable
+    #[clap(long)]
+    pub name: Option<Hostname>,
+
+    /// Bypass confirmation
+    #[clap(long, requires("name"))]
+    pub yes: bool,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Args)]
 pub struct AddCidrOpts {
     /// The CIDR name (eg. 'engineers')