From 4d81bb0e573e8c198b94335d9dfc71ef48ef0a38 Mon Sep 17 00:00:00 2001
From: Jack Grigg <thestr4d@gmail.com>
Date: Sun, 6 Aug 2023 17:48:13 +0000
Subject: [PATCH] age: Replace `atty` with `is-terminal`

Closes str4d/rage#359.
---
 Cargo.lock                    | 26 +++-----------------------
 age/Cargo.toml                |  4 ++--
 age/src/cli_common/file_io.rs |  3 ++-
 supply-chain/config.toml      |  4 ----
 supply-chain/imports.lock     | 10 ----------
 5 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0d12639..083e3a9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -59,7 +59,6 @@ dependencies = [
  "aes",
  "aes-gcm",
  "age-core",
- "atty",
  "base64",
  "bcrypt-pbkdf",
  "bech32",
@@ -78,6 +77,7 @@ dependencies = [
  "hmac",
  "i18n-embed",
  "i18n-embed-fl",
+ "is-terminal",
  "lazy_static",
  "memchr",
  "nom",
@@ -191,17 +191,6 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -1112,15 +1101,6 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.2"
@@ -1329,7 +1309,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi",
  "rustix",
  "windows-sys 0.48.0",
 ]
@@ -1566,7 +1546,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.2",
+ "hermit-abi",
  "libc",
 ]
 
diff --git a/age/Cargo.toml b/age/Cargo.toml
index 7d2a4bb..1724c68 100644
--- a/age/Cargo.toml
+++ b/age/Cargo.toml
@@ -73,8 +73,8 @@ web-sys = { version = "0.3", optional = true, features = ["Window", "Performance
 memchr = { version = "2.5", optional = true }
 
 # Common CLI dependencies
-atty = { version = "0.2", optional = true }
 console = { version = "0.15", optional = true, default-features = false }
+is-terminal = { version = "0.4", optional = true }
 rpassword = { version = "7", optional = true }
 
 [target.'cfg(any(unix, windows))'.dependencies]
@@ -102,7 +102,7 @@ criterion-cycles-per-byte = "0.5"
 default = []
 armor = []
 async = ["futures", "memchr"]
-cli-common = ["atty", "console", "pinentry", "rpassword"]
+cli-common = ["console", "is-terminal", "pinentry", "rpassword"]
 plugin = ["age-core/plugin", "which", "wsl"]
 ssh = [
     "aes",
diff --git a/age/src/cli_common/file_io.rs b/age/src/cli_common/file_io.rs
index 52a6eac..bf1b111 100644
--- a/age/src/cli_common/file_io.rs
+++ b/age/src/cli_common/file_io.rs
@@ -7,6 +7,7 @@ use std::io::{self, Read, Write};
 #[cfg(unix)]
 use std::os::unix::fs::OpenOptionsExt;
 
+use is_terminal::IsTerminal;
 use zeroize::Zeroize;
 
 use crate::{fl, util::LINE_ENDING, wfl, wlnfl};
@@ -61,7 +62,7 @@ impl InputReader {
 
     /// Returns true if this input is from a terminal, and a user is likely typing it.
     pub fn is_terminal(&self) -> bool {
-        matches!(self, Self::Stdin(_)) && atty::is(atty::Stream::Stdin)
+        matches!(self, Self::Stdin(_)) && io::stdin().is_terminal()
     }
 }
 
diff --git a/supply-chain/config.toml b/supply-chain/config.toml
index e945133..91539bf 100644
--- a/supply-chain/config.toml
+++ b/supply-chain/config.toml
@@ -322,10 +322,6 @@ criteria = "safe-to-deploy"
 version = "0.8.1"
 criteria = "safe-to-deploy"
 
-[[exemptions.hermit-abi]]
-version = "0.1.19"
-criteria = "safe-to-deploy"
-
 [[exemptions.hermit-abi]]
 version = "0.3.2"
 criteria = "safe-to-deploy"
diff --git a/supply-chain/imports.lock b/supply-chain/imports.lock
index 5b4d9ae..9b0df1a 100644
--- a/supply-chain/imports.lock
+++ b/supply-chain/imports.lock
@@ -166,16 +166,6 @@ criteria = "safe-to-deploy"
 version = "0.1.6"
 notes = "Contains no unsafe code, no IO, no build.rs."
 
-[[audits.bytecode-alliance.audits.atty]]
-who = "Alex Crichton <alex@alexcrichton.com>"
-criteria = "safe-to-deploy"
-version = "0.2.14"
-notes = """
-Contains only unsafe code for what this crate's purpose is and only accesses
-the environment's terminal information when asked. Does its stated purpose and
-no more.
-"""
-
 [[audits.bytecode-alliance.audits.base64]]
 who = "Pat Hickey <phickey@fastly.com>"
 criteria = "safe-to-deploy"