all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Maximiliano Sandoval R <m.sandoval@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH backup] use IsTerminal trait whenever possible
Date: Fri, 17 Nov 2023 14:24:14 +0100	[thread overview]
Message-ID: <20231117132414.195758-1-m.sandoval@proxmox.com> (raw)

Continuation of
https://lists.proxmox.com/pipermail/pbs-devel/2023-November/007078.html.

Signed-off-by: Maximiliano Sandoval R <m.sandoval@proxmox.com>
---
 pbs-client/src/http_client.rs          | 10 +++++-----
 pbs-client/src/tools/key_source.rs     |  4 ++--
 proxmox-backup-client/src/key.rs       |  7 ++++---
 src/bin/proxmox_backup_debug/diff.rs   |  4 ++--
 src/bin/proxmox_tape/encryption_key.rs |  8 +++++---
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/pbs-client/src/http_client.rs b/pbs-client/src/http_client.rs
index b803c19f..ab67bba2 100644
--- a/pbs-client/src/http_client.rs
+++ b/pbs-client/src/http_client.rs
@@ -1,4 +1,4 @@
-use std::io::Write;
+use std::io::{IsTerminal, Write};
 use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 
@@ -458,7 +458,7 @@ impl HttpClient {
                                 &auth.ticket,
                                 &auth.token,
                             ) {
-                                if tty::stdout_isatty() {
+                                if std::io::stdout().is_terminal() {
                                     log::error!("storing login ticket failed: {}", err);
                                 }
                             }
@@ -496,7 +496,7 @@ impl HttpClient {
                         &auth.ticket,
                         &auth.token,
                     ) {
-                        if tty::stdout_isatty() {
+                        if std::io::stdout().is_terminal() {
                             log::error!("storing login ticket failed: {}", err);
                         }
                     }
@@ -548,7 +548,7 @@ impl HttpClient {
 
     fn get_password(username: &Userid, interactive: bool) -> Result<String, Error> {
         // If we're on a TTY, query the user for a password
-        if interactive && tty::stdin_isatty() {
+        if interactive && std::io::stdin().is_terminal() {
             let msg = format!("Password for \"{}\": ", username);
             return Ok(String::from_utf8(tty::read_password(&msg)?)?);
         }
@@ -599,7 +599,7 @@ impl HttpClient {
         }
 
         // If we're on a TTY, query the user
-        if interactive && tty::stdin_isatty() {
+        if interactive && std::io::stdin().is_terminal() {
             log::info!("fingerprint: {}", fp_string);
             loop {
                 eprint!("Are you sure you want to continue connecting? (y/n): ");
diff --git a/pbs-client/src/tools/key_source.rs b/pbs-client/src/tools/key_source.rs
index 0f78d0d1..2c15423f 100644
--- a/pbs-client/src/tools/key_source.rs
+++ b/pbs-client/src/tools/key_source.rs
@@ -1,4 +1,4 @@
-use std::io::Read;
+use std::io::{IsTerminal, Read};
 use std::os::unix::io::{FromRawFd, RawFd};
 use std::path::PathBuf;
 
@@ -351,7 +351,7 @@ pub fn get_encryption_key_password() -> Result<Vec<u8>, Error> {
     }
 
     // If we're on a TTY, query the user for a password
-    if tty::stdin_isatty() {
+    if std::io::stdin().is_terminal() {
         return tty::read_password("Encryption Key Password: ");
     }
 
diff --git a/proxmox-backup-client/src/key.rs b/proxmox-backup-client/src/key.rs
index 560e05b7..748cd9d3 100644
--- a/proxmox-backup-client/src/key.rs
+++ b/proxmox-backup-client/src/key.rs
@@ -1,3 +1,4 @@
+use std::io::IsTerminal;
 use std::path::PathBuf;
 
 use anyhow::{bail, format_err, Error};
@@ -100,7 +101,7 @@ fn create(kdf: Option<Kdf>, path: Option<String>, hint: Option<String>) -> Resul
         }
         Kdf::Scrypt | Kdf::PBKDF2 => {
             // always read passphrase from tty
-            if !tty::stdin_isatty() {
+            if !std::io::stdin().is_terminal() {
                 bail!("unable to read passphrase - no tty");
             }
 
@@ -236,7 +237,7 @@ fn change_passphrase(
 
     let kdf = kdf.unwrap_or_default();
 
-    if !tty::stdin_isatty() {
+    if !std::io::stdin().is_terminal() {
         bail!("unable to change passphrase - no tty");
     }
 
@@ -359,7 +360,7 @@ fn import_master_pubkey(path: String) -> Result<(), Error> {
 /// encryption key onto the backup server along with each backup.
 fn create_master_key() -> Result<(), Error> {
     // we need a TTY to query the new password
-    if !tty::stdin_isatty() {
+    if !std::io::stdin().is_terminal() {
         bail!("unable to create master key - no tty");
     }
 
diff --git a/src/bin/proxmox_backup_debug/diff.rs b/src/bin/proxmox_backup_debug/diff.rs
index 9924fb7b..0e861974 100644
--- a/src/bin/proxmox_backup_debug/diff.rs
+++ b/src/bin/proxmox_backup_debug/diff.rs
@@ -1,6 +1,6 @@
 use std::collections::{HashMap, HashSet};
 use std::ffi::{OsStr, OsString};
-use std::io::Write;
+use std::io::{IsTerminal, Write};
 use std::iter::FromIterator;
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
@@ -601,7 +601,7 @@ impl FileEntryPrinter {
         let color_choice = match output_params.color {
             ColorMode::Always => ColorChoice::Always,
             ColorMode::Auto => {
-                if unsafe { libc::isatty(1) == 1 } {
+                if std::io::stdout().is_terminal() {
                     // Show colors unless `TERM=dumb` or `NO_COLOR` is set.
                     ColorChoice::Auto
                 } else {
diff --git a/src/bin/proxmox_tape/encryption_key.rs b/src/bin/proxmox_tape/encryption_key.rs
index bed37171..6ca93aba 100644
--- a/src/bin/proxmox_tape/encryption_key.rs
+++ b/src/bin/proxmox_tape/encryption_key.rs
@@ -1,3 +1,5 @@
+use std::io::IsTerminal;
+
 use anyhow::{bail, format_err, Error};
 use serde_json::Value;
 
@@ -149,7 +151,7 @@ fn change_passphrase(
     mut param: Value,
     rpcenv: &mut dyn RpcEnvironment,
 ) -> Result<(), Error> {
-    if !tty::stdin_isatty() {
+    if !std::io::stdin().is_terminal() {
         bail!("unable to change passphrase - no tty");
     }
 
@@ -208,7 +210,7 @@ async fn restore_key(
     } else if !drive_passed && key.is_none() && key_file.is_none() {
         bail!("one of either 'drive' or 'key' parameter must be set!");
     }
-    if !tty::stdin_isatty() {
+    if !std::io::stdin().is_terminal() {
         bail!("no password input mechanism available");
     }
 
@@ -283,7 +285,7 @@ async fn restore_key(
 )]
 /// Create key (read password from stdin)
 fn create_key(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
-    if !tty::stdin_isatty() {
+    if !std::io::stdin().is_terminal() {
         bail!("no password input mechanism available");
     }
 
-- 
2.39.2





             reply	other threads:[~2023-11-17 13:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-17 13:24 Maximiliano Sandoval R [this message]
2023-11-27 12:30 ` [pbs-devel] applied: " Fabian Grünbichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231117132414.195758-1-m.sandoval@proxmox.com \
    --to=m.sandoval@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal