mirror of
https://github.com/openai/codex.git
synced 2026-11-19 22:30:42 +00:00
## What changed - Track verification parameters and attempt IDs with cancellation tokens so callers can reject stale results after cancellation, server resolution, or reconnect. - Add `ResolveUserVerification` to send acceptance proofs or cancellation through MCP elicitation responses, omit proofs from session recordings, and remove resolved prompts from thread replay. - Add typed verification error messages with safe fallbacks that omit raw provider diagnostics. ## Testing Add unit coverage for attempt invalidation, duplicate attempt prevention, proof serialization, resolved prompt replay, and safe error messages. GitOrigin-RevId: 3466c9a83fe5f512a861fec062bef10dcd3025c8
56 lines
2.8 KiB
Rust
56 lines
2.8 KiB
Rust
//! Safe user-facing messages for typed local verification failures.
|
|
|
|
use codex_app_server_client::TypedRequestError;
|
|
use codex_app_server_protocol::UserVerificationCancellationReason;
|
|
use codex_app_server_protocol::UserVerificationErrorDetails;
|
|
use codex_app_server_protocol::UserVerificationFailureReason;
|
|
use codex_app_server_protocol::UserVerificationInvalidRequestReason;
|
|
use codex_app_server_protocol::UserVerificationUnavailableReason;
|
|
|
|
pub(super) fn verification_error_message(error: &TypedRequestError) -> &'static str {
|
|
let TypedRequestError::Server { source, .. } = error else {
|
|
return "Could not complete user verification with the local Codex binary.";
|
|
};
|
|
let details = source
|
|
.data
|
|
.clone()
|
|
.and_then(|data| serde_json::from_value::<UserVerificationErrorDetails>(data).ok());
|
|
match details {
|
|
Some(UserVerificationErrorDetails::InvalidRequest {
|
|
reason: UserVerificationInvalidRequestReason::InvalidParams,
|
|
}) => "The local Codex binary could not verify this request.",
|
|
Some(UserVerificationErrorDetails::Unavailable {
|
|
reason: UserVerificationUnavailableReason::CredentialMissing,
|
|
}) => "No user-verification credential is available in the local Codex binary.",
|
|
Some(UserVerificationErrorDetails::Unavailable {
|
|
reason: UserVerificationUnavailableReason::BiometricsUnavailable,
|
|
}) => "Biometric verification is currently unavailable on this device.",
|
|
Some(UserVerificationErrorDetails::Unavailable {
|
|
reason: UserVerificationUnavailableReason::ProviderUnavailable,
|
|
}) => "User verification is unavailable for this request.",
|
|
Some(UserVerificationErrorDetails::Cancelled {
|
|
reason: UserVerificationCancellationReason::UserCancelled,
|
|
}) => "User verification was cancelled.",
|
|
Some(UserVerificationErrorDetails::Cancelled {
|
|
reason: UserVerificationCancellationReason::Interrupted,
|
|
}) => "User verification was interrupted.",
|
|
Some(UserVerificationErrorDetails::Failed {
|
|
reason: UserVerificationFailureReason::AuthenticationFailed,
|
|
}) => "Biometric verification did not succeed. The request was cancelled.",
|
|
Some(UserVerificationErrorDetails::Failed {
|
|
reason: UserVerificationFailureReason::Timeout,
|
|
}) => "User verification timed out. The request was cancelled.",
|
|
Some(UserVerificationErrorDetails::Failed {
|
|
reason: UserVerificationFailureReason::ProviderError,
|
|
})
|
|
| Some(UserVerificationErrorDetails::Failed {
|
|
reason: UserVerificationFailureReason::ServiceError,
|
|
})
|
|
| None => "The local Codex binary could not complete user verification.",
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
#[path = "user_verification_errors_tests.rs"]
|
|
mod tests;
|