use IsTerminal trait whenever possible

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

Signed-off-by: Maximiliano Sandoval R <m.sandoval@proxmox.com>
This commit is contained in:
Maximiliano Sandoval R 2023-11-17 14:24:14 +01:00 committed by Fabian Grünbichler
parent 22b5ae08f3
commit 2711e94e3a
5 changed files with 18 additions and 15 deletions

View File

@ -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): ");

View File

@ -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: ");
}

View File

@ -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");
}

View File

@ -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 {

View File

@ -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");
}