fix: retry every Shaarli 401 with a server-clock-recalibrated JWT
This commit is contained in:
@@ -28,16 +28,17 @@ class AuthInterceptor @Inject constructor(
|
|||||||
return chain.proceed(original)
|
return chain.proceed(original)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remember whether the first token was generated before we knew the server time. If
|
// A 401 is ambiguous: bad secret, or device/server clock skew pushed `iat`
|
||||||
// so, a 401 is ambiguous: bad secret, or device clock skew pushed `iat` outside
|
// outside Shaarli's tolerance. The Date header of the failed response is the
|
||||||
// Shaarli's tolerance. The Date header of the failed response calibrates our clock,
|
// freshest server-clock estimate we have, so retry exactly once with a
|
||||||
// so retry exactly once with a regenerated token.
|
// regenerated token, on every 401 — not only when the clock was never synced.
|
||||||
val clockWasUnknown = !serverClock.isSynced
|
// 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))
|
var response = chain.proceed(original.withAuth(apiSecret))
|
||||||
serverClock.syncFromResponse(response)
|
serverClock.syncFromResponse(response)
|
||||||
|
|
||||||
if (response.code == 401 && clockWasUnknown) {
|
if (response.code == 401) {
|
||||||
response.close()
|
response.close()
|
||||||
response = chain.proceed(original.withAuth(apiSecret))
|
response = chain.proceed(original.withAuth(apiSecret))
|
||||||
serverClock.syncFromResponse(response)
|
serverClock.syncFromResponse(response)
|
||||||
|
|||||||
Reference in New Issue
Block a user