fix: retry every Shaarli 401 with a server-clock-recalibrated JWT (2.14.3) #1

Merged
bruno merged 4 commits from fix/shaarli-401-retry into main 2026-11-01 12:19:31 -05:00
Showing only changes of commit 921659e77c - Show all commits
@@ -28,16 +28,17 @@ class AuthInterceptor @Inject constructor(
return chain.proceed(original)
}
// Remember whether the first token was generated before we knew the server time. If
// so, a 401 is ambiguous: bad secret, or device clock skew pushed `iat` outside
// Shaarli's tolerance. The Date header of the failed response calibrates our clock,
// so retry exactly once with a regenerated token.
val clockWasUnknown = !serverClock.isSynced
// A 401 is ambiguous: bad secret, or device/server clock skew pushed `iat`
// outside Shaarli's tolerance. The Date header of the failed response is the
// freshest server-clock estimate we have, so retry exactly once with a
// regenerated token, on every 401 — not only when the clock was never synced.
// Previously the retry was gated on `!serverClock.isSynced`, so once an offset
// had been stored (possibly from a stale or proxy-derived Date header) it was
// trusted for the rest of the process and a correct secret could fail forever.
var response = chain.proceed(original.withAuth(apiSecret))
serverClock.syncFromResponse(response)
if (response.code == 401 && clockWasUnknown) {
if (response.code == 401) {
response.close()
response = chain.proceed(original.withAuth(apiSecret))
serverClock.syncFromResponse(response)