fix(proxy): support url-encoded auth values (#20868)

* fix(proxy): support url-encoded auth values * spellcheck allow * update expect message
vectordotdev · Jul 17, 2024 · e9b4fe1 · e9b4fe1
1 parent 6d179e5
commit e9b4fe1
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 3 deletions.
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -459,6 +459,7 @@ upstreaminfo
 useragents
 usergroups
 userguide
+urlencoding
 webhdfs
 winapi
 workarounds

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/changelog.d/17125_proxy_auth_url_encoded.fix.md b/changelog.d/17125_proxy_auth_url_encoded.fix.md
@@ -0,0 +1 @@
+Proxy configuration now supports URL-encoded values.
diff --git a/lib/vector-core/Cargo.toml b/lib/vector-core/Cargo.toml
@@ -58,6 +58,7 @@ tracing-core = { version = "0.1.26", default-features = false }
 tracing-subscriber = { version = "0.3.18", default-features = false, features = ["std"] }
 typetag = { version = "0.2.16", default-features = false }
 url = { version = "2", default-features = false }
+urlencoding = { version = "2.1.3", default-features = false }
 vector-buffers = { path = "../vector-buffers", default-features = false }
 vector-common = { path = "../vector-common" }
 vector-config = { path = "../vector-config" }

diff --git a/lib/vector-core/src/config/proxy.rs b/lib/vector-core/src/config/proxy.rs
@@ -163,9 +163,13 @@ impl ProxyConfig {
                     let mut proxy = Proxy::new(self.interceptor().intercept(proxy_scheme), parsed);
                     if let Ok(authority) = Url::parse(url) {
                         if let Some(password) = authority.password() {
+                            let decoded_user = urlencoding::decode(authority.username())
+                                .expect("username must be valid UTF-8.");
+                            let decoded_pw = urlencoding::decode(password)
+                                .expect("Password must be valid UTF-8.");
                             proxy.set_authorization(Authorization::basic(
-                                authority.username(),
-                                password,
+                                &decoded_user,
+                                &decoded_pw,
                             ));
                         }
                     }
@@ -397,7 +401,6 @@ mod tests {
         }
     }
 
-    #[ignore]
     #[test]
     fn build_proxy_with_special_chars_url_encoded() {
         let config = ProxyConfig {