git.delta.rocks / jrsonnet / refs/commits / c4cd98e6e84d

difftreelog

feat fleet secret read command reimplementation

uzwkxlsqYaroslav Bolyukin2026-04-18parent: #0417c49.patch.diff
in: trunk

2 files changed

modifiedcmds/fleet/src/cmds/secrets.rsdiffbeforeafterboth
after · cmds/fleet/src/cmds/secrets.rs
1use std::io::{Write as _, stdout};23use anyhow::{Context as _, Result, anyhow, bail};4use clap::Parser;5use fleet_base::{fleetdata::SecretOwner, host::Config, opts::FleetOpts};6use itertools::Itertools as _;7use tracing::warn;89#[derive(Parser)]10pub enum Secret {11	/// Force load host keys for all defined hosts12	ForceKeys,13	/// Read secret from remote host, requires sudo on one of the owning hosts14	Read {15		/// Secret name to read16		name: String,1718		/// Distribution with what machine to read19		/// If not shared between multiple - defaults to single owner20		#[clap(short = 'm', long)]21		machine: Option<String>,2223		/// Which private secret part to read24		/// If not specified - only one existing part is read25		#[clap(short = 'p', long)]26		part: Option<String>,27	},28	/// Prune (remove, mark for regeneration) secrets29	Prune {30		/// Secret to prune31		name: String,3233		/// Machines to prune - if specified, only the choosen machines will be pruned34		#[clap(short = 'm', long)]35		machine: Vec<String>,36	},37	/// Ensure secret is generated and not expired38	Ensure {39		/// Secret to ensure generated40		name: String,4142		/// Machines to force secret for43		#[clap(short = 'm', long)]44		machine: Vec<String>,45	},46	List {},47}4849impl Secret {50	pub async fn run(self, config: &Config, opts: &FleetOpts) -> Result<()> {51		match self {52			Secret::ForceKeys => {53				for host in config.list_hosts()? {54					if opts.should_skip(&host)? {55						continue;56					}57					config.host_key(&host.name).await?;58				}59			}60			Secret::Read {61				name,62				machine,63				part: part_name,64			} => {65				let (owners, secret_data) = {66					let secret = config.data.secrets.read().expect("not poisoned");6768					let Some(dist) = secret.get(&name) else {69						bail!("secret doesn't exists");70					};7172					let dist = if let Some(machine) = &machine {73						dist.get(&SecretOwner::host(machine))74							.ok_or_else(|| anyhow!("machine {machine} has no secret generated"))?75					} else {76						dist.distributions()77							.exactly_one()78							.map_err(|e| anyhow!("{e}"))79							.context(80								"with no machine specified, there should be exactly one distribution",81							)?82					};8384					let part = if let Some(part_name) = &part_name {85						dist.secret.parts.get(part_name).ok_or_else(|| {86							anyhow!("secret {name} does not have part named {part_name}")87						})?88					} else {89						dist.secret90							.parts91							.iter()92							.exactly_one()93							.map_err(|e| anyhow!("{e}"))94							.context("with no part specified, there should be exactly one part")?95							.196					};97					let owners = dist.owners().cloned().collect::<Vec<_>>();98					let secret_data = part.raw.clone();99					(owners, secret_data)100				};101102				for host in config103					.preferred_hosts(|h| owners.iter().any(|o| o.as_host() == Some(h)))104					.context("failed to list hosts")?105				{106					let host = match host {107						Ok(h) => h,108						Err(e) => {109							warn!("failed to use host: {e}");110							continue;111						}112					};113					match host.decrypt(secret_data.clone()).await {114						Ok(data) => {115							let mut w = stdout();116							w.write_all(&data)?;117							return Ok(());118						}119						Err(e) => warn!("failed to decrypt on {}: {e}", host.name),120					};121				}122				bail!("failed to find suitable decrypting host");123			}124			Secret::List {} => {125				/*126				let _span = info_span!("loading secrets").entered();127				let configured = config.list_configured_shared()?;128				#[derive(Tabled)]129				struct SecretDisplay {130					#[tabled(rename = "Name")]131					name: String,132					#[tabled(rename = "Owners")]133					owners: String,134				}135				// let mut table = vec![];136				for name in configured.iter().cloned() {137					let config = config.clone();138					let data = config.shared_secret(&name).expect("exists");139					/*140										let definition = config.shared_secret_definition(&name)?;141										let expectations = definition.expectations()?;142										let owners = data143											.owners()144											.map(|o| {145												if expectations.owners.contains(o) {146													o.green().to_string()147												} else {148													o.red().to_string()149												}150											})151											.collect::<Vec<_>>();152										table.push(SecretDisplay {153											owners: owners.join(", "),154											name,155										})156					*/157				}158				// info!("loaded\n{}", Table::new(table).to_string())159				*/160				todo!()161			}162			Secret::Prune { name, machine } => todo!(),163			Secret::Ensure { name, machine } => todo!(),164		}165		Ok(())166	}167}168169/*170async fn edit_temp_file(171	builder: tempfile::Builder<'_, '_>,172	r: Vec<u8>,173	header: &str,174	comment: &str,175) -> Result<(Vec<u8>, Option<String>), anyhow::Error> {176	if !stdin().is_tty() {177		// TODO: Also try to open /dev/tty directly?178		bail!("stdin is not tty, can't open editor");179	}180181	use std::fmt::Write;182	let mut file = builder.tempfile()?;183184	let mut full_header = String::new();185	let mut had = false;186	for line in header.trim_end().lines() {187		had = true;188		writeln!(&mut full_header, "{comment}{line}")?;189	}190	if had {191		writeln!(&mut full_header, "{}", comment.trim_end())?;192	}193	writeln!(194		&mut full_header,195		"{comment}Do not touch this header! It will be removed automatically"196	)?;197198	file.write_all(full_header.as_bytes())?;199	file.write_all(&r)?;200201	let abs_path = file.into_temp_path();202	let editor = std::env::var_os("VISUAL")203		.or_else(|| std::env::var_os("EDITOR"))204		.unwrap_or_else(|| "vi".into());205	let editor_args = shlex::bytes::split(editor.as_encoded_bytes())206		.ok_or_else(|| anyhow!("EDITOR env var has wrong syntax"))?;207	let editor_args = editor_args208		.into_iter()209		.map(|v| {210			// Only ASCII subsequences are replaced211			unsafe { OsString::from_encoded_bytes_unchecked(v) }212		})213		.collect_vec();214	let Some((editor, args)) = editor_args.split_first() else {215		bail!("EDITOR env var has no command");216	};217	let mut command = Command::new(editor);218	command.args(args);219220	let path_arg = abs_path.canonicalize()?;221222	// TODO: Save full state, using tcget/_getmode/_setmode223	let was_raw = terminal::is_raw_mode_enabled()?;224	terminal::enable_raw_mode()?;225226	let status = command.arg(path_arg).status().await;227228	if !was_raw {229		terminal::disable_raw_mode()?;230	}231232	let success = match status {233		Ok(s) => s.success(),234		Err(e) if e.kind() == io::ErrorKind::NotFound => {235			bail!("editor not found")236		}237		Err(e) => bail!("editor spawn error: {e}"),238	};239240	let mut file = std::fs::read(&abs_path).context("read editor output")?;241	let Some(v) = file.strip_prefix(full_header.as_bytes()) else {242		todo!();243	};244	todo!();245246	// Ok((success, abs_path))247}248*/
modifiedcrates/fleet-base/src/host.rsdiffbeforeafterboth
--- a/crates/fleet-base/src/host.rs
+++ b/crates/fleet-base/src/host.rs
@@ -1,5 +1,5 @@
 use std::{
-	collections::{BTreeMap, BTreeSet},
+	collections::{BTreeMap, BTreeSet, HashSet},
 	ffi::{OsStr, OsString},
 	fmt::Display,
 	io::Write,
@@ -652,6 +652,23 @@
 		}
 	}
 
+	pub fn preferred_hosts(
+		&self,
+		filter: impl Fn(&str) -> bool,
+	) -> Result<impl Iterator<Item = Result<ConfigHost>>> {
+		let prefer = self
+			.prefer_identities
+			.iter()
+			.filter_map(|v| v.as_host())
+			.collect::<HashSet<_>>();
+		let config = &self.config_field;
+		let mut names = nix_go!(config.hosts).list_fields()?;
+		names.retain(|s| filter(s));
+		names.sort_by_key(|h| prefer.contains(h.as_str()));
+
+		Ok(names.into_iter().map(|h| self.host(&h)))
+	}
+
 	pub fn host(&self, name: &str) -> Result<ConfigHost> {
 		let config = &self.config_field;
 		let host_config = nix_go!(config.hosts[{ name }]);