From f9a9921bedd2c292a42e45bde832d666de1bd67b Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 25 Aug 2022 12:03:38 -0400
Subject: [PATCH] arti-client: Treat list of exit ports as sensitive.

---
 crates/arti-client/src/client.rs | 4 ++--
 crates/arti-client/src/err.rs    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/arti-client/src/client.rs b/crates/arti-client/src/client.rs
index 5e0d8f586..823ece5e8 100644
--- a/crates/arti-client/src/client.rs
+++ b/crates/arti-client/src/client.rs
@@ -7,7 +7,7 @@
 use crate::address::IntoTorAddr;
 
 use crate::config::{ClientAddrConfig, StreamTimeoutConfig, TorClientConfig};
-use safelog::sensitive;
+use safelog::{sensitive, Sensitive};
 use tor_basic_utils::futures::{DropNotifyWatchSender, PostageWatchSenderExt};
 use tor_circmgr::isolation::Isolation;
 use tor_circmgr::{isolation::StreamIsolationBuilder, IsolationToken, TargetPort};
@@ -919,7 +919,7 @@ impl<R: Runtime> TorClient<R> {
             .await
             .map_err(|cause| ErrorDetail::ObtainExitCircuit {
                 cause,
-                exit_ports: exit_ports.into(),
+                exit_ports: Sensitive::new(exit_ports.into()),
             })?;
         drop(dir); // This decreases the refcount on the netdir.
 
diff --git a/crates/arti-client/src/err.rs b/crates/arti-client/src/err.rs
index 5f604094f..e944aab52 100644
--- a/crates/arti-client/src/err.rs
+++ b/crates/arti-client/src/err.rs
@@ -5,6 +5,7 @@ use std::sync::Arc;
 
 use futures::task::SpawnError;
 
+use safelog::Sensitive;
 use thiserror::Error;
 use tor_circmgr::TargetPorts;
 use tor_error::{ErrorKind, HasKind};
@@ -132,7 +133,7 @@ enum ErrorDetail {
     #[error("Failed to obtain exit circuit for ports {exit_ports}")]
     ObtainExitCircuit {
         /// The ports that we wanted a circuit for.
-        exit_ports: TargetPorts,
+        exit_ports: Sensitive<TargetPorts>,
 
         /// What went wrong
         #[source]