mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Allow network policy to enable transparent TCP capture (#61851)
## What changed - Add `transparent_tcp` to network configuration and managed requirements, defaulting to off. When enabled, route outbound TCP from managed Linux sandbox commands through the managed SOCKS5 proxy without requiring an executor startup flag. - Propagate the setting through local and remote execution, require an enabled SOCKS5 proxy, and check the executor's `networkProxyTransparentTcp` capability before remote launches. - Refresh the live proxy when switching between permission profiles with different network settings. ## Testing Add coverage for configuration-driven sandbox capture, rejection of unsupported launch contexts, execution parameter propagation, and live permission profile changes. GitOrigin-RevId: c4db87056de116f433a128806bef673802f35397
This commit is contained in:
@@ -451,6 +451,8 @@ pub struct NetworkRequirementsToml {
|
||||
pub http_port: Option<u16>,
|
||||
pub socks_port: Option<u16>,
|
||||
pub allow_upstream_proxy: Option<bool>,
|
||||
/// Route outbound TCP from managed Linux sandbox commands through the managed SOCKS5 proxy.
|
||||
pub transparent_tcp: Option<bool>,
|
||||
pub dangerously_allow_non_loopback_proxy: Option<bool>,
|
||||
pub dangerously_allow_all_unix_sockets: Option<bool>,
|
||||
pub domains: Option<NetworkDomainPermissionsToml>,
|
||||
@@ -532,6 +534,7 @@ struct RawNetworkRequirementsToml {
|
||||
http_port: Option<u16>,
|
||||
socks_port: Option<u16>,
|
||||
allow_upstream_proxy: Option<bool>,
|
||||
transparent_tcp: Option<bool>,
|
||||
dangerously_allow_non_loopback_proxy: Option<bool>,
|
||||
dangerously_allow_all_unix_sockets: Option<bool>,
|
||||
domains: Option<NetworkDomainPermissionsToml>,
|
||||
@@ -561,6 +564,7 @@ impl<'de> Deserialize<'de> for NetworkRequirementsToml {
|
||||
http_port,
|
||||
socks_port,
|
||||
allow_upstream_proxy,
|
||||
transparent_tcp,
|
||||
dangerously_allow_non_loopback_proxy,
|
||||
dangerously_allow_all_unix_sockets,
|
||||
domains,
|
||||
@@ -591,6 +595,7 @@ impl<'de> Deserialize<'de> for NetworkRequirementsToml {
|
||||
http_port,
|
||||
socks_port,
|
||||
allow_upstream_proxy,
|
||||
transparent_tcp,
|
||||
dangerously_allow_non_loopback_proxy,
|
||||
dangerously_allow_all_unix_sockets,
|
||||
domains: domains
|
||||
@@ -644,6 +649,8 @@ pub struct NetworkConstraints {
|
||||
pub http_port: Option<u16>,
|
||||
pub socks_port: Option<u16>,
|
||||
pub allow_upstream_proxy: Option<bool>,
|
||||
/// Route outbound TCP from managed Linux sandbox commands through the managed SOCKS5 proxy.
|
||||
pub transparent_tcp: Option<bool>,
|
||||
pub dangerously_allow_non_loopback_proxy: Option<bool>,
|
||||
pub dangerously_allow_all_unix_sockets: Option<bool>,
|
||||
pub domains: Option<NetworkDomainPermissionsToml>,
|
||||
@@ -673,6 +680,7 @@ impl From<NetworkRequirementsToml> for NetworkConstraints {
|
||||
http_port,
|
||||
socks_port,
|
||||
allow_upstream_proxy,
|
||||
transparent_tcp,
|
||||
dangerously_allow_non_loopback_proxy,
|
||||
dangerously_allow_all_unix_sockets,
|
||||
domains,
|
||||
@@ -687,6 +695,7 @@ impl From<NetworkRequirementsToml> for NetworkConstraints {
|
||||
http_port,
|
||||
socks_port,
|
||||
allow_upstream_proxy,
|
||||
transparent_tcp,
|
||||
dangerously_allow_non_loopback_proxy,
|
||||
dangerously_allow_all_unix_sockets,
|
||||
domains,
|
||||
@@ -5080,6 +5089,7 @@ command = "python3 /enterprise/hooks/pre.py"
|
||||
[permissions.network]
|
||||
enabled = true
|
||||
allow_upstream_proxy = false
|
||||
transparent_tcp = true
|
||||
dangerously_allow_all_unix_sockets = true
|
||||
managed_allowed_domains_only = true
|
||||
allow_local_binding = false
|
||||
@@ -5114,6 +5124,7 @@ command = "python3 /enterprise/hooks/pre.py"
|
||||
|
||||
assert_eq!(sourced_network.source, source);
|
||||
assert_eq!(sourced_network.value.enabled, Some(true));
|
||||
assert_eq!(sourced_network.value.transparent_tcp, Some(true));
|
||||
assert_eq!(sourced_network.value.allow_upstream_proxy, Some(false));
|
||||
assert_eq!(
|
||||
sourced_network.value.dangerously_allow_all_unix_sockets,
|
||||
|
||||
@@ -331,6 +331,8 @@ pub struct NetworkToml {
|
||||
pub enabled: Option<bool>,
|
||||
pub proxy_url: Option<String>,
|
||||
pub enable_socks5: Option<bool>,
|
||||
/// Route outbound TCP from managed Linux sandbox commands through the managed SOCKS5 proxy.
|
||||
pub transparent_tcp: Option<bool>,
|
||||
pub socks_url: Option<String>,
|
||||
pub enable_socks5_udp: Option<bool>,
|
||||
pub allow_upstream_proxy: Option<bool>,
|
||||
@@ -543,6 +545,9 @@ impl NetworkToml {
|
||||
if let Some(proxy_url) = self.proxy_url.as_ref() {
|
||||
config.proxy_url = proxy_url.clone();
|
||||
}
|
||||
if let Some(transparent_tcp) = self.transparent_tcp {
|
||||
config.transparent_tcp = transparent_tcp;
|
||||
}
|
||||
if let Some(enable_socks5) = self.enable_socks5 {
|
||||
config.enable_socks5 = enable_socks5;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user