From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 48BD0EAD7 for ; Wed, 27 Sep 2023 12:13:54 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 31F96ABC7 for ; Wed, 27 Sep 2023 12:13:54 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Wed, 27 Sep 2023 12:13:53 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D399348E2D for ; Wed, 27 Sep 2023 12:13:52 +0200 (CEST) Date: Wed, 27 Sep 2023 12:13:51 +0200 From: Wolfgang Bumiller To: Gabriel Goller Cc: pbs-devel@lists.proxmox.com Message-ID: References: <20230908114409.178087-1-g.goller@proxmox.com> <20230908114409.178087-2-g.goller@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230908114409.178087-2-g.goller@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.100 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [mod.rs] Subject: Re: [pbs-devel] [PATCH proxmox v3] router: cli: added `ask_for_confirmation` helper X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Sep 2023 10:13:54 -0000 On Fri, Sep 08, 2023 at 01:44:09PM +0200, Gabriel Goller wrote: > Added `ask_for_confirmation` helper that outputs a prompt and > lets the user confirm or deny it. Also added localization using > `libc::nl_langinfo()` to match/show a `yes` or `no` in the correct > language. > Implemented to close #4763. > > Signed-off-by: Gabriel Goller > --- > > update v3: > - added localization using `libc::nl_langinfo` > > note: skipped to version 3, so that the whole patch series has > the same version number. > > proxmox-router/Cargo.toml | 1 + > proxmox-router/src/cli/mod.rs | 34 +++++++++++++++++++++++++++++++++- > 2 files changed, 34 insertions(+), 1 deletion(-) > > diff --git a/proxmox-router/Cargo.toml b/proxmox-router/Cargo.toml > index 1c08ce2..e0d67d0 100644 > --- a/proxmox-router/Cargo.toml > +++ b/proxmox-router/Cargo.toml > @@ -19,6 +19,7 @@ percent-encoding.workspace = true > serde_json.workspace = true > serde.workspace = true > unicode-width ="0.1.8" > +regex.workspace = true > > # cli: > tokio = { workspace = true, features = [], optional = true } > diff --git a/proxmox-router/src/cli/mod.rs b/proxmox-router/src/cli/mod.rs > index 208df4a..1dcfaf0 100644 > --- a/proxmox-router/src/cli/mod.rs > +++ b/proxmox-router/src/cli/mod.rs > @@ -12,7 +12,10 @@ > //! - Ability to create interactive commands (using ``rustyline``) > //! - Supports complex/nested commands > > -use std::collections::HashMap; > +use std::{ > + collections::HashMap, > + io::{self, Write}, > +}; > > use crate::ApiMethod; > > @@ -62,6 +65,35 @@ pub fn init_cli_logger(env_var_name: &str, default_log_level: &str) { > .init(); > } > > +pub fn ask_for_confirmation(query: String) -> Result<(), io::Error> { IMO a generic helper should take the default as parameter (to decide on the upper/lower-casing, see below), and also return a boolean for the result. The Err case should be exclusively for actual errors (from `.read_line()`). > + use std::ffi::CStr; > + let yes_expr = unsafe { CStr::from_ptr(libc::nl_langinfo(libc::YESEXPR)) } > + .to_str() > + .unwrap_or("^[yY]$"); > + let no_expr = unsafe { CStr::from_ptr(libc::nl_langinfo(libc::NOEXPR)) } > + .to_str() > + .unwrap_or("^[nN]$"); > + > + let n = no_expr.chars().find(|c| c.is_uppercase()).unwrap_or('N'); > + let y = yes_expr.chars().find(|c| c.is_uppercase()).unwrap_or('Y'); > + print!("{query} [{y}/{n}]: "); Usually, the uppercase letter is used for the default for when typing nothing, while the other one is lowercase. Now I was also wondering what we should do if no upper/lowercase letter exists, but then again, it seems yY and nN are pretty much always included. I checked at least de_DE, ja_JP and zh_CN next to en_US, and I'm fairly certain we can rely on that, since I'm assuming this is exactly what `rpmatch(3)` does, which explicitly states that `y` and `n` work regardless of locale. > + > + use regex::Regex; > + // .unwrap() is okay, because we should always get a correct regex (see `.unwrap_or()` calls above) > + let yes_regex: Regex = Regex::new(yes_expr).unwrap(); It might be worth caching this in a static `OnceCell`. > + > + io::stdout().flush()?; > + let stdin = io::stdin(); > + let mut line = String::new(); > + stdin.read_line(&mut line)?; > + > + if yes_regex.is_match(line.trim()) { > + Ok(()) > + } else { > + Err(io::Error::new(io::ErrorKind::Other, "Aborted")) > + } > +} > + > /// Define a simple CLI command. > pub struct CliCommand { > /// The Schema definition. > -- > 2.39.2