Skip to content

[mcp] Fix plugin MCP approval policy. #19537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mzeng-openai merged 14 commits into from
Apr 29, 2026
Merged

[mcp] Fix plugin MCP approval policy. #19537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fd8c33a
Add plugin MCP policy persistence
mzeng-openai Apr 25, 2026
ff2c794
Merge branch 'main' of github.com:openai/codex into dev/mzeng/plugin-…
mzeng-openai Apr 26, 2026
8b84a97
update
mzeng-openai Apr 26, 2026
ded7b23
Merge branch 'main' of github.com:openai/codex into dev/mzeng/plugin-…
mzeng-openai Apr 27, 2026
32f8cc5
Merge branch 'main' into dev/mzeng/plugin-mcp-policy
mzeng-openai Apr 27, 2026
59fcc11
update
mzeng-openai Apr 27, 2026
a2ac05a
Merge branch 'dev/mzeng/plugin-mcp-policy' of github.com:openai/codex…
mzeng-openai Apr 27, 2026
023b800
update
mzeng-openai Apr 28, 2026
c29b552
Disable plugin MCPs for empty requirements allowlist
mzeng-openai Apr 28, 2026
3bc4fbf
update
mzeng-openai Apr 28, 2026
01ace3e
Merge branch 'main' into dev/mzeng/plugin-mcp-policy
mzeng-openai Apr 29, 2026
db793b6
Merge branch 'main' of github.com:openai/codex into dev/mzeng/plugin-…
mzeng-openai Apr 29, 2026
b48b58e
Merge branch 'dev/mzeng/plugin-mcp-policy' of github.com:openai/codex…
mzeng-openai Apr 29, 2026
af5fb2d
Merge branch 'main' into dev/mzeng/plugin-mcp-policy
mzeng-openai Apr 29, 2026
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions codex-rs/app-server/src/config_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,7 @@ mod tests {
},
}),
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: Some(CoreResidencyRequirement::Us),
Expand Down Expand Up @@ -670,6 +671,7 @@ mod tests {
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -730,6 +732,7 @@ mod tests {
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down
46 changes: 46 additions & 0 deletions codex-rs/cloud-requirements/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,6 +1207,7 @@ mod tests {
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1288,6 +1289,7 @@ mod tests {
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1320,6 +1322,7 @@ mod tests {
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1369,6 +1372,7 @@ mod tests {
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1403,6 +1407,36 @@ enabled = false
);
}

#[tokio::test]
async fn fetch_cloud_requirements_parses_plugin_mcp_requirements_toml() {
let result = parse_for_fetch(Some(
r#"
[plugins."sample@test".mcp_servers.sample.identity]
command = "sample-mcp"
"#,
));

assert_eq!(
result,
Some(ConfigRequirementsToml {
plugins: Some(BTreeMap::from([(
"sample@test".to_string(),
codex_config::PluginRequirementsToml {
mcp_servers: Some(BTreeMap::from([(
"sample".to_string(),
codex_config::McpServerRequirement {
identity: codex_config::McpServerIdentity::Command {
command: "sample-mcp".to_string(),
},
},
)])),
},
)])),
..Default::default()
})
);
}

#[tokio::test(start_paused = true)]
async fn fetch_cloud_requirements_times_out() {
let auth_manager = auth_manager_with_plan("enterprise").await;
Expand Down Expand Up @@ -1454,6 +1488,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1533,6 +1568,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1610,6 +1646,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1815,6 +1852,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1854,6 +1892,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1913,6 +1952,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -1968,6 +2008,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -2025,6 +2066,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -2083,6 +2125,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -2141,6 +2184,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -2229,6 +2273,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down Expand Up @@ -2259,6 +2304,7 @@ enabled = false
feature_requirements: None,
hooks: None,
mcp_servers: None,
plugins: None,
apps: None,
rules: None,
enforce_residency: None,
Expand Down
Loading
Loading