[F092] decode JWT exp when refresh omits expires_in

xAI's refresh-token response sometimes omits expires_in. Without it the
new access token kept the stale pre-refresh expires_at, so is_valid /
--check forever rejected a fresh token — and the refresh loop re-rotated
the single-use refresh token every tick, killing the credential (F006).

The access token is a JWT whose exp is the authoritative expiry: decode it
when expires_in is absent. Fallback to the documented ~6h TTL + a structlog
warning when the JWT exp is unreadable, so a fresh token is treated as live
instead of stale.
This commit is contained in:
Renn F
2026-06-28 20:11:59 +02:00
parent c44b32aea8
commit ba5ac385ed
2 changed files with 113 additions and 1 deletions
+56 -1
View File
@@ -2,9 +2,10 @@
from __future__ import annotations
import base64
import json
import pathlib
from datetime import UTC, datetime
from datetime import UTC, datetime, timedelta
from typing import TYPE_CHECKING, Any
from roboco.llm.providers import grok_auth as ga
@@ -19,6 +20,17 @@ _FUTURE = "2099-01-01T00:00:00.000000000Z"
_CLIENT = "b1a00492-client"
def _jwt(exp_unix: int) -> str:
"""Build a minimal JWT (header.payload.signature) carrying an ``exp`` claim."""
payload = (
base64.urlsafe_b64encode(json.dumps({"exp": exp_unix}).encode())
.rstrip(b"=")
.decode()
)
header = base64.urlsafe_b64encode(b'{"alg":"RS256"}').rstrip(b"=").decode()
return f"{header}.{payload}.sig"
def _bundle(expires_at: str, *, refresh_token: str = "rt") -> dict[str, Any]:
return {
f"https://auth.x.ai::{_CLIENT}": {
@@ -99,6 +111,49 @@ def test_refresh_mints_new_token_when_stale(tmp_path: Path) -> None:
assert ga.is_valid(path) # fresh expires_at ~6h out, valid against real now
def test_refresh_omitting_expires_in_still_marks_token_valid(tmp_path: Path) -> None:
"""F092: if xAI's refresh response omits ``expires_in``, the access token's
JWT ``exp`` claim is the authoritative expiry — decode it so a fresh token
isn't left with the stale pre-refresh ``expires_at`` (which would make
``is_valid`` / ``--check`` forever reject it and the refresh loop re-rotate
the single-use refresh token every tick)."""
path = tmp_path / "auth.json"
_write(path, _bundle(_PAST))
exp_unix = int((datetime.now(UTC) + timedelta(hours=6)).timestamp())
jwt_token = _jwt(exp_unix)
def _post(_url: str, _form: dict[str, str]) -> dict[str, Any]:
# No expires_in — only the JWT access_token carries the expiry.
return {"access_token": jwt_token, "refresh_token": "new-rt"}
assert ga.refresh_if_stale(path, post=_post) == "refreshed"
creds = next(iter(json.loads(path.read_text()).values()))
assert creds["key"] == jwt_token
assert creds["expires_at"] != _PAST # updated, not the stale pre-refresh value
assert ga.is_valid(path) # JWT exp ~6h out -> valid against real now
def test_refresh_omitting_expires_in_with_unreadable_jwt_defaults_ttl(
tmp_path: Path,
) -> None:
"""F092 fallback: expires_in missing AND the access token isn't a JWT with a
readable ``exp`` — default to the documented ~6h TTL so a fresh token is
treated as live instead of stale, rather than forever rejected (the warning
is emitted via structlog, visible in the captured stdout)."""
path = tmp_path / "auth.json"
_write(path, _bundle(_PAST))
def _post(_url: str, _form: dict[str, str]) -> dict[str, Any]:
# No expires_in and a non-JWT access token (no `.`-separated payload).
return {"access_token": "opaque-not-a-jwt", "refresh_token": "new-rt"}
assert ga.refresh_if_stale(path, post=_post) == "refreshed"
creds = next(iter(json.loads(path.read_text()).values()))
assert creds["key"] == "opaque-not-a-jwt"
assert creds["expires_at"] != _PAST # defaulted forward, not left stale
assert ga.is_valid(path) # ~6h default -> valid against real now
def test_refresh_missing_file(tmp_path: Path) -> None:
assert ga.refresh_if_stale(tmp_path / "nope.json") == "missing"