YGGverse/agate
1
0
Fork 0
mirror of https://github.com/YGGverse/agate.git synced 2026-04-09 04:55:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add logging for peer IP addresses

Browse source
This commit is contained in:
Johann150 2021-01-24 19:42:46 +01:00 • committed by Matt Brubeck
parent fdd2ac7e56
commit 21486a0d11
1 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main.rs
View file

@ -60,6 +60,7 @@ struct Args {
language: Option<String>, language: Option<String>,
silent: bool, silent: bool,
serve_secret: bool, serve_secret: bool,
log_ips: bool,
} }
fn args() -> Result<Args> { fn args() -> Result<Args> {
@ -74,6 +75,7 @@ fn args() -> Result<Args> {
opts.optflag("s", "silent", "Disable logging output"); opts.optflag("s", "silent", "Disable logging output");
opts.optflag("h", "help", "Print this help menu"); opts.optflag("h", "help", "Print this help menu");
opts.optflag("", "serve-secret", "Enable serving secret files (files/directories starting with a dot)"); opts.optflag("", "serve-secret", "Enable serving secret files (files/directories starting with a dot)");
opts.optflag("", "ip", "Output IP addresses when logging");
let matches = opts.parse(&args[1..]).map_err(|f| f.to_string())?; let matches = opts.parse(&args[1..]).map_err(|f| f.to_string())?;
if matches.opt_present("h") { if matches.opt_present("h") {
@ -103,6 +105,7 @@ fn args() -> Result<Args> {
language: matches.opt_str("lang"), language: matches.opt_str("lang"),
silent: matches.opt_present("s"), silent: matches.opt_present("s"),
serve_secret: matches.opt_present("serve-secret"), serve_secret: matches.opt_present("serve-secret"),
log_ips: matches.opt_present("ip"),
}) })
} }
@ -162,7 +165,19 @@ async fn parse_request(stream: &mut TlsStream<TcpStream>) -> std::result::Result
buf = &mut request[len..]; buf = &mut request[len..];
} }
let request = std::str::from_utf8(&request[..len - 2]).or(Err((59, "Non-UTF-8 request")))?; let request = std::str::from_utf8(&request[..len - 2]).or(Err((59, "Non-UTF-8 request")))?;
if ARGS.log_ips {
log::info!(
"Got request for {:?} from {}",
request,
stream
.get_ref()
.0
.peer_addr()
.expect("could not get peer address")
);
} else {
log::info!("Got request for {:?}", request); log::info!("Got request for {:?}", request);
}
let url = Url::parse(request).or(Err((59, "Invalid URL")))?; let url = Url::parse(request).or(Err((59, "Invalid URL")))?;