gitops/optimclaw
1
0
Fork 0
mirror of https://github.com/outbackdingo/optimclaw.git synced 2026-08-25 14:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf(config): eliminate double URL parse in validate_base_url

Browse Source 
Extract `redact_parsed_url()` to accept an already-parsed URL, so
`validate_base_url` parses once and reuses the result. The string-based
`redact_url()` is kept for the parse-error fallback path only.

Also removes an unused `safe_url` binding that survived the refactor.

Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
This commit is contained in:
Zaki
2026-03-22 18:20:59 -07:00
co-authored by Claude Opus 4.6
parent 3c46dd74b8
commit 10468ce5be
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/helpers.rs
+18 -14
View File
@@ -176,19 +176,24 @@ pub(crate) fn parse_string_env(
Ok(optional_env(key)?.unwrap_or_else(|| default.into()))
}
/// Redact userinfo (username:password) from a URL for safe inclusion in error messages.
/// Redact userinfo (username:password) from a parsed URL for safe inclusion in error messages.
fn redact_parsed_url(parsed: &reqwest::Url) -> String {
if !parsed.username().is_empty() || parsed.password().is_some() {
let mut redacted = parsed.clone();
let _ = redacted.set_username("");
let _ = redacted.set_password(None);
format!("{} (credentials redacted)", redacted)
} else {
parsed.to_string()
}
}
/// Redact userinfo (username:password) from a URL string for safe inclusion in error messages.
///
/// Use this when you only have the raw string and no parsed URL (e.g., on a parse-error path).
fn redact_url(url: &str) -> String {
match reqwest::Url::parse(url) {
Ok(mut parsed) => {
if !parsed.username().is_empty() || parsed.password().is_some() {
// Clear credentials before displaying
let _ = parsed.set_username("");
let _ = parsed.set_password(None);
format!("{} (credentials redacted)", parsed)
} else {
parsed.to_string()
}
}
Ok(parsed) => redact_parsed_url(&parsed),
Err(_) => "<invalid URL>".to_string(),
}
}
@@ -205,11 +210,10 @@ fn redact_url(url: &str) -> String {
pub(crate) fn validate_base_url(url: &str, field_name: &str) -> Result<(), ConfigError> {
use std::net::{IpAddr, Ipv4Addr};
let safe_url = redact_url(url);
// Parse once and reuse — on parse failure, fall back to `redact_url()` for the error message.
let parsed = reqwest::Url::parse(url).map_err(|e| ConfigError::InvalidValue {
key: field_name.to_string(),
message: format!("invalid URL '{}': {}", safe_url, e),
message: format!("invalid URL '{}': {}", redact_url(url), e),
})?;
let scheme = parsed.scheme();