File size: 13,467 Bytes
52a9af3 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 | use super::CredentialBrokerProjectState;
use super::apply_credential_broker_requirements;
use super::credential_broker_trusted_config;
use super::discover_project_layers;
use super::layer_io;
use super::load_config_toml_for_required_layer_raw;
use super::load_requirements_toml;
use super::load_root_checkout_project_config;
use super::project_discovery;
use super::project_root_markers_from_config;
use super::project_trust_context;
use super::requirements_layers_from_legacy_scheme;
use super::system_config_toml_file_with_overrides;
use super::system_requirements_toml_file_with_overrides;
use crate::CONFIG_TOML_FILE;
use crate::ConfigLayerSource;
use crate::LoaderOverrides;
use crate::RequirementSource;
use crate::RequirementsLayerEntry;
use crate::compose_requirements;
use crate::default_project_root_markers;
use crate::merge_toml_values;
use codex_file_system::ExecutorFileSystem;
use codex_utils_absolute_path::AbsolutePathBuf;
use std::collections::BTreeMap;
use std::io;
use std::path::Path;
use toml::Value as TomlValue;
/// Executor-local configuration and requirements layers before schema-specific
/// path resolution or requirements composition.
#[derive(Debug, Clone, PartialEq)]
pub struct LocalConfigLayers {
pub config: LocalTomlLayerStack<ConfigLayerSource>,
pub requirements: LocalTomlLayerStack<RequirementSource>,
}
impl LocalConfigLayers {
/// Retains only the requested TOML paths and drops empty layers.
///
/// An empty path selects the entire document. RPC boundaries should reject
/// that form if whole-document reads are not part of their contract.
pub fn project(self, config_paths: &[Vec<String>], requirements_paths: &[Vec<String>]) -> Self {
Self {
config: self.config.project(config_paths),
requirements: self.requirements.project(requirements_paths),
}
}
}
/// One ordered set of executor-local TOML layers.
#[derive(Debug, Clone, PartialEq)]
pub struct LocalTomlLayerStack<S> {
/// Layers ordered from lowest to highest precedence.
pub layers: Vec<LocalTomlLayer<S>>,
/// Position at which a caller should insert cloud-provided layers.
pub cloud_insertion_index: usize,
}
impl<S> LocalTomlLayerStack<S> {
fn project(self, paths: &[Vec<String>]) -> Self {
let selectors = SelectorNode::from_paths(paths);
let mut projected_layers = Vec::new();
let mut cloud_insertion_index = 0;
for (index, layer) in self.layers.into_iter().enumerate() {
let Some(toml) = project_toml(&layer.toml, &selectors) else {
continue;
};
if index < self.cloud_insertion_index {
cloud_insertion_index += 1;
}
projected_layers.push(LocalTomlLayer { toml, ..layer });
}
Self {
layers: projected_layers,
cloud_insertion_index,
}
}
}
/// One executor-local TOML source with the directory used to interpret its
/// relative paths.
#[derive(Debug, Clone, PartialEq)]
pub struct LocalTomlLayer<S> {
pub source: S,
pub base_dir: AbsolutePathBuf,
pub toml: TomlValue,
}
/// Loads the fixed executor-local configuration sources used by environment
/// config reads.
///
/// Cloud, selected profiles, session flags, and thread-provided layers are not
/// included. Project discovery uses the executor's system, base-user, and
/// legacy managed configuration.
pub async fn load_local_config_layers(
fs: &dyn ExecutorFileSystem,
codex_home: &Path,
cwd: &AbsolutePathBuf,
) -> io::Result<LocalConfigLayers> {
load_local_config_layers_with_overrides(fs, codex_home, cwd, &LoaderOverrides::default()).await
}
pub(super) async fn load_local_config_layers_with_overrides(
fs: &dyn ExecutorFileSystem,
codex_home: &Path,
cwd: &AbsolutePathBuf,
overrides: &LoaderOverrides,
) -> io::Result<LocalConfigLayers> {
let codex_home = AbsolutePathBuf::from_absolute_path(codex_home)?;
let loaded_managed = layer_io::load_config_layers_internal(
fs,
codex_home.as_path(),
overrides.clone(),
/*strict_config*/ false,
)
.await?;
let system_file = system_config_toml_file_with_overrides(overrides)?;
let system =
load_config_toml_for_required_layer_raw(fs, &system_file, /*strict_config*/ false).await?;
let user_file = codex_home.join(CONFIG_TOML_FILE);
let user =
load_config_toml_for_required_layer_raw(fs, &user_file, /*strict_config*/ false).await?;
let mut discovery_config = TomlValue::Table(toml::map::Map::new());
merge_toml_values(&mut discovery_config, &system.toml);
merge_toml_values(&mut discovery_config, &user.toml);
let trusted_broker_config =
credential_broker_trusted_config(&discovery_config, &[], &loaded_managed);
// Managed file and MDM values also govern the project boundary and trust.
// Only this snapshot is resolved; the returned local layers stay raw.
project_discovery::merge_managed_config_for_discovery(
&mut discovery_config,
&loaded_managed,
codex_home.as_path(),
)?;
let project_root_markers = project_root_markers_from_config(&discovery_config)?
.unwrap_or_else(default_project_root_markers);
let requirements =
local_requirements_layers(fs, codex_home.as_path(), overrides, loaded_managed.clone())
.await?;
let mut trust_context = project_trust_context(
fs,
&discovery_config,
&trusted_broker_config,
cwd,
&project_root_markers,
codex_home.as_path(),
&user_file,
)
.await?;
if trust_context.credential_broker != CredentialBrokerProjectState::Unconfigured {
let broker_requirements = requirements.clone().project(&[
vec!["features".to_string(), "network_proxy".to_string()],
vec![
"feature_requirements".to_string(),
"network_proxy".to_string(),
],
vec!["experimental_network".to_string(), "enabled".to_string()],
]);
let effective_requirements =
compose_requirements(broker_requirements.layers.into_iter().map(|layer| {
RequirementsLayerEntry::from_toml_value(layer.source, layer.toml)
.with_base_dir(layer.base_dir)
}))?
.unwrap_or_default();
apply_credential_broker_requirements(&mut trust_context, &effective_requirements);
}
let project_layers = discover_project_layers(
fs,
cwd,
&trust_context.project_root,
&trust_context,
codex_home.as_path(),
/*strict_config*/ false,
)
.await?;
let mut config_layers = vec![
LocalTomlLayer {
source: ConfigLayerSource::System { file: system_file },
base_dir: system.base_dir,
toml: system.toml,
},
LocalTomlLayer {
source: ConfigLayerSource::User {
file: user_file,
profile: None,
},
base_dir: user.base_dir,
toml: user.toml,
},
];
append_project_layers(fs, &mut config_layers, project_layers.layers).await?;
append_legacy_config_layers(&mut config_layers, loaded_managed, &codex_home)?;
Ok(LocalConfigLayers {
config: LocalTomlLayerStack {
layers: config_layers,
// Cloud config follows the required system layer.
cloud_insertion_index: 1,
},
requirements,
})
}
async fn append_project_layers(
fs: &dyn ExecutorFileSystem,
output: &mut Vec<LocalTomlLayer<ConfigLayerSource>>,
layers: Vec<super::DiscoveredProjectLayer>,
) -> io::Result<()> {
for layer in layers {
if layer.disabled_reason.is_some() {
continue;
}
let mut config = layer.config;
if layer.hooks_config_folder_override.is_some()
&& let Some(table) = config.as_table_mut()
{
table.remove("hooks");
}
output.push(LocalTomlLayer {
source: ConfigLayerSource::Project {
dot_codex_folder: layer.dot_codex_folder.clone(),
},
base_dir: layer.dot_codex_folder,
toml: config,
});
let Some(hooks_config_folder) = layer.hooks_config_folder_override else {
continue;
};
let root_config =
load_root_checkout_project_config(fs, &hooks_config_folder, /*is_trusted*/ true)
.await?;
let Some(hooks) = root_config.get("hooks") else {
continue;
};
output.push(LocalTomlLayer {
source: ConfigLayerSource::Project {
dot_codex_folder: hooks_config_folder.clone(),
},
base_dir: hooks_config_folder,
toml: TomlValue::Table(toml::map::Map::from_iter([(
"hooks".to_string(),
hooks.clone(),
)])),
});
}
Ok(())
}
fn append_legacy_config_layers(
output: &mut Vec<LocalTomlLayer<ConfigLayerSource>>,
loaded: layer_io::LoadedConfigLayers,
codex_home: &AbsolutePathBuf,
) -> io::Result<()> {
if let Some(config) = loaded.managed_config {
let base_dir = config.file.parent().ok_or_else(|| {
io::Error::new(
io::ErrorKind::InvalidData,
format!(
"Managed config file {} has no parent directory",
config.file.as_path().display()
),
)
})?;
output.push(LocalTomlLayer {
source: ConfigLayerSource::LegacyManagedConfigTomlFromFile { file: config.file },
base_dir,
toml: config.managed_config,
});
}
if let Some(config) = loaded.managed_config_from_mdm {
output.push(LocalTomlLayer {
source: ConfigLayerSource::LegacyManagedConfigTomlFromMdm,
base_dir: codex_home.clone(),
toml: config.managed_config,
});
}
Ok(())
}
async fn local_requirements_layers(
fs: &dyn ExecutorFileSystem,
codex_home: &Path,
overrides: &LoaderOverrides,
loaded_managed: layer_io::LoadedConfigLayers,
) -> io::Result<LocalTomlLayerStack<RequirementSource>> {
let system_file = system_requirements_toml_file_with_overrides(overrides)?;
let system = load_requirements_toml(fs, &system_file).await?;
let cloud_insertion_index = usize::from(system.is_some());
let mut entries = Vec::new();
entries.extend(system);
entries.extend(requirements_layers_from_legacy_scheme(
loaded_managed,
codex_home,
)?);
#[cfg(target_os = "macos")]
{
let codex_home = AbsolutePathBuf::from_absolute_path(codex_home)?;
entries.extend(
super::macos::load_managed_admin_requirements_layer(
overrides
.macos_managed_config_requirements_base64
.as_deref(),
)
.await?
.map(|layer| layer.with_base_dir(codex_home)),
);
}
let mut layers = Vec::with_capacity(entries.len());
for entry in entries {
layers.push(local_requirements_layer(entry)?);
}
Ok(LocalTomlLayerStack {
layers,
cloud_insertion_index,
})
}
fn local_requirements_layer(
entry: RequirementsLayerEntry,
) -> io::Result<LocalTomlLayer<RequirementSource>> {
let (source, toml, base_dir) = entry.into_raw_parts()?;
let base_dir = base_dir.ok_or_else(|| {
io::Error::new(
io::ErrorKind::InvalidData,
format!("requirements layer {source} has no base directory"),
)
})?;
Ok(LocalTomlLayer {
source,
base_dir,
toml,
})
}
#[derive(Default)]
struct SelectorNode {
terminal: bool,
children: BTreeMap<String, SelectorNode>,
}
impl SelectorNode {
fn from_paths(paths: &[Vec<String>]) -> Self {
let mut root = Self::default();
for path in paths {
root.insert(path);
}
root
}
fn insert(&mut self, path: &[String]) {
if self.terminal {
return;
}
let Some((segment, remaining)) = path.split_first() else {
self.terminal = true;
self.children.clear();
return;
};
self.children
.entry(segment.clone())
.or_default()
.insert(remaining);
}
}
fn project_toml(value: &TomlValue, selector: &SelectorNode) -> Option<TomlValue> {
let projected = project_toml_value(value, selector);
if !selector.terminal && projected.as_table().is_some_and(toml::map::Map::is_empty) {
return None;
}
Some(projected)
}
fn project_toml_value(value: &TomlValue, selector: &SelectorNode) -> TomlValue {
if selector.terminal {
return value.clone();
}
let Some(table) = value.as_table() else {
// Preserve a non-table ancestor so it can still override lower layers.
return value.clone();
};
let mut projected = toml::map::Map::new();
for (key, value) in table {
let Some(child_selector) = selector.children.get(key) else {
continue;
};
projected.insert(key.clone(), project_toml_value(value, child_selector));
}
TomlValue::Table(projected)
}
|