mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
unify permission preset logic
This commit is contained in:
@@ -2417,7 +2417,6 @@ async fn default_permissions_can_select_builtin_profile_without_permissions_tabl
|
||||
.await?;
|
||||
|
||||
assert!(config.explicit_permission_profile_mode);
|
||||
assert!(config.custom_permission_profiles.is_empty());
|
||||
let policy = config.permissions.file_system_sandbox_policy();
|
||||
assert_eq!(
|
||||
config
|
||||
|
||||
@@ -3773,7 +3773,6 @@ impl Config {
|
||||
windows_sandbox_private_desktop,
|
||||
},
|
||||
explicit_permission_profile_mode,
|
||||
custom_permission_profiles,
|
||||
approvals_reviewer: constrained_approvals_reviewer.value(),
|
||||
enforce_residency: enforce_residency.value,
|
||||
notify: cfg.notify,
|
||||
|
||||
@@ -5,9 +5,7 @@ use super::permissions::BUILT_IN_READ_ONLY_PROFILE;
|
||||
use super::permissions::BUILT_IN_WORKSPACE_PROFILE;
|
||||
use super::permissions::builtin_permission_profile;
|
||||
use super::permissions::compile_permission_profile_selection;
|
||||
use crate::windows_sandbox::WindowsSandboxLevelExt;
|
||||
use codex_config::config_toml::ConfigToml;
|
||||
use codex_protocol::config_types::WindowsSandboxLevel;
|
||||
use codex_protocol::models::PermissionProfile;
|
||||
use std::io::ErrorKind;
|
||||
|
||||
@@ -15,12 +13,11 @@ use std::io::ErrorKind;
|
||||
pub struct SelectablePermissionProfile {
|
||||
pub id: String,
|
||||
pub description: Option<String>,
|
||||
pub is_default: bool,
|
||||
}
|
||||
|
||||
impl Config {
|
||||
/// Returns named permission profiles that can be selected under the current requirements.
|
||||
pub async fn selectable_permission_profiles(
|
||||
/// Returns built-in and configured permission profiles allowed by current requirements.
|
||||
pub fn selectable_permission_profiles(
|
||||
&self,
|
||||
) -> std::io::Result<Vec<SelectablePermissionProfile>> {
|
||||
let config_toml: ConfigToml = self
|
||||
@@ -31,26 +28,6 @@ impl Config {
|
||||
let requirements_toml = self.config_layer_stack.requirements_toml();
|
||||
let permissions =
|
||||
merge_managed_permission_profiles(config_toml.permissions.as_ref(), requirements_toml)?;
|
||||
let active_profile_id = self
|
||||
.permissions
|
||||
.active_permission_profile()
|
||||
.map(|profile| profile.id);
|
||||
let requirements = self.config_layer_stack.requirements();
|
||||
let default_permission_profile = if active_profile_id.is_none() {
|
||||
let mut permission_profile = requirements.permission_profile.clone();
|
||||
let configured_profile = config_toml
|
||||
.derive_permission_profile(
|
||||
/*sandbox_mode_override*/ None,
|
||||
WindowsSandboxLevel::from_config(self),
|
||||
Some(&self.active_project),
|
||||
Some(&requirements.permission_profile),
|
||||
)
|
||||
.await;
|
||||
let _ = permission_profile.set(configured_profile);
|
||||
Some(permission_profile.get().clone())
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let mut profiles = Vec::new();
|
||||
|
||||
for id in [
|
||||
@@ -62,8 +39,6 @@ impl Config {
|
||||
permissions.as_ref(),
|
||||
id,
|
||||
/*description*/ None,
|
||||
active_profile_id.as_deref(),
|
||||
default_permission_profile.as_ref(),
|
||||
) {
|
||||
profiles.push(profile);
|
||||
}
|
||||
@@ -74,8 +49,6 @@ impl Config {
|
||||
Some(permissions),
|
||||
id,
|
||||
profile.description.clone(),
|
||||
active_profile_id.as_deref(),
|
||||
default_permission_profile.as_ref(),
|
||||
) {
|
||||
profiles.push(profile);
|
||||
}
|
||||
@@ -90,8 +63,6 @@ impl Config {
|
||||
permissions: Option<&codex_config::permissions_toml::PermissionsToml>,
|
||||
id: &str,
|
||||
description: Option<String>,
|
||||
active_profile_id: Option<&str>,
|
||||
default_permission_profile: Option<&PermissionProfile>,
|
||||
) -> Option<SelectablePermissionProfile> {
|
||||
if self
|
||||
.config_layer_stack
|
||||
@@ -120,21 +91,16 @@ impl Config {
|
||||
self.permissions
|
||||
.can_set_permission_profile(&permission_profile)
|
||||
.ok()?;
|
||||
let mut constrained_permission_profile = self
|
||||
.config_layer_stack
|
||||
self.config_layer_stack
|
||||
.requirements()
|
||||
.permission_profile
|
||||
.clone();
|
||||
constrained_permission_profile
|
||||
.clone()
|
||||
.set(permission_profile)
|
||||
.ok()?;
|
||||
|
||||
Some(SelectablePermissionProfile {
|
||||
id: id.to_string(),
|
||||
description,
|
||||
is_default: active_profile_id == Some(id)
|
||||
|| active_profile_id.is_none()
|
||||
&& default_permission_profile == Some(constrained_permission_profile.get()),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user