vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arti: Adjust severity on per-socks-request log. 

Also, note why we aren't hiding the addrs that we're listening on
here.
This commit is contained in:
Nick Mathewson 2022-08-25 11:09:38 -04:00
parent e8fcf2b038
commit 0452fa67f6
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/arti/src/dns.rs
View File

@ -238,12 +238,14 @@ pub(crate) async fn run_dns_resolver<R: Runtime>(
// Try to bind to the DNS ports.
for localhost in &localhosts {
let addr: SocketAddr = (*localhost, dns_port).into();
// NOTE: Our logs here displays the local address. We allow this, since
// knowing the address is basically essential for diagnostics.
match runtime.bind(&addr).await {
Ok(listener) => {
info!("Listening on {:?}.", addr);
listeners.push(listener);
}
Err(e) => warn!("Can't listen on {:?}: {}", addr, e),
Err(e) => warn!("Can't listen on {}: {}", addr, e),
}
}
// We weren't able to bind any ports: There's nothing to do.

10
crates/arti/src/socks.rs
View File

@ -10,7 +10,7 @@ use futures::task::SpawnExt;
use safelog::sensitive;
use std::io::Result as IoResult;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
use tracing::{error, info, warn};
use tracing::{debug, error, info, warn};
use arti_client::{ErrorKind, HasKind, StreamPrefs, TorClient};
use tor_rtcompat::{Runtime, TcpListener};
@ -165,7 +165,7 @@ where
// Unpack the socks request and find out where we're connecting to.
let addr = request.addr().to_string();
let port = request.port();
info!(
debug!(
"Got a socks request: {} {}:{}",
request.command(),
sensitive(&addr),
@ -195,7 +195,7 @@ where
Err(e) => return reply_error(&mut socks_w, &request, e).await,
};
// Okay, great! We have a connection over the Tor network.
info!("Got a stream for {}:{}", sensitive(&addr), port);
debug!("Got a stream for {}:{}", sensitive(&addr), port);
// Send back a SOCKS response, telling the client that it
// successfully connected.
@ -425,12 +425,14 @@ pub(crate) async fn run_socks_proxy<R: Runtime>(
// Try to bind to the SOCKS ports.
for localhost in &localhosts {
let addr: SocketAddr = (*localhost, socks_port).into();
// NOTE: Our logs here displays the local address. We allow this, since
// knowing the address is basically essential for diagnostics.
match runtime.listen(&addr).await {
Ok(listener) => {
info!("Listening on {:?}.", addr);
listeners.push(listener);
}
Err(e) => warn!("Can't listen on {:?}: {}", addr, e),
Err(e) => warn!("Can't listen on {}: {}", addr, e),
}
}
// We weren't able to bind any ports: There's nothing to do.