Skip to content

feat(auth): add X.509 token exchange - #940

Merged
jbeckwith-oai merged 5 commits into
mainfrom
codex/x509-java-v2-exchange
Aug 27, 2026
Merged

feat(auth): add X.509 token exchange#940
jbeckwith-oai merged 5 commits into
mainfrom
codex/x509-java-v2-exchange

Conversation

@jbeckwith-oai

Copy link
Copy Markdown
Contributor

Summary

  • add an internal, exact X.509 workload token exchange on the existing X509Transport foundation
  • validate the fixed issuer request and require an unambiguous HTTP 200 bearer-token response with the exact issued-token type and bounded lifetime
  • keep credential-bearing bodies and headers out of diagnostics while preserving issuer body IOException and SocketTimeoutException causes as retryable I/O failures
  • provide sync/async parity, dedicated bounded response parsing, cancellation-safe response ownership, and a tiny OkHttp complete-or-close handoff
  • cover the public transport boundary, loopback mTLS wire contract, malformed/duplicate/large responses, redaction, I/O taxonomy, executor ownership, and late cancellation races

Scope

This is the bounded token-exchange layer only. It does not add caching or refresh, client-builder integration, public API, generated service changes, generic retry changes, Castiron changes, or broader lifecycle/deadline/cancellation architecture.

Validation

  • focused X.509 and OkHttp tests
  • full ./scripts/test
  • full ./scripts/lint
  • ./scripts/detect-breaking-changes 35324bf54adf68ea1853f7684bdbdf29c9fd329c
  • Castiron custom-code tests and budget check (1,610 / 2,000; 390 lines headroom)
  • Codex Security diff scan fc7c6c43-570b-4fa3-944a-91f9e2d6d721: complete coverage, no findings
  • adversarial review converged after two consecutive clean rounds, each with two fresh independent reviewers

@jbeckwith-oai
jbeckwith-oai requested a review from a team as a code owner August 27, 2026 00:51
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Aug 27, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review Completed 2026-08-27T15:49:21.255966Z 8484d16 New commits
🔒 Security Review Completed 2026-08-27T15:50:06.335198Z 8484d16 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@openai-sdks

openai-sdks Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

OkTest Summary

237/237 SDK tests passed in 15.648s for Java SDK PR #940.

Test results — 42 files
Test Result Time
tests/chat-completions-complex-body.test.ts ✅ Passed 324ms
tests/chat-completions-create.test.ts ✅ Passed 752ms
tests/chat-completions-stream.test.ts ✅ Passed 323ms
tests/files-content-binary.test.ts ✅ Passed 291ms
tests/files-create-multipart.test.ts ✅ Passed 401ms
tests/files-list-pagination.test.ts ✅ Passed 240ms
tests/initialize-config.test.ts ✅ Passed 166ms
tests/instance-isolation.test.ts ✅ Passed 180ms
tests/models-list.test.ts ✅ Passed 224ms
tests/responses-background-lifecycle.test.ts ✅ Passed 287ms
tests/responses-body-method-errors.test.ts ✅ Passed 430ms
tests/responses-cancel-timeout.test.ts ✅ Passed 189ms
tests/responses-cancel.test.ts ✅ Passed 259ms
tests/responses-compact-retries.test.ts ✅ Passed 413ms
tests/responses-compact.test.ts ✅ Passed 396ms
tests/responses-create-advanced-stream.test.ts ✅ Passed 613ms
tests/responses-create-advanced.test.ts ✅ Passed 1.168s
tests/responses-create-disconnect.test.ts ✅ Passed 1.049s
tests/responses-create-errors.test.ts ✅ Passed 333ms
tests/responses-create-malformed-api-responses.test.ts ✅ Passed 251ms
tests/responses-create-retries.test.ts ✅ Passed 649ms
tests/responses-create-stream-failures.test.ts ✅ Passed 231ms
tests/responses-create-stream-timeout.test.ts ✅ Passed 210ms
tests/responses-create-stream-wire.test.ts ✅ Passed 5.466s
tests/responses-create-stream.test.ts ✅ Passed 386ms
tests/responses-create-terminal-states.test.ts ✅ Passed 356ms
tests/responses-create-timeout.test.ts ✅ Passed 214ms
tests/responses-create.test.ts ✅ Passed 307ms
tests/responses-delete.test.ts ✅ Passed 265ms
tests/responses-input-items-errors.test.ts ✅ Passed 260ms
tests/responses-input-items-list.test.ts ✅ Passed 323ms
tests/responses-input-items-options.test.ts ✅ Passed 340ms
tests/responses-input-tokens-count-timeout.test.ts ✅ Passed 318ms
tests/responses-input-tokens-count.test.ts ✅ Passed 303ms
tests/responses-malformed-inputs.test.ts ✅ Passed 4.424s
tests/responses-not-found-errors.test.ts ✅ Passed 375ms
tests/responses-parse.test.ts ✅ Passed 523ms
tests/responses-retrieve-retries.test.ts ✅ Passed 291ms
tests/responses-retrieve.test.ts ✅ Passed 540ms
tests/responses-stored-method-errors.test.ts ✅ Passed 997ms
tests/retry-behavior.test.ts ✅ Passed 3.403s
tests/sdk-error-shape.test.ts ✅ Passed 498ms

View OkTest run #33089743930

