Skip to content

fix(cli): renew client credentials OIDC tokens - #4389

Merged
TaylorMutch merged 3 commits into
ai-openshell:mainfrom
ericcurtin:fix/4287-oidc-client-credentials-renew/ericcurtin
Nov 10, 2026
Merged

TaylorMutch merged 3 commits into
ai-openshell:mainfrom
ericcurtin:fix/4287-oidc-client-credentials-renew/ericcurtin

Conversation

@ericcurtin

Copy link
Copy Markdown
Contributor

Summary

The CLI now renews an expired client credentials token by repeating the grant, instead of failing with no refresh token available.

Related Issue

Closes #4287

Changes

  • Mark bundles from the client credentials grant (client_credentials, absent in older files).
  • Add oidc_renew_token, used by command auth, provider commands and shell completion. It reuses oidc_client_credentials_flow.
  • Without OPENSHELL_OIDC_CLIENT_SECRET, the error names the variable. The secret is never stored.
  • Browser and device code logins still use the refresh token.
  • One docs sentence.

Testing

  • Checks appropriate to the affected code and behavior pass
  • Unit tests added/updated (if applicable)
  • E2E tests added/updated (if applicable)

cargo test -p openshell-cli --lib oidc_auth, -p openshell-bootstrap --lib oidc_token, the OIDC integration test, cargo clippy -p openshell-cli -p openshell-bootstrap --all-targets -D warnings, cargo fmt --check. Tokens issued before this change have no marker and still need one gateway login.

Checklist

  • Follows Conventional Commits
  • Commits are signed off (DCO)
  • Architecture docs updated (if applicable)

Closes ai-openshell#4287

Signed-off-by: Eric Curtin <eric.curtin@docker.com>
@copy-pr-bot

copy-pr-bot Bot commented Oct 9, 2026

Copy link
Copy Markdown

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@ericcurtin

Copy link
Copy Markdown
Contributor Author

@elezar @johntmyers PTAL when you get a chance, and /ok to test 525f184fddc6545bc4367523ed840eacd93780c1 if it looks good. Thank you!

Signed-off-by: Eric Curtin <eric.curtin@docker.com>
@ericcurtin

Copy link
Copy Markdown
Contributor Author

@elezar @johntmyers PTAL, and /ok to test 391d48f9203ba20cfcfe15711c4045200d26b213 if it looks good. Thank you!

@ericcurtin

Copy link
Copy Markdown
Contributor Author

@sjenning @mrunalp PTAL when you get a chance, and /ok to test 391d48f9203ba20cfcfe15711c4045200d26b213 if it looks good. Thank you!

Signed-off-by: Eric Curtin <eric.curtin@docker.com>
@ericcurtin

Copy link
Copy Markdown
Contributor Author

Merged main and fixed the conflict. @elezar @johntmyers PTAL, and /ok to test c2b7bed811fee5968e6bcf19ec71c279943052ad if it looks good. Thank you!

@ericcurtin

Copy link
Copy Markdown
Contributor Author

@TaylorMutch @SDAChess could you please triage #4287 so the issue check can pass? Thank you!

@ericcurtin

Copy link
Copy Markdown
Contributor Author

@pimlock @alangou PTAL when you get a chance, and could one of you triage #4287 so the issue check can pass? /ok to test c2b7bed811fee5968e6bcf19ec71c279943052ad if it looks good. Thank you!

@ericcurtin

Copy link
Copy Markdown
Contributor Author

@drew @krishicks PTAL when you get a chance, and could one of you triage #4287 so the issue check can pass? /ok to test c2b7bed811fee5968e6bcf19ec71c279943052ad if it looks good. Thank you!

@ericcurtin

Copy link
Copy Markdown
Contributor Author

@pimlock @TaylorMutch PTAL when you get a chance, and could one of you triage #4287 so the issue check can pass? /ok to test c2b7bed811fee5968e6bcf19ec71c279943052ad if it looks good. Thank you!

@TaylorMutch

Copy link
Copy Markdown
Contributor

/ok to test c2b7bed

@TaylorMutch TaylorMutch 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 client-credentials renewal across command authentication, provider commands, and shell completion.

Supplemental local CLI integration tests verified login, renewal after forced cache expiry, use of the renewed bearer token, cache persistence, and failure before mutation when the client secret is missing. Disabling client-credentials renewal made the success test fail with the original error. Existing OIDC and token-cache tests also passed. These supplemental integration tests remain local and are not included in this PR.

