facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-05 14:28:17 +03:00
Code Issues Projects Releases Wiki Activity

always read ClientInfo from http headers regardless if trusted or

Browse Source 
Summary:
always read ClientInfo from http headers regardless if trusted or
not trusted

the ClientInfo logging to scuba is already in place, and also passing it
further to land service, etc

Reviewed By: RajivTS

Differential Revision: D49439063

fbshipit-source-id: ce0080e9c3f3db34123d8a9c594d37e209ad1a31
This commit is contained in:
Liubov Dmitrieva 2023-09-19 18:46:19 -07:00 committed by Facebook GitHub Bot
parent 56fb7abd54
commit 0972675e2c
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eden/mononoke/server/repo_listener/src/http_service.rs
View File

@ -519,7 +519,6 @@ mod h2m {
metadata
.add_raw_encoded_cats(cats.to_str().context("Invalid encoded cats")?.to_string());
}
let src_region = headers
.get(HEADER_REVPROXY_REGION)
.and_then(|r| r.to_str().ok().map(|r| r.to_string()));
@ -527,16 +526,6 @@ mod h2m {
if let Some(src_region) = src_region {
metadata.add_revproxy_region(src_region);
}
let client_info: Option<ClientInfo> = headers
.get(CLIENT_INFO_HEADER)
.and_then(|h| h.to_str().ok())
.and_then(|ci| serde_json::from_str(ci).ok());
if let Some(client_info) = client_info {
metadata.add_client_info(client_info);
}
Ok(())
}
@ -548,6 +537,10 @@ mod h2m {
let debug = headers.contains_key(HEADER_CLIENT_DEBUG);
let internal_identity = &conn.pending.acceptor.common_config.internal_identity;
let is_trusted = conn.is_trusted;
let client_info: Option<ClientInfo> = headers
.get(CLIENT_INFO_HEADER)
.and_then(|h| h.to_str().ok())
.and_then(|ci| serde_json::from_str(ci).ok());
// CATs are verifiable - we know that only the signer could have
// generated them. We extract the signer's identity. The connecting
@ -589,8 +582,11 @@ mod h2m {
)
.await;
metadata_populate_trusted(&mut metadata, headers)?;
if let Some(client_info) = client_info {
metadata.add_client_info(client_info);
}
metadata_populate_trusted(&mut metadata, headers)?;
return Ok(metadata);
}
}
@ -599,7 +595,7 @@ mod h2m {
identities.extend(conn.identities.iter().cloned());
// Generic fallback
Ok(Metadata::new(
let mut metadata = Metadata::new(
Some(&generate_session_id().to_string()),
identities,
debug,
@ -611,6 +607,12 @@ mod h2m {
})?,
Some(conn.pending.addr.ip()),
)
.await)
.await;
if let Some(client_info) = client_info {
metadata.add_client_info(client_info);
}
Ok(metadata)
}
}