SDK merge (c3ac33031f5d) · head (8484d16167db) · base (98e1d21b1c91) · OkTest (2b1bdfd25e98)

@github-actions

github-actions Bot commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

Castiron custom code

✅ No new custom-code files detected.

53 mixed files remain; 0 existing customizations changed.

Compared 98e1d21b1c918484d16167db. Generated baselines verified.

53 existing customizations unchanged
  • openai-java-core/src/main/kotlin/com/openai/models/audio/AudioResponseFormat.kt
  • openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionCreateParams.kt
  • openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionMessageFunctionToolCall.kt
  • openai-java-core/src/main/kotlin/com/openai/models/chat/completions/ChatCompletionToolMessageParam.kt
  • openai-java-core/src/main/kotlin/com/openai/models/embeddings/Embedding.kt
  • openai-java-core/src/main/kotlin/com/openai/models/embeddings/EmbeddingCreateParams.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseCreateParams.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseFunctionToolCall.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseFunctionWebSearch.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseInputItem.kt
  • openai-java-core/src/main/kotlin/com/openai/models/responses/ResponseTextConfig.kt
  • openai-java-core/src/main/kotlin/com/openai/models/videos/Video.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/BetaServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/ResponseServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/ResponseServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/WebhookServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/WebhookServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/audio/TranscriptionServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/chat/ChatCompletionServiceAsync.kt
  • openai-java-core/src/main/kotlin/com/openai/services/async/finetuning/checkpoints/PermissionServiceAsyncImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/BetaServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/ResponseService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/ResponseServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/WebhookService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/WebhookServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/audio/TranscriptionServiceImpl.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/chat/ChatCompletionService.kt
  • openai-java-core/src/main/kotlin/com/openai/services/blocking/finetuning/checkpoints/PermissionServiceImpl.kt
  • openai-java-core/src/test/kotlin/com/openai/models/beta/responses/BetaResponsesServerEventTest.kt
  • openai-java-core/src/test/kotlin/com/openai/models/responses/ResponsesServerEventTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/CompletionServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/ImageServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/ResponseServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/WebhookServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/audio/TranscriptionServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/beta/ResponseServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/beta/ThreadServiceAsyncTest.kt
  • openai-java-core/src/test/kotlin/com/openai/services/async/beta/threads/RunServiceAsyncTest.kt

13 more in the full report.

A changed generated baseline means this report cannot reliably identify which handwritten lines changed.

Inspect the custom-code diff

Download the exact patch produced by this run (requires repository access):

gh run download 33089784911 --repo openai/openai-java \
  --name castiron-custom-code-33089784911-1 --dir /tmp/castiron-custom-code-33089784911-1
git apply --stat /tmp/castiron-custom-code-33089784911-1/custom-code.patch
cat /tmp/castiron-custom-code-33089784911-1/custom-code.patch

Or reproduce it from an SDK checkout containing the vendored reporter:

git fetch --no-tags origin 98e1d21b1c91d3c12f138a471afa78d1d8ebf0e9 8484d16167dbd2c74a7aa012e45f37d878a4105f
python3 scripts/castiron/custom_code_report.py report \
  --base 98e1d21b1c91d3c12f138a471afa78d1d8ebf0e9 \
  --head 8484d16167dbd2c74a7aa012e45f37d878a4105f --fetch --require-head-hash --public \
  --out /tmp/castiron-custom-code-8484d16167db
cat /tmp/castiron-custom-code-8484d16167db/custom-code.patch

This is the current full custom patch for mixed files, not an attribution of only the handwritten lines changed by this PR.

Full report and patch

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 75dfa8f281

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@HAYDEN-OAI HAYDEN-OAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed the fixed mTLS issuer boundary, request and token validation, sync/async cancellation ownership, OkHttp response handoff, and existing review threads. The unresolved inline on responseReader.readTree remains substantive: it materializes the entire unbounded issuer response, including arbitrarily large forward-compatible fields, independently in up to four concurrent parser threads; extract the required token fields incrementally while retaining duplicate/trailing-token validation and supported large payloads. The separate existing inline on OAuth errors is also valid: unlike the established workload-identity exchange, non-200 responses lose sanitized error/error_description diagnostics and return only an Unknown error; preserve safe, redacted OAuth diagnostics without exposing credentials. Referencing the existing unresolved threads rather than duplicating their inline comments.

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f29339ab38

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 9da1d2f25e

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@HAYDEN-OAI HAYDEN-OAI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Re-reviewed the full X.509 exchange after the earlier feedback. Confirmed issuer responses now use incremental duplicate-safe JSON parsing with pre-materialization bounds, OAuth diagnostics preserve only safe allowlisted codes while redacting credential-bearing text and headers, and I/O causes remain retryable. Also verified fixed HTTPS mTLS issuer routing with redirects disabled, exact grant and issued-token validation, positive token lifetimes, bounded four-active/four-queued async admission, cancellation-safe response ownership, and sync/async parity. Previous substantive concerns are resolved.

@jbeckwith-oai
jbeckwith-oai added this pull request to the merge queue Aug 27, 2026
Merged via the queue into main with commit df0c88d Aug 27, 2026
13 checks passed
@openai-sdks openai-sdks Bot mentioned this pull request Aug 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants