mirror of
https://github.com/openai/codex.git
synced 2026-11-18 15:01:48 +00:00
fix(network-proxy): recheck network proxy connect targets (#19999)
## Why The proxy checks the requested host before opening the upstream connection, but DNS can resolve an allowed hostname to a loopback, private, or other non-public address after that first decision. Without a final check on the actual socket target, a request that looks acceptable at the hostname layer can still connect to a local service once resolution completes. ## What changed - add a shared TCP connector check for direct proxy egress - use that path for HTTP, `CONNECT`, SOCKS5, and MITM upstream connections - keep configured upstream proxy hops on the existing proxy path - add direct-connector coverage for allowed and rejected local targets ## Security impact Direct proxy egress now rechecks the resolved socket address before connecting, closing the gap between hostname policy evaluation and the final network target. ## Verification - `cargo test -p codex-network-proxy` --------- Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
1 parent
25ac0e4527
commit
e1ba87ccb2
8 files changed
+230
-33
No files matched your search
@@ -0,0 +1,157 @@
|
|||||||
|
use crate::policy::is_non_public_ip;
|
||||||
|
use crate::state::NetworkProxyState;
|
||||||
|
use rama_core::Service;
|
||||||
|
use rama_core::error::BoxError;
|
||||||
|
use rama_core::error::ErrorExt as _;
|
||||||
|
use rama_core::error::OpaqueError;
|
||||||
|
use rama_core::extensions::ExtensionsMut;
|
||||||
|
use rama_net::address::ProxyAddress;
|
||||||
|
use rama_net::client::EstablishedClientConnection;
|
||||||
|
use rama_net::transport::TryRefIntoTransportContext;
|
||||||
|
use rama_tcp::TcpStream;
|
||||||
|
use rama_tcp::client::TcpStreamConnector;
|
||||||
|
use rama_tcp::client::service::TcpConnector;
|
||||||
|
use std::io;
|
||||||
|
use std::net::SocketAddr;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub(crate) struct TargetCheckedTcpConnector {
|
||||||
|
policy: TargetPolicy,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TargetCheckedTcpConnector {
|
||||||
|
pub(crate) fn new(state: Arc<NetworkProxyState>) -> Self {
|
||||||
|
Self {
|
||||||
|
policy: TargetPolicy::State(state),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn from_allow_local_binding(allow_local_binding: bool) -> Self {
|
||||||
|
Self {
|
||||||
|
policy: TargetPolicy::Config {
|
||||||
|
allow_local_binding,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<Input> Service<Input> for TargetCheckedTcpConnector
|
||||||
|
where
|
||||||
|
Input: TryRefIntoTransportContext + Send + ExtensionsMut + 'static,
|
||||||
|
Input::Error: Into<BoxError> + Send + Sync + 'static,
|
||||||
|
{
|
||||||
|
type Output = EstablishedClientConnection<TcpStream, Input>;
|
||||||
|
type Error = BoxError;
|
||||||
|
|
||||||
|
async fn serve(&self, input: Input) -> Result<Self::Output, Self::Error> {
|
||||||
|
if input.extensions().get::<ProxyAddress>().is_some() {
|
||||||
|
return TcpConnector::new().serve(input).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
TcpConnector::new()
|
||||||
|
.with_connector(TargetCheckedStreamConnector {
|
||||||
|
policy: self.policy.clone(),
|
||||||
|
})
|
||||||
|
.serve(input)
|
||||||
|
.await
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
struct TargetCheckedStreamConnector {
|
||||||
|
policy: TargetPolicy,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TcpStreamConnector for TargetCheckedStreamConnector {
|
||||||
|
type Error = BoxError;
|
||||||
|
|
||||||
|
async fn connect(&self, addr: SocketAddr) -> Result<TcpStream, Self::Error> {
|
||||||
|
if !self.policy.allow_local_binding().await? && is_non_public_ip(addr.ip()) {
|
||||||
|
return Err(io::Error::new(
|
||||||
|
io::ErrorKind::PermissionDenied,
|
||||||
|
"network target rejected by policy",
|
||||||
|
)
|
||||||
|
.into());
|
||||||
|
}
|
||||||
|
|
||||||
|
tokio::net::TcpStream::connect(addr)
|
||||||
|
.await
|
||||||
|
.map(TcpStream::from)
|
||||||
|
.map_err(Into::into)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
enum TargetPolicy {
|
||||||
|
Config { allow_local_binding: bool },
|
||||||
|
State(Arc<NetworkProxyState>),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl TargetPolicy {
|
||||||
|
async fn allow_local_binding(&self) -> Result<bool, BoxError> {
|
||||||
|
match self {
|
||||||
|
Self::Config {
|
||||||
|
allow_local_binding,
|
||||||
|
} => Ok(*allow_local_binding),
|
||||||
|
Self::State(state) => state.allow_local_binding().await.map_err(|err| {
|
||||||
|
let err: BoxError = err.into();
|
||||||
|
OpaqueError::from_boxed(err)
|
||||||
|
.context("read network proxy config")
|
||||||
|
.into_boxed()
|
||||||
|
}),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
use crate::config::NetworkProxySettings;
|
||||||
|
use crate::state::network_proxy_state_for_policy;
|
||||||
|
use rama_net::address::HostWithPort;
|
||||||
|
use std::net::Ipv4Addr;
|
||||||
|
use tokio::net::TcpListener;
|
||||||
|
|
||||||
|
#[tokio::test(flavor = "current_thread")]
|
||||||
|
async fn direct_connector_rejects_non_public_target_when_local_binding_disabled() {
|
||||||
|
let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0))
|
||||||
|
.await
|
||||||
|
.expect("bind local listener");
|
||||||
|
let target = listener.local_addr().expect("local addr");
|
||||||
|
let connector = TargetCheckedTcpConnector::new(Arc::new(network_proxy_state_for_policy(
|
||||||
|
NetworkProxySettings::default(),
|
||||||
|
)));
|
||||||
|
|
||||||
|
let request: rama_tcp::client::Request =
|
||||||
|
rama_tcp::client::Request::new(HostWithPort::from(target));
|
||||||
|
let err = Service::serve(&connector, request)
|
||||||
|
.await
|
||||||
|
.expect_err("local target should be rejected");
|
||||||
|
|
||||||
|
assert!(
|
||||||
|
format!("{err:?}").contains("network target rejected by policy"),
|
||||||
|
"unexpected error: {err:?}"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test(flavor = "current_thread")]
|
||||||
|
async fn direct_connector_allows_non_public_target_when_local_binding_enabled() {
|
||||||
|
let listener = TcpListener::bind((Ipv4Addr::LOCALHOST, 0))
|
||||||
|
.await
|
||||||
|
.expect("bind local listener");
|
||||||
|
let target = listener.local_addr().expect("local addr");
|
||||||
|
let connector = TargetCheckedTcpConnector::new(Arc::new(network_proxy_state_for_policy(
|
||||||
|
NetworkProxySettings {
|
||||||
|
allow_local_binding: true,
|
||||||
|
..NetworkProxySettings::default()
|
||||||
|
},
|
||||||
|
)));
|
||||||
|
|
||||||
|
let request: rama_tcp::client::Request =
|
||||||
|
rama_tcp::client::Request::new(HostWithPort::from(target));
|
||||||
|
let result = Service::serve(&connector, request).await;
|
||||||
|
|
||||||
|
assert!(result.is_ok(), "local target should be allowed: {result:?}");
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
use crate::config::NetworkMode;
|
use crate::config::NetworkMode;
|
||||||
|
use crate::connect_policy::TargetCheckedTcpConnector;
|
||||||
use crate::mitm;
|
use crate::mitm;
|
||||||
use crate::network_policy::BlockDecisionAuditEventArgs;
|
use crate::network_policy::BlockDecisionAuditEventArgs;
|
||||||
use crate::network_policy::NetworkDecision;
|
use crate::network_policy::NetworkDecision;
|
||||||
@@ -66,7 +67,6 @@ use rama_net::proxy::ProxyTarget;
|
|||||||
use rama_net::proxy::StreamForwardService;
|
use rama_net::proxy::StreamForwardService;
|
||||||
use rama_net::stream::SocketInfo;
|
use rama_net::stream::SocketInfo;
|
||||||
use rama_tcp::client::Request as TcpRequest;
|
use rama_tcp::client::Request as TcpRequest;
|
||||||
use rama_tcp::client::service::TcpConnector;
|
|
||||||
use rama_tcp::server::TcpListener;
|
use rama_tcp::server::TcpListener;
|
||||||
use rama_tls_rustls::client::TlsConnectorDataBuilder;
|
use rama_tls_rustls::client::TlsConnectorDataBuilder;
|
||||||
use rama_tls_rustls::client::TlsConnectorLayer;
|
use rama_tls_rustls::client::TlsConnectorLayer;
|
||||||
@@ -345,20 +345,22 @@ async fn http_connect_proxy(upgraded: Upgraded) -> Result<(), Infallible> {
|
|||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
|
||||||
let allow_upstream_proxy = match upgraded
|
let app_state = match upgraded
|
||||||
.extensions()
|
.extensions()
|
||||||
.get::<Arc<NetworkProxyState>>()
|
.get::<Arc<NetworkProxyState>>()
|
||||||
.cloned()
|
.cloned()
|
||||||
{
|
{
|
||||||
Some(state) => match state.allow_upstream_proxy().await {
|
Some(state) => state,
|
||||||
Ok(allowed) => allowed,
|
|
||||||
Err(err) => {
|
|
||||||
error!("failed to read upstream proxy setting: {err}");
|
|
||||||
false
|
|
||||||
}
|
|
||||||
},
|
|
||||||
None => {
|
None => {
|
||||||
error!("missing app state");
|
error!("missing app state");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let allow_upstream_proxy = match app_state.allow_upstream_proxy().await {
|
||||||
|
Ok(allowed) => allowed,
|
||||||
|
Err(err) => {
|
||||||
|
error!("failed to read upstream proxy setting: {err}");
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -369,7 +371,7 @@ async fn http_connect_proxy(upgraded: Upgraded) -> Result<(), Infallible> {
|
|||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|
||||||
if let Err(err) = forward_connect_tunnel(upgraded, proxy).await {
|
if let Err(err) = forward_connect_tunnel(upgraded, proxy, app_state).await {
|
||||||
warn!("tunnel error: {err}");
|
warn!("tunnel error: {err}");
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -378,6 +380,7 @@ async fn http_connect_proxy(upgraded: Upgraded) -> Result<(), Infallible> {
|
|||||||
async fn forward_connect_tunnel(
|
async fn forward_connect_tunnel(
|
||||||
upgraded: Upgraded,
|
upgraded: Upgraded,
|
||||||
proxy: Option<ProxyAddress>,
|
proxy: Option<ProxyAddress>,
|
||||||
|
app_state: Arc<NetworkProxyState>,
|
||||||
) -> Result<(), BoxError> {
|
) -> Result<(), BoxError> {
|
||||||
let authority = upgraded
|
let authority = upgraded
|
||||||
.extensions()
|
.extensions()
|
||||||
@@ -392,7 +395,7 @@ async fn forward_connect_tunnel(
|
|||||||
|
|
||||||
let req = TcpRequest::new_with_extensions(authority.clone(), extensions)
|
let req = TcpRequest::new_with_extensions(authority.clone(), extensions)
|
||||||
.with_protocol(Protocol::HTTPS);
|
.with_protocol(Protocol::HTTPS);
|
||||||
let proxy_connector = HttpProxyConnector::optional(TcpConnector::new());
|
let proxy_connector = HttpProxyConnector::optional(TargetCheckedTcpConnector::new(app_state));
|
||||||
let tls_config = TlsConnectorDataBuilder::new()
|
let tls_config = TlsConnectorDataBuilder::new()
|
||||||
.with_alpn_protocols_http_auto()
|
.with_alpn_protocols_http_auto()
|
||||||
.build();
|
.build();
|
||||||
@@ -730,9 +733,9 @@ async fn http_plain_proxy(
|
|||||||
Err(resp) => return Ok(resp),
|
Err(resp) => return Ok(resp),
|
||||||
};
|
};
|
||||||
let client = if allow_upstream_proxy {
|
let client = if allow_upstream_proxy {
|
||||||
UpstreamClient::from_env_proxy()
|
UpstreamClient::from_env_proxy(app_state.clone())
|
||||||
} else {
|
} else {
|
||||||
UpstreamClient::direct()
|
UpstreamClient::direct(app_state.clone())
|
||||||
};
|
};
|
||||||
|
|
||||||
// Strip hop-by-hop headers only after extracting metadata used for policy correlation.
|
// Strip hop-by-hop headers only after extracting metadata used for policy correlation.
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
mod certs;
|
mod certs;
|
||||||
mod config;
|
mod config;
|
||||||
|
mod connect_policy;
|
||||||
mod http_proxy;
|
mod http_proxy;
|
||||||
mod mitm;
|
mod mitm;
|
||||||
mod network_policy;
|
mod network_policy;
|
||||||
|
|||||||
@@ -52,6 +52,11 @@ pub struct MitmState {
|
|||||||
max_body_bytes: usize,
|
max_body_bytes: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) struct MitmUpstreamConfig {
|
||||||
|
pub(crate) allow_upstream_proxy: bool,
|
||||||
|
pub(crate) allow_local_binding: bool,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct MitmPolicyContext {
|
struct MitmPolicyContext {
|
||||||
target_host: String,
|
target_host: String,
|
||||||
@@ -80,16 +85,16 @@ impl std::fmt::Debug for MitmState {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl MitmState {
|
impl MitmState {
|
||||||
pub(crate) fn new(allow_upstream_proxy: bool) -> Result<Self> {
|
pub(crate) fn new(config: MitmUpstreamConfig) -> Result<Self> {
|
||||||
// MITM exists to make limited-mode HTTPS enforceable: once CONNECT is established, plain
|
// MITM exists to make limited-mode HTTPS enforceable: once CONNECT is established, plain
|
||||||
// proxying would lose visibility into the inner HTTP request. We generate/load a local CA
|
// proxying would lose visibility into the inner HTTP request. We generate/load a local CA
|
||||||
// and issue per-host leaf certs so we can terminate TLS and apply policy.
|
// and issue per-host leaf certs so we can terminate TLS and apply policy.
|
||||||
let ca = ManagedMitmCa::load_or_create()?;
|
let ca = ManagedMitmCa::load_or_create()?;
|
||||||
|
|
||||||
let upstream = if allow_upstream_proxy {
|
let upstream = if config.allow_upstream_proxy {
|
||||||
UpstreamClient::from_env_proxy()
|
UpstreamClient::from_env_proxy_with_allow_local_binding(config.allow_local_binding)
|
||||||
} else {
|
} else {
|
||||||
UpstreamClient::direct()
|
UpstreamClient::direct_with_allow_local_binding(config.allow_local_binding)
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
|
|||||||
@@ -532,6 +532,12 @@ impl NetworkProxyState {
|
|||||||
Ok(guard.config.network.allow_upstream_proxy)
|
Ok(guard.config.network.allow_upstream_proxy)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn allow_local_binding(&self) -> Result<bool> {
|
||||||
|
self.reload_if_needed().await?;
|
||||||
|
let guard = self.state.read().await;
|
||||||
|
Ok(guard.config.network.allow_local_binding)
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn network_mode(&self) -> Result<NetworkMode> {
|
pub async fn network_mode(&self) -> Result<NetworkMode> {
|
||||||
self.reload_if_needed().await?;
|
self.reload_if_needed().await?;
|
||||||
let guard = self.state.read().await;
|
let guard = self.state.read().await;
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
use crate::config::NetworkMode;
|
use crate::config::NetworkMode;
|
||||||
|
use crate::connect_policy::TargetCheckedTcpConnector;
|
||||||
use crate::network_policy::BlockDecisionAuditEventArgs;
|
use crate::network_policy::BlockDecisionAuditEventArgs;
|
||||||
use crate::network_policy::NetworkDecision;
|
use crate::network_policy::NetworkDecision;
|
||||||
use crate::network_policy::NetworkDecisionSource;
|
use crate::network_policy::NetworkDecisionSource;
|
||||||
@@ -34,7 +35,6 @@ use rama_socks5::server::udp::RelayRequest;
|
|||||||
use rama_socks5::server::udp::RelayResponse;
|
use rama_socks5::server::udp::RelayResponse;
|
||||||
use rama_tcp::TcpStream;
|
use rama_tcp::TcpStream;
|
||||||
use rama_tcp::client::Request as TcpRequest;
|
use rama_tcp::client::Request as TcpRequest;
|
||||||
use rama_tcp::client::service::TcpConnector;
|
|
||||||
use rama_tcp::server::TcpListener;
|
use rama_tcp::server::TcpListener;
|
||||||
use std::io;
|
use std::io;
|
||||||
use std::net::SocketAddr;
|
use std::net::SocketAddr;
|
||||||
@@ -94,7 +94,7 @@ async fn run_socks5_with_listener(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let tcp_connector = TcpConnector::default();
|
let tcp_connector = TargetCheckedTcpConnector::new(state.clone());
|
||||||
let policy_tcp_connector = service_fn({
|
let policy_tcp_connector = service_fn({
|
||||||
let policy_decider = policy_decider.clone();
|
let policy_decider = policy_decider.clone();
|
||||||
move |req: TcpRequest| {
|
move |req: TcpRequest| {
|
||||||
@@ -131,7 +131,7 @@ async fn run_socks5_with_listener(
|
|||||||
|
|
||||||
async fn handle_socks5_tcp(
|
async fn handle_socks5_tcp(
|
||||||
req: TcpRequest,
|
req: TcpRequest,
|
||||||
tcp_connector: TcpConnector,
|
tcp_connector: TargetCheckedTcpConnector,
|
||||||
policy_decider: Option<Arc<dyn NetworkPolicyDecider>>,
|
policy_decider: Option<Arc<dyn NetworkPolicyDecider>>,
|
||||||
) -> Result<EstablishedClientConnection<TcpStream, TcpRequest>, BoxError> {
|
) -> Result<EstablishedClientConnection<TcpStream, TcpRequest>, BoxError> {
|
||||||
let app_state = req
|
let app_state = req
|
||||||
@@ -548,7 +548,7 @@ mod tests {
|
|||||||
let (result, events) = capture_events(|| async {
|
let (result, events) = capture_events(|| async {
|
||||||
handle_socks5_tcp(
|
handle_socks5_tcp(
|
||||||
request,
|
request,
|
||||||
TcpConnector::default(),
|
TargetCheckedTcpConnector::new(state.clone()),
|
||||||
/*policy_decider*/ None,
|
/*policy_decider*/ None,
|
||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ use crate::config::NetworkMode;
|
|||||||
use crate::config::NetworkProxyConfig;
|
use crate::config::NetworkProxyConfig;
|
||||||
use crate::config::NetworkUnixSocketPermissions;
|
use crate::config::NetworkUnixSocketPermissions;
|
||||||
use crate::mitm::MitmState;
|
use crate::mitm::MitmState;
|
||||||
|
use crate::mitm::MitmUpstreamConfig;
|
||||||
use crate::policy::DomainPattern;
|
use crate::policy::DomainPattern;
|
||||||
use crate::policy::compile_allowlist_globset;
|
use crate::policy::compile_allowlist_globset;
|
||||||
use crate::policy::compile_denylist_globset;
|
use crate::policy::compile_denylist_globset;
|
||||||
@@ -66,9 +67,10 @@ pub fn build_config_state(
|
|||||||
let deny_set = compile_denylist_globset(&denied_domains)?;
|
let deny_set = compile_denylist_globset(&denied_domains)?;
|
||||||
let allow_set = compile_allowlist_globset(&allowed_domains)?;
|
let allow_set = compile_allowlist_globset(&allowed_domains)?;
|
||||||
let mitm = if config.network.mitm {
|
let mitm = if config.network.mitm {
|
||||||
Some(Arc::new(MitmState::new(
|
Some(Arc::new(MitmState::new(MitmUpstreamConfig {
|
||||||
config.network.allow_upstream_proxy,
|
allow_upstream_proxy: config.network.allow_upstream_proxy,
|
||||||
)?))
|
allow_local_binding: config.network.allow_local_binding,
|
||||||
|
})?))
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
use crate::connect_policy::TargetCheckedTcpConnector;
|
||||||
|
use crate::state::NetworkProxyState;
|
||||||
use rama_core::Layer;
|
use rama_core::Layer;
|
||||||
use rama_core::Service;
|
use rama_core::Service;
|
||||||
use rama_core::error::BoxError;
|
use rama_core::error::BoxError;
|
||||||
@@ -16,9 +18,9 @@ use rama_http_backend::client::proxy::layer::HttpProxyConnectorLayer;
|
|||||||
use rama_net::address::ProxyAddress;
|
use rama_net::address::ProxyAddress;
|
||||||
use rama_net::client::EstablishedClientConnection;
|
use rama_net::client::EstablishedClientConnection;
|
||||||
use rama_net::http::RequestContext;
|
use rama_net::http::RequestContext;
|
||||||
use rama_tcp::client::service::TcpConnector;
|
|
||||||
use rama_tls_rustls::client::TlsConnectorDataBuilder;
|
use rama_tls_rustls::client::TlsConnectorDataBuilder;
|
||||||
use rama_tls_rustls::client::TlsConnectorLayer;
|
use rama_tls_rustls::client::TlsConnectorLayer;
|
||||||
|
use std::sync::Arc;
|
||||||
use tracing::warn;
|
use tracing::warn;
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
@@ -102,12 +104,32 @@ pub(crate) struct UpstreamClient {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl UpstreamClient {
|
impl UpstreamClient {
|
||||||
pub(crate) fn direct() -> Self {
|
pub(crate) fn direct(state: Arc<NetworkProxyState>) -> Self {
|
||||||
Self::new(ProxyConfig::default())
|
Self::new(
|
||||||
|
ProxyConfig::default(),
|
||||||
|
TargetCheckedTcpConnector::new(state),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn from_env_proxy() -> Self {
|
pub(crate) fn from_env_proxy(state: Arc<NetworkProxyState>) -> Self {
|
||||||
Self::new(ProxyConfig::from_env())
|
Self::new(
|
||||||
|
ProxyConfig::from_env(),
|
||||||
|
TargetCheckedTcpConnector::new(state),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn direct_with_allow_local_binding(allow_local_binding: bool) -> Self {
|
||||||
|
Self::new(
|
||||||
|
ProxyConfig::default(),
|
||||||
|
TargetCheckedTcpConnector::from_allow_local_binding(allow_local_binding),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn from_env_proxy_with_allow_local_binding(allow_local_binding: bool) -> Self {
|
||||||
|
Self::new(
|
||||||
|
ProxyConfig::from_env(),
|
||||||
|
TargetCheckedTcpConnector::from_allow_local_binding(allow_local_binding),
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(target_os = "macos")]
|
#[cfg(target_os = "macos")]
|
||||||
@@ -119,8 +141,8 @@ impl UpstreamClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn new(proxy_config: ProxyConfig) -> Self {
|
fn new(proxy_config: ProxyConfig, transport: TargetCheckedTcpConnector) -> Self {
|
||||||
let connector = build_http_connector();
|
let connector = build_http_connector(transport);
|
||||||
Self {
|
Self {
|
||||||
connector,
|
connector,
|
||||||
proxy_config,
|
proxy_config,
|
||||||
@@ -158,12 +180,13 @@ impl Service<Request<Body>> for UpstreamClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn build_http_connector() -> BoxService<
|
fn build_http_connector(
|
||||||
|
transport: TargetCheckedTcpConnector,
|
||||||
|
) -> BoxService<
|
||||||
Request<Body>,
|
Request<Body>,
|
||||||
EstablishedClientConnection<HttpClientService<Body>, Request<Body>>,
|
EstablishedClientConnection<HttpClientService<Body>, Request<Body>>,
|
||||||
BoxError,
|
BoxError,
|
||||||
> {
|
> {
|
||||||
let transport = TcpConnector::default();
|
|
||||||
let proxy = HttpProxyConnectorLayer::optional().into_layer(transport);
|
let proxy = HttpProxyConnectorLayer::optional().into_layer(transport);
|
||||||
let tls_config = TlsConnectorDataBuilder::new()
|
let tls_config = TlsConnectorDataBuilder::new()
|
||||||
.with_alpn_protocols_http_auto()
|
.with_alpn_protocols_http_auto()
|
||||||
|
|||||||
Reference in new issue
Block a user