Skip to content

armgit / codex

Public Imported from GitHub
0

Lightweight coding agent that runs in your terminal

Rust

Restrict MCP OAuth authorization endpoints to HTTP(S) (#47326)

viyatb-oai2c2a42e65de0
diff --git a/codex-rs/app-server/README.md b/codex-rs/app-server/README.md
index 3971578823..67fa723cc7 100644
--- a/codex-rs/app-server/README.md
+++ b/codex-rs/app-server/README.md
@@ -294,6 +294,11 @@ This is the server's advertised MCP capabilities object, including its `extensio
map. It is null when the connection has not initialized successfully; capabilities
are never inferred from tools or copied from a shared catalog cache.
+# MCP OAuth login
+
+`mcpServer/oauth/login` only returns HTTP(S) authorization URLs. Authorization
+endpoints with other schemes fail before client registration or URL return.
+
# Thread rollback
`thread/rollback` has been removed from the API, including its request and response
diff --git a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs
index cac26eb42a..151b694fb8 100644
--- a/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs
+++ b/codex-rs/ext/guardian-v2/src/async_scorer/extension_tests.rs
@@ -57,6 +57,7 @@ use codex_protocol::protocol::ReviewDecision;
use codex_protocol::protocol::SessionSource;
use codex_protocol::protocol::TruncationPolicy;
use codex_protocol::security_risk::SecurityRiskScore;
+use core_test_support::ThreadIdle;
use core_test_support::responses;
use core_test_support::responses::WebSocketConnectionConfig;
use core_test_support::responses::ev_assistant_message;
@@ -853,7 +854,10 @@ async fn sample_configured_conversation_history_with_source(
"{guardian_config}\n[features.guardianv2.review_scope]\ncomputer_use_only = false\n"
);
let has_model_defaults = model_defaults.is_some();
+ let mut extensions = ExtensionRegistryBuilder::new();
+ extensions.thread_lifecycle_contributor(Arc::new(ThreadIdle));
let builder = test_codex()
+ .with_extensions(Arc::new(extensions.build()))
.with_auth(CodexAuth::create_dummy_chatgpt_auth_for_testing())
.with_model_info_override("codex-auto-review", |model_info| {
model_info
@@ -2376,6 +2380,8 @@ async fn cached_score_survives_compaction_and_internal_context_but_not_user_inpu
matches!(event, EventMsg::TurnComplete(_))
})
.await;
+ // TurnComplete precedes active-turn cleanup; wait before injecting user input.
+ ThreadIdle::wait(&test.codex).await;
assert_eq!(
cached_approval(
&registry,
diff --git a/codex-rs/ext/queue/tests/queue_service.rs b/codex-rs/ext/queue/tests/queue_service.rs
index 9a3350ae3e..5ffb3420b7 100644
--- a/codex-rs/ext/queue/tests/queue_service.rs
+++ b/codex-rs/ext/queue/tests/queue_service.rs
@@ -576,6 +576,21 @@ async fn advance_queue_poll() {
tokio::time::resume();
}
+async fn wait_for_queue_empty(
+ queue: &QueuedItemService,
+ thread_id: ThreadId,
+) -> anyhow::Result<()> {
+ // A turn can complete before the dispatcher finishes deleting its queued item.
+ tokio::time::timeout(Duration::from_secs(/*secs*/ 10), async {
+ while !queue.list(thread_id).await?.is_empty() {
+ tokio::time::sleep(Duration::from_millis(/*millis*/ 10)).await;
+ }
+ anyhow::Ok(())
+ })
+ .await
+ .context("queued item was not consumed")?
+}
+
#[tokio::test]
async fn externally_changed_queues_dispatch_independently_and_retry_failed_wakes()
-> anyhow::Result<()> {
@@ -662,10 +677,9 @@ async fn externally_changed_queues_dispatch_independently_and_retry_failed_wakes
Duration::from_secs(/*secs*/ 25),
)
.await;
- advance_queue_poll().await;
- assert!(queue.list(thread_id).await?.is_empty());
- assert!(queue.list(independent_thread.thread_id).await?.is_empty());
+ wait_for_queue_empty(&queue, thread_id).await?;
+ wait_for_queue_empty(&queue, independent_thread.thread_id).await?;
let rollout_path = test.codex.rollout_path().context("rollout path missing")?;
test.codex.shutdown_and_wait().await?;
@@ -691,7 +705,7 @@ async fn externally_changed_queues_dispatch_independently_and_retry_failed_wakes
Duration::from_secs(/*secs*/ 25),
)
.await;
- assert!(queue.list(thread_id).await?.is_empty());
+ wait_for_queue_empty(&queue, thread_id).await?;
let prompts = model_responses
.requests()
diff --git a/codex-rs/rmcp-client/src/oauth/issuer_binding.rs b/codex-rs/rmcp-client/src/oauth/issuer_binding.rs
index 5a12bf4024..24e264bc05 100644
--- a/codex-rs/rmcp-client/src/oauth/issuer_binding.rs
+++ b/codex-rs/rmcp-client/src/oauth/issuer_binding.rs
@@ -7,12 +7,15 @@ use url::Url;
use super::StoredOAuthTokens;
-/// Reject authorization endpoints that cannot be bound to their actual issuer.
+/// Reject non-web authorization endpoints or endpoints that cannot be bound to their issuer.
pub(crate) fn validate_authorization_server_endpoints(
metadata: &AuthorizationMetadata,
) -> Result<()> {
let authorization_endpoint = Url::parse(&metadata.authorization_endpoint)
.context("OAuth authorization endpoint must be a valid URL")?;
+ if !matches!(authorization_endpoint.scheme(), "http" | "https") {
+ bail!("OAuth authorization endpoint must use HTTP or HTTPS");
+ }
let issuer = metadata
.issuer
.as_deref()