@c9up/warden 0.2.6 → 0.2.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +4 -2
- package/dist/AttemptStore.d.ts.map +1 -1
- package/dist/AttemptStore.js +12 -0
- package/dist/AttemptStore.js.map +1 -1
- package/dist/AuthManager.d.ts +11 -6
- package/dist/AuthManager.d.ts.map +1 -1
- package/dist/AuthManager.js +19 -9
- package/dist/AuthManager.js.map +1 -1
- package/dist/AuthRateLimiter.d.ts +16 -3
- package/dist/AuthRateLimiter.d.ts.map +1 -1
- package/dist/AuthRateLimiter.js +25 -6
- package/dist/AuthRateLimiter.js.map +1 -1
- package/dist/Authenticator.d.ts +79 -9
- package/dist/Authenticator.d.ts.map +1 -1
- package/dist/Authenticator.js +186 -16
- package/dist/Authenticator.js.map +1 -1
- package/dist/RedisBlacklistDriver.d.ts.map +1 -1
- package/dist/RedisBlacklistDriver.js +11 -0
- package/dist/RedisBlacklistDriver.js.map +1 -1
- package/dist/RefreshTokenStore.d.ts +37 -6
- package/dist/RefreshTokenStore.d.ts.map +1 -1
- package/dist/RefreshTokenStore.js +51 -10
- package/dist/RefreshTokenStore.js.map +1 -1
- package/dist/ResilientBlacklistDriver.d.ts.map +1 -1
- package/dist/ResilientBlacklistDriver.js +2 -1
- package/dist/ResilientBlacklistDriver.js.map +1 -1
- package/dist/TokenBlacklist.d.ts +3 -1
- package/dist/TokenBlacklist.d.ts.map +1 -1
- package/dist/TokenBlacklist.js +27 -1
- package/dist/TokenBlacklist.js.map +1 -1
- package/dist/authFinder.d.ts +58 -0
- package/dist/authFinder.d.ts.map +1 -0
- package/dist/authFinder.js +77 -0
- package/dist/authFinder.js.map +1 -0
- package/dist/bearer.d.ts +12 -0
- package/dist/bearer.d.ts.map +1 -0
- package/dist/bearer.js +19 -0
- package/dist/bearer.js.map +1 -0
- package/dist/bouncer/Bouncer.d.ts +2 -2
- package/dist/bouncer/Bouncer.d.ts.map +1 -1
- package/dist/bouncer/Bouncer.js +17 -4
- package/dist/bouncer/Bouncer.js.map +1 -1
- package/dist/bouncer/PolicyAuthorizer.d.ts +1 -1
- package/dist/bouncer/PolicyAuthorizer.d.ts.map +1 -1
- package/dist/bouncer/PolicyAuthorizer.js +1 -1
- package/dist/bouncer/PolicyAuthorizer.js.map +1 -1
- package/dist/bouncer/evaluate.d.ts +5 -1
- package/dist/bouncer/evaluate.d.ts.map +1 -1
- package/dist/bouncer/evaluate.js +7 -6
- package/dist/bouncer/evaluate.js.map +1 -1
- package/dist/errors.d.ts +28 -0
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +63 -2
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +6 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/mfa/MfaManager.d.ts +17 -4
- package/dist/mfa/MfaManager.d.ts.map +1 -1
- package/dist/mfa/MfaManager.js +37 -14
- package/dist/mfa/MfaManager.js.map +1 -1
- package/dist/mfa/TotpProvider.d.ts.map +1 -1
- package/dist/mfa/TotpProvider.js +8 -0
- package/dist/mfa/TotpProvider.js.map +1 -1
- package/dist/mfa/WebauthnProvider.d.ts +22 -0
- package/dist/mfa/WebauthnProvider.d.ts.map +1 -1
- package/dist/mfa/WebauthnProvider.js +57 -12
- package/dist/mfa/WebauthnProvider.js.map +1 -1
- package/dist/middleware.d.ts +13 -3
- package/dist/middleware.d.ts.map +1 -1
- package/dist/middleware.js +1 -1
- package/dist/middleware.js.map +1 -1
- package/dist/rights/RightsResolver.d.ts +10 -0
- package/dist/rights/RightsResolver.d.ts.map +1 -1
- package/dist/rights/RightsResolver.js +23 -0
- package/dist/rights/RightsResolver.js.map +1 -1
- package/dist/sanitize.d.ts.map +1 -1
- package/dist/sanitize.js +3 -1
- package/dist/sanitize.js.map +1 -1
- package/dist/services/main.d.ts.map +1 -1
- package/dist/services/main.js +12 -2
- package/dist/services/main.js.map +1 -1
- package/dist/standalone.d.ts.map +1 -1
- package/dist/standalone.js +2 -4
- package/dist/standalone.js.map +1 -1
- package/dist/strategies/ApiKeyStrategy.d.ts +5 -4
- package/dist/strategies/ApiKeyStrategy.d.ts.map +1 -1
- package/dist/strategies/ApiKeyStrategy.js +10 -5
- package/dist/strategies/ApiKeyStrategy.js.map +1 -1
- package/dist/strategies/BasicAuthStrategy.d.ts.map +1 -1
- package/dist/strategies/BasicAuthStrategy.js +5 -2
- package/dist/strategies/BasicAuthStrategy.js.map +1 -1
- package/dist/strategies/JwtStrategy.d.ts +6 -2
- package/dist/strategies/JwtStrategy.d.ts.map +1 -1
- package/dist/strategies/JwtStrategy.js +55 -8
- package/dist/strategies/JwtStrategy.js.map +1 -1
- package/dist/strategies/SessionStrategy.d.ts.map +1 -1
- package/dist/strategies/SessionStrategy.js +4 -1
- package/dist/strategies/SessionStrategy.js.map +1 -1
- package/dist/vendor/quasarConnection.d.ts +18 -0
- package/dist/vendor/quasarConnection.d.ts.map +1 -1
- package/dist/vendor/quasarConnection.js +20 -0
- package/dist/vendor/quasarConnection.js.map +1 -1
- package/index.darwin-arm64.node +0 -0
- package/index.darwin-x64.node +0 -0
- package/index.linux-arm64-gnu.node +0 -0
- package/index.linux-x64-gnu.node +0 -0
- package/index.win32-x64-msvc.node +0 -0
- package/package.json +3 -4
- package/src/AttemptStore.ts +13 -0
- package/src/AuthManager.ts +35 -16
- package/src/AuthRateLimiter.ts +24 -8
- package/src/Authenticator.ts +243 -19
- package/src/RedisBlacklistDriver.ts +11 -0
- package/src/RefreshTokenStore.ts +79 -13
- package/src/ResilientBlacklistDriver.ts +2 -1
- package/src/TokenBlacklist.ts +28 -1
- package/src/authFinder.ts +118 -0
- package/src/bearer.ts +16 -0
- package/src/bouncer/Bouncer.ts +21 -6
- package/src/bouncer/PolicyAuthorizer.ts +1 -1
- package/src/bouncer/evaluate.ts +7 -10
- package/src/errors.ts +80 -2
- package/src/index.ts +11 -0
- package/src/mfa/MfaManager.ts +59 -16
- package/src/mfa/TotpProvider.ts +15 -2
- package/src/mfa/WebauthnProvider.ts +77 -13
- package/src/middleware.ts +16 -3
- package/src/rights/RightsResolver.ts +27 -0
- package/src/sanitize.ts +4 -2
- package/src/services/main.ts +14 -2
- package/src/standalone.ts +2 -5
- package/src/strategies/ApiKeyStrategy.ts +10 -5
- package/src/strategies/BasicAuthStrategy.ts +7 -2
- package/src/strategies/JwtStrategy.ts +58 -9
- package/src/strategies/SessionStrategy.ts +4 -1
- package/src/vendor/quasarConnection.ts +21 -0
- package/stubs/config/auth.stub +3 -0
- package/scripts/build-napi-types.mjs +0 -69
- package/scripts/copy-napi.mjs +0 -75
- package/scripts/generate-napi-types.mjs +0 -156
package/dist/Authenticator.js
CHANGED
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
* (resolved via `ctx.containerResolver`) + the request `ctx`; it never imports
|
|
14
14
|
* `@c9up/ream`.
|
|
15
15
|
*/
|
|
16
|
+
import { readBearerToken } from "./bearer.js";
|
|
16
17
|
import { E_UNAUTHORIZED_ACCESS, WardenError } from "./errors.js";
|
|
17
18
|
import { sanitizePayload } from "./sanitize.js";
|
|
18
19
|
import { createSessionGuardState, } from "./strategies/SessionStrategy.js";
|
|
@@ -78,7 +79,29 @@ function isSessionGuard(auth, name) {
|
|
|
78
79
|
return strategy !== undefined && hasVerifyWithContext(strategy);
|
|
79
80
|
}
|
|
80
81
|
function hasVerifyWithContext(strategy) {
|
|
81
|
-
return
|
|
82
|
+
return typeof Reflect.get(strategy, "verifyWithContext") === "function";
|
|
83
|
+
}
|
|
84
|
+
function isAccessTokenIssuer(strategy) {
|
|
85
|
+
return (typeof Reflect.get(strategy, "createToken") === "function" &&
|
|
86
|
+
typeof Reflect.get(strategy, "invalidateToken") === "function");
|
|
87
|
+
}
|
|
88
|
+
/**
|
|
89
|
+
* What a test seam hands back is the strategy's own business; this only checks
|
|
90
|
+
* it is the object the harness reads fields from.
|
|
91
|
+
*/
|
|
92
|
+
function isAuthClientResponse(value) {
|
|
93
|
+
return typeof value === "object" && value !== null;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* The credential a token guard reads from a request: the API-key header first
|
|
97
|
+
* for an API-key guard name, the Bearer token first for any other — the same
|
|
98
|
+
* pick {@link tryAuthenticate} makes, so the token revoked is the one that
|
|
99
|
+
* authenticated.
|
|
100
|
+
*/
|
|
101
|
+
function tokenCredentialFor(strategyName, creds) {
|
|
102
|
+
return API_KEY_GUARD_NAMES.includes(strategyName)
|
|
103
|
+
? creds.apiKey || creds.bearerToken
|
|
104
|
+
: creds.bearerToken || creds.apiKey;
|
|
82
105
|
}
|
|
83
106
|
/**
|
|
84
107
|
* The challenge of a Basic guard (`BasicAuthStrategy.challenge`), or undefined
|
|
@@ -117,9 +140,7 @@ function resolveApiKeyHeader(auth) {
|
|
|
117
140
|
export function extractCredentials(ctx, auth) {
|
|
118
141
|
const headers = ctx.request.headers();
|
|
119
142
|
const authHeader = headers.authorization ?? "";
|
|
120
|
-
const bearerToken = authHeader
|
|
121
|
-
? authHeader.slice(7)
|
|
122
|
-
: "";
|
|
143
|
+
const bearerToken = readBearerToken(authHeader);
|
|
123
144
|
// The scheme is case-insensitive (RFC 7235); the strategy decodes the rest.
|
|
124
145
|
const basicAuth = /^basic\s/i.test(authHeader) ? authHeader : "";
|
|
125
146
|
// HTTP header names are case-insensitive; runtimes lowercase incoming keys,
|
|
@@ -134,7 +155,7 @@ export function extractCredentials(ctx, auth) {
|
|
|
134
155
|
* rejections so the caller can return 500 vs 401.
|
|
135
156
|
*/
|
|
136
157
|
async function tryAuthenticate(auth, strategies, creds) {
|
|
137
|
-
const {
|
|
158
|
+
const { basicAuth, session } = creds;
|
|
138
159
|
let result = null;
|
|
139
160
|
let viaGuard;
|
|
140
161
|
let attemptCount = 0;
|
|
@@ -171,9 +192,7 @@ async function tryAuthenticate(auth, strategies, creds) {
|
|
|
171
192
|
// Native-first credential, other transport as fallback so a
|
|
172
193
|
// single-credential client still authenticates (and an invalid
|
|
173
194
|
// Bearer no longer masks a valid API key for the api-key guard).
|
|
174
|
-
const credential =
|
|
175
|
-
? apiKey || bearerToken
|
|
176
|
-
: bearerToken || apiKey;
|
|
195
|
+
const credential = tokenCredentialFor(strategyName, creds);
|
|
177
196
|
if (!credential)
|
|
178
197
|
continue;
|
|
179
198
|
attemptCount++;
|
|
@@ -228,6 +247,91 @@ export class GuardAccessor {
|
|
|
228
247
|
get isAuthenticated() {
|
|
229
248
|
return this.user !== undefined;
|
|
230
249
|
}
|
|
250
|
+
/** Whether this guard was tried during the request (AdonisJS guard parity). */
|
|
251
|
+
get authenticationAttempted() {
|
|
252
|
+
return this.#parent.attemptedVia(this.#name);
|
|
253
|
+
}
|
|
254
|
+
/**
|
|
255
|
+
* The user, or `E_UNAUTHORIZED_ACCESS` when this guard did not authenticate
|
|
256
|
+
* the request (AdonisJS `guard.getUserOrFail()`).
|
|
257
|
+
*/
|
|
258
|
+
getUserOrFail() {
|
|
259
|
+
const user = this.user;
|
|
260
|
+
if (user === undefined) {
|
|
261
|
+
throw new E_UNAUTHORIZED_ACCESS("Unauthorized access", {
|
|
262
|
+
guardDriverName: this.#name,
|
|
263
|
+
});
|
|
264
|
+
}
|
|
265
|
+
return user;
|
|
266
|
+
}
|
|
267
|
+
/**
|
|
268
|
+
* Authenticate through this guard and say whether it worked, without
|
|
269
|
+
* throwing on a credential rejection (AdonisJS `guard.check()`). A crashed
|
|
270
|
+
* strategy still throws: an outage is not a guest.
|
|
271
|
+
*/
|
|
272
|
+
async check() {
|
|
273
|
+
try {
|
|
274
|
+
await this.authenticate();
|
|
275
|
+
return true;
|
|
276
|
+
}
|
|
277
|
+
catch (err) {
|
|
278
|
+
if (err instanceof E_UNAUTHORIZED_ACCESS)
|
|
279
|
+
return false;
|
|
280
|
+
throw err;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
/**
|
|
284
|
+
* What a test client sends to be a user through this guard (AdonisJS
|
|
285
|
+
* `guard.authenticateAsClient`). The arguments are the strategy's own: a
|
|
286
|
+
* user for a session guard, a user plus abilities for a token guard.
|
|
287
|
+
*/
|
|
288
|
+
async authenticateAsClient(...args) {
|
|
289
|
+
const strategy = this.#auth.getStrategy(this.#name);
|
|
290
|
+
const seam = Reflect.get(strategy, "authenticateAsClient");
|
|
291
|
+
if (typeof seam !== "function") {
|
|
292
|
+
throw new WardenError("STRATEGY_HAS_NO_CLIENT", `Auth strategy '${this.#name}' has no authenticateAsClient() — it cannot forge a client request.`, {
|
|
293
|
+
hint: "Implement authenticateAsClient() on the strategy, or authenticate through a real login in the test.",
|
|
294
|
+
});
|
|
295
|
+
}
|
|
296
|
+
const response = await Reflect.apply(seam, strategy, args);
|
|
297
|
+
if (!isAuthClientResponse(response)) {
|
|
298
|
+
throw new WardenError("STRATEGY_HAS_NO_CLIENT", `Auth strategy '${this.#name}' answered authenticateAsClient() with no client response.`);
|
|
299
|
+
}
|
|
300
|
+
return response;
|
|
301
|
+
}
|
|
302
|
+
/**
|
|
303
|
+
* Mint an access token for `user` through this guard (AdonisJS
|
|
304
|
+
* `auth.use('api').createToken(user, abilities, options)`). The returned
|
|
305
|
+
* token carries its `value` this once: hand it to the client now.
|
|
306
|
+
*/
|
|
307
|
+
async createToken(user, abilities, options) {
|
|
308
|
+
return this.#tokenIssuer().createToken(user, abilities, options);
|
|
309
|
+
}
|
|
310
|
+
/**
|
|
311
|
+
* Revoke the access token this request came in with (AdonisJS
|
|
312
|
+
* `auth.use('api').invalidateToken()`) — the sign-out of a token client.
|
|
313
|
+
* Answers whether it existed; `E_UNAUTHORIZED_ACCESS` when the request
|
|
314
|
+
* carries no token, as upstream.
|
|
315
|
+
*/
|
|
316
|
+
async invalidateToken() {
|
|
317
|
+
const issuer = this.#tokenIssuer();
|
|
318
|
+
const value = tokenCredentialFor(this.#name, extractCredentials(this.#ctx, this.#auth));
|
|
319
|
+
if (!value) {
|
|
320
|
+
throw new E_UNAUTHORIZED_ACCESS("Unauthorized access", {
|
|
321
|
+
guardDriverName: this.#name,
|
|
322
|
+
});
|
|
323
|
+
}
|
|
324
|
+
return issuer.invalidateToken(value);
|
|
325
|
+
}
|
|
326
|
+
#tokenIssuer() {
|
|
327
|
+
const strategy = this.#auth.getStrategy(this.#name);
|
|
328
|
+
if (!isAccessTokenIssuer(strategy)) {
|
|
329
|
+
throw new WardenError("STRATEGY_CANNOT_ISSUE", `Guard '${this.#name}' does not issue access tokens.`, {
|
|
330
|
+
hint: "createToken()/invalidateToken() belong to an access-tokens guard (apiKeyGuard). A JWT guard signs with auth.issueFor(user, guard).",
|
|
331
|
+
});
|
|
332
|
+
}
|
|
333
|
+
return strategy;
|
|
334
|
+
}
|
|
231
335
|
/**
|
|
232
336
|
* Whether the user was revived from a remember-me cookie rather than
|
|
233
337
|
* signing in.
|
|
@@ -262,7 +366,10 @@ export class GuardAccessor {
|
|
|
262
366
|
authenticateViaRememberMeToken(cookieValue) {
|
|
263
367
|
return this.#auth.authenticateViaRememberMeToken(cookieValue, this.#name, this.#state);
|
|
264
368
|
}
|
|
265
|
-
/**
|
|
369
|
+
/**
|
|
370
|
+
* Authenticate the request using only this guard, resolving to the user
|
|
371
|
+
* (throws `E_UNAUTHORIZED_ACCESS` on failure).
|
|
372
|
+
*/
|
|
266
373
|
authenticate() {
|
|
267
374
|
return this.#parent.authenticateUsing([this.#name]);
|
|
268
375
|
}
|
|
@@ -288,13 +395,21 @@ export class GuardAccessor {
|
|
|
288
395
|
const revived = await strategy.authenticateViaRememberMeToken(cookie, this.#state);
|
|
289
396
|
if (!revived)
|
|
290
397
|
return undefined;
|
|
398
|
+
// A revival is never a step-up, whichever guard performed it: a guard
|
|
399
|
+
// the application wrote itself may hand back its row untouched, and an
|
|
400
|
+
// "MFA enabled" column on it must not satisfy `@RequireMfa()`.
|
|
401
|
+
const user = { ...revived.user, mfa: false };
|
|
402
|
+
// Same guard as every other path into `ctx.auth.user`, and BEFORE the
|
|
403
|
+
// session is seated with it: `findUser` may hand back a JSON-decoded
|
|
404
|
+
// row carrying an own `__proto__` / `constructor` key.
|
|
405
|
+
sanitizePayload(user);
|
|
291
406
|
write.call(this.#ctx.response, strategy.rememberMeCookieName, revived.cookieValue, rememberMeCookieOptions(strategy));
|
|
292
407
|
// Seat the session WITHOUT `login()`: that method means a password was
|
|
293
408
|
// typed, and it clears `viaRemember` — the one thing this path exists to
|
|
294
409
|
// report, and what an app checks before letting someone change an email
|
|
295
410
|
// or spend money.
|
|
296
|
-
strategy.seatSession(
|
|
297
|
-
return
|
|
411
|
+
strategy.seatSession(user, session);
|
|
412
|
+
return user;
|
|
298
413
|
}
|
|
299
414
|
/**
|
|
300
415
|
* Log a user in through this guard (session guards).
|
|
@@ -465,6 +580,8 @@ export class Authenticator {
|
|
|
465
580
|
#user;
|
|
466
581
|
#viaGuard;
|
|
467
582
|
#attempted = false;
|
|
583
|
+
/** Every guard tried during this request, for `use(name).authenticationAttempted`. */
|
|
584
|
+
#attemptedGuards = new Set();
|
|
468
585
|
#guardCache = new Map();
|
|
469
586
|
constructor(ctx, auth) {
|
|
470
587
|
this.#ctx = ctx;
|
|
@@ -486,6 +603,14 @@ export class Authenticator {
|
|
|
486
603
|
get authenticatedViaGuard() {
|
|
487
604
|
return this.#viaGuard;
|
|
488
605
|
}
|
|
606
|
+
/** The guard used when none is named (AdonisJS `auth.defaultGuard`). */
|
|
607
|
+
get defaultGuard() {
|
|
608
|
+
return this.#auth.defaultStrategyName;
|
|
609
|
+
}
|
|
610
|
+
/** @internal Whether `name` was tried during this request. */
|
|
611
|
+
attemptedVia(name) {
|
|
612
|
+
return this.#attemptedGuards.has(name);
|
|
613
|
+
}
|
|
489
614
|
/**
|
|
490
615
|
* Roles of the authenticated user (Ream reads `ctx.auth.roles ??
|
|
491
616
|
* ctx.auth.user.roles`). Warden nests them under `user`; this getter mirrors
|
|
@@ -494,11 +619,45 @@ export class Authenticator {
|
|
|
494
619
|
get roles() {
|
|
495
620
|
return this.#user?.roles;
|
|
496
621
|
}
|
|
497
|
-
/**
|
|
622
|
+
/**
|
|
623
|
+
* Permissions the authenticated user's PAYLOAD carries (see
|
|
624
|
+
* {@link Authenticator.roles}). Informational only: a decision goes through
|
|
625
|
+
* {@link Authenticator.hasPermission}, which consults the rights resolver.
|
|
626
|
+
*/
|
|
498
627
|
get permissions() {
|
|
499
628
|
return this.#user?.permissions;
|
|
500
629
|
}
|
|
501
|
-
/**
|
|
630
|
+
/**
|
|
631
|
+
* Whether the authenticated user may do `permission` within `scope`.
|
|
632
|
+
*
|
|
633
|
+
* Delegates to {@link AuthManager.hasPermission}: the rights resolver decides
|
|
634
|
+
* (roles and grants from the store, never the payload's `permissions`), and
|
|
635
|
+
* the access token the request came with narrows it. A guest holds nothing.
|
|
636
|
+
*
|
|
637
|
+
* No upstream shape to mirror: the upstream authenticator has no notion of
|
|
638
|
+
* permissions. This is how a host's gates reach warden's rights layer
|
|
639
|
+
* through `ctx.auth` without importing warden.
|
|
640
|
+
*/
|
|
641
|
+
async hasPermission(permission, scope) {
|
|
642
|
+
if (this.#user === undefined)
|
|
643
|
+
return false;
|
|
644
|
+
return this.#auth.hasPermission(this.#user, permission, scope);
|
|
645
|
+
}
|
|
646
|
+
/**
|
|
647
|
+
* Whether the authenticated user may do every one of `permissions` within
|
|
648
|
+
* `scope` — {@link Authenticator.hasPermission} for a list. A guest holds
|
|
649
|
+
* nothing, not even the empty list.
|
|
650
|
+
*/
|
|
651
|
+
async hasAllPermissions(permissions, scope) {
|
|
652
|
+
if (this.#user === undefined)
|
|
653
|
+
return false;
|
|
654
|
+
return this.#auth.hasAllPermissions(this.#user, permissions, scope);
|
|
655
|
+
}
|
|
656
|
+
/**
|
|
657
|
+
* Authenticate via the default guard and resolve to the user (AdonisJS
|
|
658
|
+
* `const user = await auth.authenticate()`). Throws `E_UNAUTHORIZED_ACCESS`
|
|
659
|
+
* on failure.
|
|
660
|
+
*/
|
|
502
661
|
authenticate() {
|
|
503
662
|
return this.authenticateUsing([this.#auth.defaultStrategyName]);
|
|
504
663
|
}
|
|
@@ -564,6 +723,12 @@ export class Authenticator {
|
|
|
564
723
|
const { attemptCount, crashCount } = attempt;
|
|
565
724
|
let result = attempt.result;
|
|
566
725
|
let viaGuard = attempt.viaGuard;
|
|
726
|
+
// The guards tried, in order, up to the one that answered.
|
|
727
|
+
for (const name of names) {
|
|
728
|
+
this.#attemptedGuards.add(name);
|
|
729
|
+
if (name === viaGuard)
|
|
730
|
+
break;
|
|
731
|
+
}
|
|
567
732
|
// No credential answered, but the browser may still hold a remember-me
|
|
568
733
|
// cookie — that is what "keep me signed in" means, and nothing read it.
|
|
569
734
|
if (!result?.authenticated && hasSessionStrategy) {
|
|
@@ -583,7 +748,7 @@ export class Authenticator {
|
|
|
583
748
|
// for first.
|
|
584
749
|
const winner = viaGuard ?? guardName;
|
|
585
750
|
this.#auth.emitAuthEvent(`${this.#auth.eventPrefixFor(winner)}:authentication_succeeded`, { guardName: winner, user: result.user, sessionId: undefined });
|
|
586
|
-
return;
|
|
751
|
+
return result.user;
|
|
587
752
|
}
|
|
588
753
|
// Every attempted guard crashed → a server-side incident, not a
|
|
589
754
|
// credential rejection. Surface distinctly (mapped to 500 by the caller).
|
|
@@ -611,8 +776,11 @@ export class Authenticator {
|
|
|
611
776
|
}
|
|
612
777
|
return this.#user;
|
|
613
778
|
}
|
|
614
|
-
/**
|
|
615
|
-
|
|
779
|
+
/**
|
|
780
|
+
* Access a named guard (AdonisJS `auth.use('web')`); the default guard when
|
|
781
|
+
* no name is given. Instances are cached per request.
|
|
782
|
+
*/
|
|
783
|
+
use(name = this.#auth.defaultStrategyName) {
|
|
616
784
|
let accessor = this.#guardCache.get(name);
|
|
617
785
|
if (!accessor) {
|
|
618
786
|
accessor = new GuardAccessor(this.#ctx, this.#auth, name, this);
|
|
@@ -627,6 +795,8 @@ export class Authenticator {
|
|
|
627
795
|
*/
|
|
628
796
|
adopt(result, viaGuard) {
|
|
629
797
|
this.#attempted = true;
|
|
798
|
+
if (viaGuard !== undefined)
|
|
799
|
+
this.#attemptedGuards.add(viaGuard);
|
|
630
800
|
if (result?.authenticated && result.user) {
|
|
631
801
|
this.#user = result.user;
|
|
632
802
|
this.#viaGuard = viaGuard;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Authenticator.js","sourceRoot":"","sources":["../src/Authenticator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Authenticator.js","sourceRoot":"","sources":["../src/Authenticator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBlacklistDriver.d.ts","sourceRoot":"","sources":["../src/RedisBlacklistDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"RedisBlacklistDriver.d.ts","sourceRoot":"","sources":["../src/RedisBlacklistDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAG3D,4DAA4D;AAC5D,MAAM,WAAW,eAAe;IAC/B,GAAG,CACF,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,EACb,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;CACrC;AAED,MAAM,WAAW,oBAAoB;IACpC,qEAAqE;IACrE,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;GAIG;AACH,MAAM,MAAM,iBAAiB,GAC1B,eAAe,GACf,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC;AAEtD,qBAAa,oBAAqB,YAAW,eAAe;;gBAM/C,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAE,oBAAyB;IA8CxE;;;OAGG;IACG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IASlD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAKxC,yDAAyD;IACnD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
* an `"EX"` ttl and `exists`. Native key expiry does the housekeeping, so
|
|
8
8
|
* `cleanup()` is a no-op.
|
|
9
9
|
*/
|
|
10
|
+
import { hasEnded } from "./vendor/quasarConnection.js";
|
|
10
11
|
export class RedisBlacklistDriver {
|
|
11
12
|
#source;
|
|
12
13
|
#resolved;
|
|
@@ -19,8 +20,18 @@ export class RedisBlacklistDriver {
|
|
|
19
20
|
/**
|
|
20
21
|
* The client, resolved once. Two requests racing on a cold start must not
|
|
21
22
|
* each open their own connection, so the in-flight promise is shared.
|
|
23
|
+
*
|
|
24
|
+
* Resolved AGAIN once the client it holds has ended for good: quasar
|
|
25
|
+
* retires a connection whose retry strategy gave up and hands out a fresh
|
|
26
|
+
* one, and keeping the dead client failed every revocation check with
|
|
27
|
+
* "Connection is closed." until restart. NAMED DEVIATION, better than
|
|
28
|
+
* upstream, whose Redis stores capture `ioConnection` once. A client handed
|
|
29
|
+
* in directly is kept whatever its state.
|
|
22
30
|
*/
|
|
23
31
|
async #client() {
|
|
32
|
+
if (typeof this.#source === "function" && hasEnded(this.#resolved)) {
|
|
33
|
+
this.#resolved = undefined;
|
|
34
|
+
}
|
|
24
35
|
if (this.#resolved)
|
|
25
36
|
return this.#resolved;
|
|
26
37
|
if (typeof this.#source !== "function") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisBlacklistDriver.js","sourceRoot":"","sources":["../src/RedisBlacklistDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"RedisBlacklistDriver.js","sourceRoot":"","sources":["../src/RedisBlacklistDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AA2BxD,MAAM,OAAO,oBAAoB;IACvB,OAAO,CAAoB;IACpC,SAAS,CAA8B;IACvC,QAAQ,CAAuC;IACtC,OAAO,CAAS;IAEzB,YAAY,MAAyB,EAAE,SAA+B,EAAE;QACvE,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,IAAI,mBAAmB,CAAC;IACrD,CAAC;IAED;;;;;;;;;;OAUG;IACH,KAAK,CAAC,OAAO;QACZ,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;YACpE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC5B,CAAC;QACD,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC,SAAS,CAAC;QAC1C,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;YACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;YAC9B,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpB,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC;YAC9B,sEAAsE;YACtE,mEAAmE;YACnE,+DAA+D;YAC/D,qEAAqE;YACrE,oEAAoE;YACpE,kEAAkE;YAClE,YAAY;YACZ,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;iBACzC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBAChB,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC;gBACxB,OAAO,MAAM,CAAC;YACf,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE;gBACb,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;YAC3B,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,SAAiB;QACvC,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;QAC9D,IAAI,UAAU,IAAI,CAAC,EAAE,CAAC;YACrB,OAAO;QACR,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACpC,OAAO,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IAED,yDAAyD;IACzD,KAAK,CAAC,OAAO,KAAmB,CAAC;IAEjC,IAAI,CAAC,GAAW;QACf,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG,GAAG,EAAE,CAAC;IAChC,CAAC;CACD"}
|
|
@@ -1,22 +1,43 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* RefreshTokenStore — server-side opaque refresh token management.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* Opaque token pattern:
|
|
5
5
|
* { accessToken, refreshToken, expiresIn }
|
|
6
6
|
* POST /auth/refresh → new pair, old token invalidated
|
|
7
7
|
*
|
|
8
|
+
* A refresh token is a bearer credential, so only `sha256(value)` is
|
|
9
|
+
* persisted, like access tokens, remember-me tokens, OTPs and backup codes: a
|
|
10
|
+
* dump of the table is not a set of working tokens. The driver is keyed by
|
|
11
|
+
* that hash and never sees the value; the application hashes what the client
|
|
12
|
+
* presents with {@link hashRefreshToken} before asking the driver.
|
|
13
|
+
*
|
|
14
|
+
* Cutover from a store that held the value itself: fail closed. Rows written
|
|
15
|
+
* before hashing are keyed by the clear value and no presented token hashes
|
|
16
|
+
* to it, so they simply stop refreshing and those clients sign in again.
|
|
17
|
+
* Nothing re-reads a clear value to upgrade it: that would keep the clear
|
|
18
|
+
* column, the very thing this removes, readable as a credential.
|
|
19
|
+
*
|
|
8
20
|
* @implements MISS-5
|
|
9
21
|
*/
|
|
10
22
|
export interface StoredRefreshToken {
|
|
11
|
-
token
|
|
23
|
+
/** `sha256(value)`, hex. The token itself is never stored. */
|
|
24
|
+
hash: string;
|
|
12
25
|
userId: string | number;
|
|
13
26
|
expiresAt: number;
|
|
14
27
|
createdAt: number;
|
|
15
28
|
}
|
|
29
|
+
/**
|
|
30
|
+
* What a store implements. Every token argument is the HASH from
|
|
31
|
+
* {@link hashRefreshToken}, never the value the client holds.
|
|
32
|
+
*/
|
|
16
33
|
export interface RefreshTokenDriver {
|
|
17
34
|
store(token: StoredRefreshToken): Promise<void>;
|
|
18
|
-
find(
|
|
19
|
-
revoke(
|
|
35
|
+
find(hash: string): Promise<StoredRefreshToken | null>;
|
|
36
|
+
revoke(hash: string): Promise<void>;
|
|
37
|
+
/**
|
|
38
|
+
* Remove every token of `userId`. Ids are compared as strings: a row
|
|
39
|
+
* stored with `"1"` belongs to user `1`.
|
|
40
|
+
*/
|
|
20
41
|
revokeAllForUser(userId: string | number): Promise<void>;
|
|
21
42
|
cleanup(): Promise<void>;
|
|
22
43
|
}
|
|
@@ -24,11 +45,21 @@ export interface RefreshTokenDriver {
|
|
|
24
45
|
export declare class MemoryRefreshTokenDriver implements RefreshTokenDriver {
|
|
25
46
|
#private;
|
|
26
47
|
store(token: StoredRefreshToken): Promise<void>;
|
|
27
|
-
find(
|
|
28
|
-
revoke(
|
|
48
|
+
find(hash: string): Promise<StoredRefreshToken | null>;
|
|
49
|
+
revoke(hash: string): Promise<void>;
|
|
29
50
|
revokeAllForUser(userId: string | number): Promise<void>;
|
|
30
51
|
cleanup(): Promise<void>;
|
|
31
52
|
}
|
|
32
53
|
/** Generate an opaque refresh token. */
|
|
33
54
|
export declare function generateRefreshToken(): string;
|
|
55
|
+
/** `sha256(value)` as hex: what is stored, and what the driver is asked for. */
|
|
56
|
+
export declare function hashRefreshToken(value: string): string;
|
|
57
|
+
/** A freshly minted refresh token: what to store, and what to hand the client. */
|
|
58
|
+
export interface MintedRefreshToken {
|
|
59
|
+
stored: StoredRefreshToken;
|
|
60
|
+
/** Goes to the client. Never persisted. */
|
|
61
|
+
value: string;
|
|
62
|
+
}
|
|
63
|
+
/** Mint a refresh token for `userId`, valid for `ttlSeconds`. */
|
|
64
|
+
export declare function mintRefreshToken(userId: string | number, ttlSeconds: number): MintedRefreshToken;
|
|
34
65
|
//# sourceMappingURL=RefreshTokenStore.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshTokenStore.d.ts","sourceRoot":"","sources":["../src/RefreshTokenStore.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"RefreshTokenStore.d.ts","sourceRoot":"","sources":["../src/RefreshTokenStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAMH,MAAM,WAAW,kBAAkB;IAClC,8DAA8D;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CAClB;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IAClC,KAAK,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChD,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAAC;IACvD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC;;;OAGG;IACH,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACzD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,wCAAwC;AACxC,qBAAa,wBAAyB,YAAW,kBAAkB;;IAG5D,KAAK,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAYtD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAInC,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOxD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAM9B;AAED,wCAAwC;AACxC,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,kFAAkF;AAClF,MAAM,WAAW,kBAAkB;IAClC,MAAM,EAAE,kBAAkB,CAAC;IAC3B,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;CACd;AAED,iEAAiE;AACjE,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE,MAAM,GAAG,MAAM,EACvB,UAAU,EAAE,MAAM,GAChB,kBAAkB,CAsBpB"}
|
|
@@ -1,42 +1,59 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* RefreshTokenStore — server-side opaque refresh token management.
|
|
3
3
|
*
|
|
4
|
-
*
|
|
4
|
+
* Opaque token pattern:
|
|
5
5
|
* { accessToken, refreshToken, expiresIn }
|
|
6
6
|
* POST /auth/refresh → new pair, old token invalidated
|
|
7
7
|
*
|
|
8
|
+
* A refresh token is a bearer credential, so only `sha256(value)` is
|
|
9
|
+
* persisted, like access tokens, remember-me tokens, OTPs and backup codes: a
|
|
10
|
+
* dump of the table is not a set of working tokens. The driver is keyed by
|
|
11
|
+
* that hash and never sees the value; the application hashes what the client
|
|
12
|
+
* presents with {@link hashRefreshToken} before asking the driver.
|
|
13
|
+
*
|
|
14
|
+
* Cutover from a store that held the value itself: fail closed. Rows written
|
|
15
|
+
* before hashing are keyed by the clear value and no presented token hashes
|
|
16
|
+
* to it, so they simply stop refreshing and those clients sign in again.
|
|
17
|
+
* Nothing re-reads a clear value to upgrade it: that would keep the clear
|
|
18
|
+
* column, the very thing this removes, readable as a credential.
|
|
19
|
+
*
|
|
8
20
|
* @implements MISS-5
|
|
9
21
|
*/
|
|
10
22
|
import { randomBytes } from "node:crypto";
|
|
23
|
+
import { WardenError } from "./errors.js";
|
|
24
|
+
import { hashSecret } from "./RememberMeToken.js";
|
|
11
25
|
/** In-memory driver for development. */
|
|
12
26
|
export class MemoryRefreshTokenDriver {
|
|
13
27
|
#tokens = new Map();
|
|
14
28
|
async store(token) {
|
|
15
|
-
this.#tokens.set(token.
|
|
29
|
+
this.#tokens.set(token.hash, token);
|
|
16
30
|
}
|
|
17
|
-
async find(
|
|
18
|
-
const stored = this.#tokens.get(
|
|
31
|
+
async find(hash) {
|
|
32
|
+
const stored = this.#tokens.get(hash);
|
|
19
33
|
if (!stored)
|
|
20
34
|
return null;
|
|
21
|
-
|
|
22
|
-
|
|
35
|
+
// "Not in the future" rather than "in the past": an expiry that is not
|
|
36
|
+
// a number counts as expired instead of as never.
|
|
37
|
+
if (!(stored.expiresAt > Date.now())) {
|
|
38
|
+
this.#tokens.delete(hash);
|
|
23
39
|
return null;
|
|
24
40
|
}
|
|
25
41
|
return stored;
|
|
26
42
|
}
|
|
27
|
-
async revoke(
|
|
28
|
-
this.#tokens.delete(
|
|
43
|
+
async revoke(hash) {
|
|
44
|
+
this.#tokens.delete(hash);
|
|
29
45
|
}
|
|
30
46
|
async revokeAllForUser(userId) {
|
|
47
|
+
const owner = String(userId);
|
|
31
48
|
for (const [key, val] of this.#tokens) {
|
|
32
|
-
if (val.userId ===
|
|
49
|
+
if (String(val.userId) === owner)
|
|
33
50
|
this.#tokens.delete(key);
|
|
34
51
|
}
|
|
35
52
|
}
|
|
36
53
|
async cleanup() {
|
|
37
54
|
const now = Date.now();
|
|
38
55
|
for (const [key, val] of this.#tokens) {
|
|
39
|
-
if (val.expiresAt
|
|
56
|
+
if (!(val.expiresAt > now))
|
|
40
57
|
this.#tokens.delete(key);
|
|
41
58
|
}
|
|
42
59
|
}
|
|
@@ -45,4 +62,28 @@ export class MemoryRefreshTokenDriver {
|
|
|
45
62
|
export function generateRefreshToken() {
|
|
46
63
|
return randomBytes(48).toString("base64url");
|
|
47
64
|
}
|
|
65
|
+
/** `sha256(value)` as hex: what is stored, and what the driver is asked for. */
|
|
66
|
+
export function hashRefreshToken(value) {
|
|
67
|
+
return hashSecret(value);
|
|
68
|
+
}
|
|
69
|
+
/** Mint a refresh token for `userId`, valid for `ttlSeconds`. */
|
|
70
|
+
export function mintRefreshToken(userId, ttlSeconds) {
|
|
71
|
+
// NaN or Infinity is not a lifetime: the row would never expire.
|
|
72
|
+
if (!Number.isFinite(ttlSeconds) || ttlSeconds <= 0) {
|
|
73
|
+
throw new WardenError("E_WARDEN_TOKEN_TTL_INVALID", `ttlSeconds must be a positive finite number, got ${String(ttlSeconds)}.`, {
|
|
74
|
+
hint: "Give the refresh token a lifetime in seconds, e.g. 2592000 (30 days).",
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
const value = generateRefreshToken();
|
|
78
|
+
const now = Date.now();
|
|
79
|
+
return {
|
|
80
|
+
stored: {
|
|
81
|
+
hash: hashRefreshToken(value),
|
|
82
|
+
userId,
|
|
83
|
+
expiresAt: now + ttlSeconds * 1000,
|
|
84
|
+
createdAt: now,
|
|
85
|
+
},
|
|
86
|
+
value,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
48
89
|
//# sourceMappingURL=RefreshTokenStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RefreshTokenStore.js","sourceRoot":"","sources":["../src/RefreshTokenStore.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"RefreshTokenStore.js","sourceRoot":"","sources":["../src/RefreshTokenStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ResilientBlacklistDriver.d.ts","sourceRoot":"","sources":["../src/ResilientBlacklistDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,EACN,KAAK,eAAe,EAEpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,qBAAqB;IACrC,EAAE,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACxC,0EAA0E;IAC1E,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACnD;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAkCD,qBAAa,wBAAyB,YAAW,eAAe;;gBAO9D,OAAO,EAAE,eAAe,EACxB,QAAQ,GAAE,eAA6C,EACvD,MAAM,GAAE,wBAA6B;IAQhC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"ResilientBlacklistDriver.d.ts","sourceRoot":"","sources":["../src/ResilientBlacklistDriver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH,OAAO,EACN,KAAK,eAAe,EAEpB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,WAAW,qBAAqB;IACrC,EAAE,EAAE,KAAK,GAAG,KAAK,GAAG,SAAS,CAAC;IAC9B,KAAK,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACxC,0EAA0E;IAC1E,SAAS,CAAC,EAAE,CAAC,KAAK,EAAE,qBAAqB,KAAK,IAAI,CAAC;IACnD;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACnB;AAkCD,qBAAa,wBAAyB,YAAW,eAAe;;gBAO9D,OAAO,EAAE,eAAe,EACxB,QAAQ,GAAE,eAA6C,EACvD,MAAM,GAAE,wBAA6B;IAQhC,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBlD,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAclC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ9B"}
|
|
@@ -75,7 +75,8 @@ export class ResilientBlacklistDriver {
|
|
|
75
75
|
// The fallback first, and unconditionally: it is what this instance
|
|
76
76
|
// knows it revoked. Recording only on failure left every revocation made
|
|
77
77
|
// while the primary was healthy invisible to the fallback — and those are
|
|
78
|
-
// most of them.
|
|
78
|
+
// most of them. The default fallback sweeps expired entries on write,
|
|
79
|
+
// so recording every revocation keeps only the live ones.
|
|
79
80
|
await this.#fallback.add(jti, expiresAt);
|
|
80
81
|
try {
|
|
81
82
|
await this.#primary.add(jti, expiresAt);
|