mirror of
https://github.com/openai/codex.git
synced 2026-10-21 17:48:44 +00:00
## What changed - Define `capabilities/discoverV2` request and inventory types and advertise `capabilityDiscoveryV2` in executor metadata. - Prewarm installed plugin and global skill locations at server startup, with nonfatal scan failures. - Add sandbox-scoped discovery caching with file watcher invalidation and request-time reloads when watching is unavailable. - Batch metadata reads through the filesystem sandbox helper and bound discovery responses to 4 MiB and 2,048 capabilities. - Share plugin identity and installed-version selection in `codex-core-plugin-common`, and fall back to `.app.json` when a plugin does not declare an apps configuration. The V2 discovery manager is not yet wired into RPC request dispatch. ## Testing Add coverage for inventory metadata, sandbox cache isolation, watcher invalidation, startup scan failures, response limits, and compatibility with older executor metadata. GitOrigin-RevId: a223a5bc15fdf251023c0c71f468fd92c3b2d847
84 lines
2.8 KiB
Rust
84 lines
2.8 KiB
Rust
//! Stable plugin identifier parsing and validation shared with the plugin cache.
|
|
|
|
#[derive(Debug, thiserror::Error)]
|
|
pub enum PluginIdError {
|
|
#[error("{0}")]
|
|
Invalid(String),
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
|
|
pub struct PluginId {
|
|
pub plugin_name: String,
|
|
pub marketplace_name: String,
|
|
}
|
|
|
|
impl PluginId {
|
|
pub fn new(plugin_name: String, marketplace_name: String) -> Result<Self, PluginIdError> {
|
|
validate_plugin_segment(&plugin_name, "plugin name").map_err(PluginIdError::Invalid)?;
|
|
validate_plugin_segment(&marketplace_name, "marketplace name")
|
|
.map_err(PluginIdError::Invalid)?;
|
|
Ok(Self {
|
|
plugin_name,
|
|
marketplace_name,
|
|
})
|
|
}
|
|
|
|
pub fn parse(plugin_key: &str) -> Result<Self, PluginIdError> {
|
|
let Some((plugin_name, marketplace_name)) = plugin_key.rsplit_once('@') else {
|
|
return Err(PluginIdError::Invalid(format!(
|
|
"invalid plugin key `{plugin_key}`; expected <plugin>@<marketplace>"
|
|
)));
|
|
};
|
|
if plugin_name.is_empty() || marketplace_name.is_empty() {
|
|
return Err(PluginIdError::Invalid(format!(
|
|
"invalid plugin key `{plugin_key}`; expected <plugin>@<marketplace>"
|
|
)));
|
|
}
|
|
|
|
Self::new(plugin_name.to_string(), marketplace_name.to_string()).map_err(|err| match err {
|
|
PluginIdError::Invalid(message) => {
|
|
PluginIdError::Invalid(format!("{message} in `{plugin_key}`"))
|
|
}
|
|
})
|
|
}
|
|
|
|
pub fn as_key(&self) -> String {
|
|
format!("{}@{}", self.plugin_name, self.marketplace_name)
|
|
}
|
|
}
|
|
|
|
/// Validates a single path segment used in plugin IDs and cache layout.
|
|
pub fn validate_plugin_segment(segment: &str, kind: &str) -> Result<(), String> {
|
|
if segment.is_empty() {
|
|
return Err(format!("invalid {kind}: must not be empty"));
|
|
}
|
|
let allow_dots = kind == "plugin name";
|
|
if allow_dots && matches!(segment, "." | "..") {
|
|
return Err(format!("invalid {kind}: path traversal is not allowed"));
|
|
}
|
|
if allow_dots && (segment.starts_with('.') || segment.ends_with('.') || segment.contains(".."))
|
|
{
|
|
return Err(format!(
|
|
"invalid {kind}: dots must separate non-empty name segments"
|
|
));
|
|
}
|
|
if !segment
|
|
.chars()
|
|
.all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '-' | '_') || allow_dots && ch == '.')
|
|
{
|
|
let allowed_characters = if allow_dots {
|
|
"ASCII letters, digits, `.`, `_`, and `-`"
|
|
} else {
|
|
"ASCII letters, digits, `_`, and `-`"
|
|
};
|
|
return Err(format!(
|
|
"invalid {kind}: only {allowed_characters} are allowed"
|
|
));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "plugin_id_tests.rs"]
|
|
mod tests;
|