Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions crates/forge_provider/src/forge_provider/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use super::request::Request;
use super::response::Response;
use crate::error::Error;
use crate::forge_provider::transformers::{ProviderPipeline, Transformer};
use crate::utils::format_http_context;
use crate::utils::{format_http_context, sanitize_headers};

#[derive(Clone, Builder)]
pub struct ForgeProvider {
Expand Down Expand Up @@ -71,7 +71,7 @@ impl ForgeProvider {
reqwest::header::CONNECTION,
HeaderValue::from_static("keep-alive"),
);
debug!(headers = ?headers, "Request Headers");
debug!(headers = ?sanitize_headers(&headers), "Request Headers");
headers
}

Expand All @@ -90,7 +90,7 @@ impl ForgeProvider {
info!(
url = %url,
model = %model,
headers = ?headers,
headers = ?sanitize_headers(&headers),
message_count = %request.message_count(),
message_cache_count = %request.message_cache_count(),
"Connecting Upstream"
Expand Down Expand Up @@ -189,7 +189,7 @@ impl ForgeProvider {

async fn fetch_models(&self, url: Url) -> Result<String, anyhow::Error> {
let headers = self.headers();
info!(method = "GET", url = %url, headers = ?headers, "Fetching Models");
info!(method = "GET", url = %url, headers = ?sanitize_headers(&headers), "Fetching Models");
match self.client.get(url.clone()).headers(headers).send().await {
Ok(response) => {
let status = response.status();
Expand Down
52 changes: 52 additions & 0 deletions crates/forge_provider/src/utils.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use reqwest::header::{HeaderMap, HeaderValue, AUTHORIZATION};
use reqwest::StatusCode;

/// Helper function to format HTTP request/response context for logging and
Expand All @@ -13,3 +14,54 @@ pub(crate) fn format_http_context<U: AsRef<str>>(
format!("{} {}", method, url.as_ref())
}
}

/// Sanitizes headers for logging by redacting sensitive values
pub fn sanitize_headers(headers: &HeaderMap) -> HeaderMap {
let sensitive_headers = [AUTHORIZATION.as_str()];
headers
.iter()
.map(|(name, value)| {
let name_str = name.as_str().to_lowercase();
let value_str = if sensitive_headers.contains(&name_str.as_str()) {
HeaderValue::from_static("[REDACTED]")
} else {
value.clone()
};
(name.clone(), value_str)
})
.collect()
}

#[cfg(test)]
mod tests {
use reqwest::header::HeaderValue;

use super::*;

#[test]
fn test_sanitize_headers_for_logging() {
let mut headers = HeaderMap::new();
headers.insert(
AUTHORIZATION,
HeaderValue::from_static("Bearer secret-api-key"),
);
headers.insert("x-api-key", HeaderValue::from_static("another-secret"));
headers.insert("x-title", HeaderValue::from_static("forge"));
headers.insert("content-type", HeaderValue::from_static("application/json"));

let sanitized = sanitize_headers(&headers);

assert_eq!(
sanitized.get("authorization"),
Some(&HeaderValue::from_static("[REDACTED]"))
);
assert_eq!(
sanitized.get("x-title"),
Some(&HeaderValue::from_static("forge"))
);
assert_eq!(
sanitized.get("content-type"),
Some(&HeaderValue::from_static("application/json"))
);
}
}
Loading