Merge 4b7d0681bd into sapling-pr-archive-bolinfest

This commit is contained in:
Michael Bolin
2026-03-03 23:12:21 -08:00
committed by GitHub
3 changed files with 179 additions and 16 deletions
+93 -2
View File
@@ -1940,14 +1940,14 @@ impl Config {
let (mut file_system_sandbox_policy, network_sandbox_policy) =
compile_permission_profile(permissions, default_permissions)?;
let mut sandbox_policy = file_system_sandbox_policy
.to_legacy_sandbox_policy(network_sandbox_policy, &resolved_cwd);
.to_legacy_sandbox_policy(network_sandbox_policy, &resolved_cwd)?;
if matches!(sandbox_policy, SandboxPolicy::WorkspaceWrite { .. }) {
add_additional_file_system_writes(
&mut file_system_sandbox_policy,
&additional_writable_roots,
);
sandbox_policy = file_system_sandbox_policy
.to_legacy_sandbox_policy(network_sandbox_policy, &resolved_cwd);
.to_legacy_sandbox_policy(network_sandbox_policy, &resolved_cwd)?;
}
(
sandbox_policy,
@@ -3150,6 +3150,97 @@ default_permissions = "workspace"
Ok(())
}
#[test]
fn permissions_profiles_reject_writes_outside_workspace_root() -> std::io::Result<()> {
let codex_home = TempDir::new()?;
let cwd = TempDir::new()?;
std::fs::write(cwd.path().join(".git"), "gitdir: nowhere")?;
let external_write_path = if cfg!(windows) { r"C:\temp" } else { "/tmp" };
let err = Config::load_from_base_config_with_overrides(
ConfigToml {
default_permissions: Some("workspace".to_string()),
permissions: Some(PermissionsToml {
entries: BTreeMap::from([(
"workspace".to_string(),
PermissionProfileToml {
extends: None,
filesystem: Some(FilesystemPermissionsToml {
entries: BTreeMap::from([(
external_write_path.to_string(),
FilesystemPermissionToml::Access(FileSystemAccessMode::Write),
)]),
}),
network: None,
},
)]),
}),
..Default::default()
},
ConfigOverrides {
cwd: Some(cwd.path().to_path_buf()),
..Default::default()
},
codex_home.path().to_path_buf(),
)
.expect_err("writes outside the workspace root should be rejected");
assert_eq!(err.kind(), ErrorKind::InvalidInput);
assert!(
err.to_string()
.contains("filesystem writes outside the workspace root"),
"{err}"
);
Ok(())
}
#[test]
fn permissions_profiles_reject_unsupported_network_fields() -> std::io::Result<()> {
let codex_home = TempDir::new()?;
let cwd = TempDir::new()?;
std::fs::write(cwd.path().join(".git"), "gitdir: nowhere")?;
let err = Config::load_from_base_config_with_overrides(
ConfigToml {
default_permissions: Some("workspace".to_string()),
permissions: Some(PermissionsToml {
entries: BTreeMap::from([(
"workspace".to_string(),
PermissionProfileToml {
extends: None,
filesystem: Some(FilesystemPermissionsToml {
entries: BTreeMap::from([(
":minimal".to_string(),
FilesystemPermissionToml::Access(FileSystemAccessMode::Read),
)]),
}),
network: Some(NetworkToml {
enabled: Some(true),
proxy_url: Some("http://127.0.0.1:43128".to_string()),
..Default::default()
}),
},
)]),
}),
..Default::default()
},
ConfigOverrides {
cwd: Some(cwd.path().to_path_buf()),
..Default::default()
},
codex_home.path().to_path_buf(),
)
.expect_err("unsupported profile network fields should be rejected");
assert_eq!(err.kind(), ErrorKind::InvalidInput);
assert!(
err.to_string()
.contains("uses unsupported `[permissions.workspace.network]` fields"),
"{err}"
);
Ok(())
}
#[test]
fn tui_theme_deserializes_from_toml() {
let cfg = r#"
+44 -4
View File
@@ -143,6 +143,23 @@ impl NetworkToml {
self.apply_to_network_proxy_config(&mut config);
config
}
fn profile_has_unsupported_fields(&self) -> bool {
self.proxy_url.is_some()
|| self.admin_url.is_some()
|| self.enable_socks5.is_some()
|| self.socks_url.is_some()
|| self.enable_socks5_udp.is_some()
|| self.allow_upstream_proxy.is_some()
|| self.dangerously_allow_non_loopback_proxy.is_some()
|| self.dangerously_allow_non_loopback_admin.is_some()
|| self.dangerously_allow_all_unix_sockets.is_some()
|| self.mode.is_some()
|| self.allowed_domains.is_some()
|| self.denied_domains.is_some()
|| self.allow_unix_sockets.is_some()
|| self.allow_local_binding.is_some()
}
}
pub(crate) fn network_proxy_config_from_network(
@@ -197,15 +214,38 @@ pub(crate) fn compile_permission_profile(
compile_filesystem_permission(path, permission, &mut entries)?;
}
let network_sandbox_policy =
compile_network_sandbox_policy(profile.network.as_ref(), profile_name)?;
Ok((
FileSystemSandboxPolicy::restricted(entries),
match profile.network.as_ref().and_then(|network| network.enabled) {
Some(true) => NetworkSandboxPolicy::Enabled,
_ => NetworkSandboxPolicy::Restricted,
},
network_sandbox_policy,
))
}
fn compile_network_sandbox_policy(
network: Option<&NetworkToml>,
profile_name: &str,
) -> io::Result<NetworkSandboxPolicy> {
let Some(network) = network else {
return Ok(NetworkSandboxPolicy::Restricted);
};
if network.profile_has_unsupported_fields() {
return Err(io::Error::new(
io::ErrorKind::InvalidInput,
format!(
"permissions profile `{profile_name}` uses unsupported `[permissions.{profile_name}.network]` fields; only `enabled` is supported for now"
),
));
}
Ok(match network.enabled {
Some(true) => NetworkSandboxPolicy::Enabled,
_ => NetworkSandboxPolicy::Restricted,
})
}
fn compile_filesystem_permission(
path: &str,
permission: &FilesystemPermissionToml,