YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #198 from greatest-ape/fix-http-peer-addr

Browse source 
http: don't require peer addr to have been set in send_response
This commit is contained in:
Joakim Frostegård 2024-04-14 00:53:41 +02:00 • committed by GitHub
commit e0c0dd7865
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/http/src/workers/socket/connection.rs
View file

@ -146,6 +146,8 @@ struct Connection<S> {
request_senders: Rc<Senders<ChannelRequest>>, request_senders: Rc<Senders<ChannelRequest>>,
valid_until: Rc<RefCell<ValidUntil>>, valid_until: Rc<RefCell<ValidUntil>>,
server_start_instant: ServerStartInstant, server_start_instant: ServerStartInstant,
// If we're running behind a reverse proxy, gets set as soon as we get a
// valid requiest. Otherwise, must be set before calling `run`.
opt_peer_addr: Option<CanonicalSocketAddr>, opt_peer_addr: Option<CanonicalSocketAddr>,
peer_port: u16, peer_port: u16,
request_buffer: Box<[u8; REQUEST_BUFFER_SIZE]>, request_buffer: Box<[u8; REQUEST_BUFFER_SIZE]>,
@ -441,14 +443,20 @@ where
Response::Failure(_) => "error", Response::Failure(_) => "error",
}; };
let peer_addr = self // If we're behind a reverse proxy and we're sending an error
// response due to failing to parse a request, opt_peer_addr might
// not yet be set (and in that case, we don't know if the true peer
// connects over IPv4 or IPv6)
let ip_version_str = self
.opt_peer_addr .opt_peer_addr
.expect("peer addr should already have been extracted by now"); .as_ref()
.map(peer_addr_to_ip_version_str)
.unwrap_or("?");
::metrics::counter!( ::metrics::counter!(
"aquatic_responses_total", "aquatic_responses_total",
"type" => response_type, "type" => response_type,
"ip_version" => peer_addr_to_ip_version_str(&peer_addr), "ip_version" => ip_version_str,
"worker_index" => self.worker_index_string.clone(), "worker_index" => self.worker_index_string.clone(),
) )
.increment(1); .increment(1);