Skip to content

fix(vector sink): cert verification with proxy enabled #17651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neuronull merged 4 commits into from
Jul 8, 2023
Merged

fix(vector sink): cert verification with proxy enabled #17651

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
918d57b
fix(vector sink): cert verification with proxy enabled
joemiller Jun 8, 2023
bf16c3b
use the build proxy connector helper function
neuronull Jul 3, 2023
0d479f7
Merge branch 'master' into sink/vector/proxy-tls
neuronull Jul 6, 2023
347370d
feedback sw
neuronull Jul 6, 2023
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
21 changes: 3 additions & 18 deletions src/sinks/vector/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ use crate::{
AcknowledgementsConfig, GenerateConfig, Input, ProxyConfig, SinkConfig, SinkContext,
SinkHealthcheckOptions,
},
http::build_proxy_connector,
proto::vector as proto,
sinks::{
util::{
Expand All @@ -24,7 +25,7 @@ use crate::{
},
Healthcheck, VectorSink as VectorSinkType,
},
tls::{tls_connector_builder, MaybeTlsSettings, TlsEnableableConfig},
tls::{MaybeTlsSettings, TlsEnableableConfig},
};

/// Configuration for the `vector` sink.
Expand Down Expand Up @@ -209,23 +210,7 @@ fn new_client(
tls_settings: &MaybeTlsSettings,
proxy_config: &ProxyConfig,
) -> crate::Result<hyper::Client<ProxyConnector<HttpsConnector<HttpConnector>>, BoxBody>> {
let mut http = HttpConnector::new();
http.enforce_http(false);

let tls = tls_connector_builder(tls_settings)?;
let mut https = HttpsConnector::with_connector(http, tls)?;

let settings = tls_settings.tls().cloned();
https.set_callback(move |c, _uri| {
if let Some(settings) = &settings {
settings.apply_connect_configuration(c);
}

Ok(())
});

let mut proxy = ProxyConnector::new(https).unwrap();
proxy_config.configure(&mut proxy)?;
let proxy = build_proxy_connector(tls_settings.clone(), proxy_config)?;

Ok(hyper::Client::builder().http2_only(true).build(proxy))
}
Expand Down