@TaylorMutch
TaylorMutch added this pull request to the merge queue Nov 10, 2026
Merged via the queue into ai-openshell:main with commit 9977edc Nov 10, 2026
80 of 81 checks passed
cv added a commit to NVIDIA/NemoClaw that referenced this pull request Nov 16, 2026
Moves NemoClaw's OpenShell pins from v0.1.7 to v0.1.8: the native CLI,
the gateway, supervisor and sandbox images, the gateway chart, the
OpenShell crates, and the vendored SDK. Deployments built from this
revision run OpenShell v0.1.8, which no longer waits out a Kubernetes
sandbox pod's termination grace period on delete and renews
client-credentials tokens in the CLI.

## Problem

NemoClaw pins OpenShell v0.1.7 (`5d25211`). v0.1.8 (`f3d9765`, 80
commits later) is the latest release. Among its fixes:

- deleting a sandbox on Kubernetes no longer waits out the pod's
30-second termination grace period (ai-openshell/OpenShell#5279), which every
Kubernetes destroy and sandbox replacement paid (ai-openshell/OpenShell#5025);
- the CLI renews an expired client-credentials token by repeating the
grant (ai-openshell/OpenShell#4389, closing ai-openshell/OpenShell#4287), a limit
our Kubernetes guide and GPU autoscaling example documented;
- deleted sandboxes no longer leave memory behind on the gateway
(ai-openshell/OpenShell#5428).

## Change

- **Pins:** the Cargo revision of `openshell-core`, `openshell-sdk` and
`openshell-policy`, and of the vendored SDK's `openshell-core` and
`openshell-crypto`; in `versions.json`, the version, revision, Linux CLI
archives, gateway, supervisor and sandbox images, and gateway chart; the
managed-gateway reference, a contract test and the gateway contract
module, which carry the gateway digest. The CLI checksums come from the
release's `openshell-checksums-sha256.txt` and match the downloaded
archives; the image and chart digests come from GHCR's `0.1.8` tags, and
GHCR's `0.1.7` tags match the previous pins.
- **Vendored SDK:** upstream changed only `src/client.rs` (a new
`auth_interceptor()` accessor), copied unchanged. The SDK manifest still
enables core telemetry, so the manifest patch stays; `NOTICE.md` records
the refresh. `Cargo.lock` changes only the five OpenShell crates'
revision.
- **SDK integration limits:** the table in
`internal-docs/design/architecture.md` still holds at v0.1.8 and now
cites that revision.
- **`websocket_credential_rewrite`:** OpenShell now rejects it on a
`rest` endpoint (ai-openshell/OpenShell#5336), through the `openshell-policy`
validation NemoClaw already runs on explicit policies. The field's
description says it needs `protocol: websocket`; the JSON Schema,
configuration reference and provider schema snapshot are regenerated.
- **Live / Kind budgets:** with v0.1.8 the two kind cases take about
35-40 s less each: 98-108 s and 62-70 s on this pull request's runs,
against 138-143 s and 94-100 s on recent `v1` runs. The per-test budget
and the `live-kind` slow-timeout drop from 180 s to 140 s, and the
step's wall budget from 300 s to 240 s.
- **Limits removed:** the Kubernetes guide and the GPU autoscaling
example no longer tell readers to sign in again when a
client-credentials token expires; they say to keep
`OPENSHELL_OIDC_CLIENT_SECRET` set.
- **Release notes** list the new pin, the fixes above, and the policy
changes that can stop an existing explicit policy:
`websocket_credential_rewrite` on `rest`, filesystem paths through a
symlink in a writable workspace (ai-openshell/OpenShell#5278), and IPv4-mapped
IPv6 endpoint hosts (ai-openshell/OpenShell#5101).

Resolves #13959.

## Upgrade notes checked

- **Static credential placement** (ai-openshell/OpenShell#4886): every profile
NemoClaw registers (inference, `api` integrations, Brave and Tavily
search) already declares `auth_style` and `header_name`, including
Anthropic's `x-api-key` and Brave's `X-Subscription-Token`, so their
credentials keep resolving.
- **OCSF attribution** (ai-openshell/OpenShell#5048): NemoClaw reads no OCSF
records.
- **SDK moves:** the Python and Go SDK changes don't apply; NemoClaw
uses the Rust SDK.
- **Gateway interceptors** (ai-openshell/OpenShell#5173): NemoClaw registers
none.
- **Chart:** v0.1.8 adds optional `metrics.tls`, `priorityClassName` and
`topologySpreadConstraints`; NemoClaw sets none of them.
ai-openshell/OpenShell#5478, which would replace the `metricsPort: 0` setting,
isn't in v0.1.8, so that setting stays.
- **User guide:** apart from the lines above, `docs/` still describes
NemoClaw `637bdb6` and its OpenShell 0.1.7 links; moving them belongs to
the next guide refresh.

---------

Signed-off-by: Carlos Villela <cvillela@nvidia.com>
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.

bug(cli): client-credentials gateway login stops working when the access token expires

2 participants