@forestadmin/agent-bff 1.1.0 → 1.2.0
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 +19 -0
- package/dist/oauth/oauth-error.d.ts +1 -0
- package/dist/oauth/oauth-error.js +5 -1
- package/dist/oauth/oauth-routes.js +122 -24
- package/dist/oauth/session-store.d.ts +19 -0
- package/dist/oauth/session-store.js +77 -4
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -43,6 +43,25 @@ yarn start:dev # node --env-file=.env dist/cli.js
|
|
|
43
43
|
- A required var that is absent (or empty / whitespace-only) does not crash the server. It boots and
|
|
44
44
|
reports the gap through `/health` (503 `degraded`).
|
|
45
45
|
|
|
46
|
+
## Sessions & token rotation
|
|
47
|
+
|
|
48
|
+
OAuth sessions, opaque refresh tokens, and rotated-out-token reuse detection are held in an
|
|
49
|
+
**in-memory, single-process** store. Reuse detection has a one-step grace window: re-presenting the
|
|
50
|
+
**most recently** rotated-out token (a benign retry of a refresh whose response was lost) replays
|
|
51
|
+
the last issued pair instead of killing the session — the stored refresh token is returned with a
|
|
52
|
+
freshly minted access JWT. Re-presenting any **older** rotated-out token still invalidates the whole
|
|
53
|
+
session, so a stolen earlier token stays detectable. The grace window is bounded by the rotation
|
|
54
|
+
chain, not a timer: once the client advances one more rotation, the previous token is no longer the
|
|
55
|
+
latest and falls back to reuse. These guarantees are only correct within one process. Two layers
|
|
56
|
+
are process-local: the session/rotation maps in the store, and the in-flight refresh dedup maps
|
|
57
|
+
(`inFlightRefreshByPresentedHash` in `oauth-routes`, `inFlightRefreshesBySid` in
|
|
58
|
+
`session-lifecycle`) that collapse concurrent refreshes of the same token into a single rotation.
|
|
59
|
+
Running the BFF behind a load balancer without sticky sessions breaks reuse detection and the
|
|
60
|
+
single-rotation guarantee — and a shared session store alone does not fix it: two concurrent
|
|
61
|
+
refreshes landing on different nodes would each try to rotate, one committing and the other failing
|
|
62
|
+
with `session_expired`. Horizontal scaling requires both a shared session store **and** a shared
|
|
63
|
+
(or node-pinned) refresh-coordination mechanism.
|
|
64
|
+
|
|
46
65
|
## `/health`
|
|
47
66
|
|
|
48
67
|
```jsonc
|
|
@@ -14,5 +14,6 @@ export declare function invalidGrant(message: string): OAuthRequestError;
|
|
|
14
14
|
export declare function unsupportedGrantType(message: string): OAuthRequestError;
|
|
15
15
|
export declare function forestIdentityNotAllowed(message: string): OAuthRequestError;
|
|
16
16
|
export declare function sessionExpired(message: string): OAuthRequestError;
|
|
17
|
+
export declare function sessionInvalidated(message: string): OAuthRequestError;
|
|
17
18
|
export declare function serverError(message: string): OAuthRequestError;
|
|
18
19
|
//# sourceMappingURL=oauth-error.d.ts.map
|
|
@@ -8,6 +8,7 @@ exports.invalidGrant = invalidGrant;
|
|
|
8
8
|
exports.unsupportedGrantType = unsupportedGrantType;
|
|
9
9
|
exports.forestIdentityNotAllowed = forestIdentityNotAllowed;
|
|
10
10
|
exports.sessionExpired = sessionExpired;
|
|
11
|
+
exports.sessionInvalidated = sessionInvalidated;
|
|
11
12
|
exports.serverError = serverError;
|
|
12
13
|
class OAuthRequestError extends Error {
|
|
13
14
|
constructor(status, type, message) {
|
|
@@ -39,7 +40,10 @@ function forestIdentityNotAllowed(message) {
|
|
|
39
40
|
function sessionExpired(message) {
|
|
40
41
|
return new OAuthRequestError(401, 'session_expired', message);
|
|
41
42
|
}
|
|
43
|
+
function sessionInvalidated(message) {
|
|
44
|
+
return new OAuthRequestError(401, 'session_invalidated', message);
|
|
45
|
+
}
|
|
42
46
|
function serverError(message) {
|
|
43
47
|
return new OAuthRequestError(502, 'server_error', message);
|
|
44
48
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoib2F1dGgtZXJyb3IuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvb2F1dGgvb2F1dGgtZXJyb3IudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBaUJBLGtDQUVDO0FBRUQsd0NBRUM7QUFFRCxzQ0FFQztBQUVELG9DQUVDO0FBRUQsb0RBRUM7QUFFRCw0REFFQztBQUVELHdDQUVDO0FBRUQsZ0RBRUM7QUFFRCxrQ0FFQztBQW5ERCxNQUFhLGlCQUFrQixTQUFRLEtBQUs7SUFJMUMsWUFBWSxNQUFjLEVBQUUsSUFBWSxFQUFFLE9BQWU7UUFDdkQsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ2YsSUFBSSxDQUFDLElBQUksR0FBRyxtQkFBbUIsQ0FBQztRQUNoQyxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztRQUNyQixJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztJQUNuQixDQUFDO0NBQ0Y7QUFWRCw4Q0FVQztBQU9ELFNBQWdCLFdBQVcsQ0FBQyxLQUF3QjtJQUNsRCxPQUFPLEVBQUUsS0FBSyxFQUFFLEtBQUssQ0FBQyxJQUFJLEVBQUUsaUJBQWlCLEVBQUUsS0FBSyxDQUFDLE9BQU8sRUFBRSxDQUFDO0FBQ2pFLENBQUM7QUFFRCxTQUFnQixjQUFjLENBQUMsT0FBZTtJQUM1QyxPQUFPLElBQUksaUJBQWlCLENBQUMsR0FBRyxFQUFFLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ2hFLENBQUM7QUFFRCxTQUFnQixhQUFhLENBQUMsT0FBZTtJQUMzQyxPQUFPLElBQUksaUJBQWlCLENBQUMsR0FBRyxFQUFFLGdCQUFnQixFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQy9ELENBQUM7QUFFRCxTQUFnQixZQUFZLENBQUMsT0FBZTtJQUMxQyxPQUFPLElBQUksaUJBQWlCLENBQUMsR0FBRyxFQUFFLGVBQWUsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUM5RCxDQUFDO0FBRUQsU0FBZ0Isb0JBQW9CLENBQUMsT0FBZTtJQUNsRCxPQUFPLElBQUksaUJBQWlCLENBQUMsR0FBRyxFQUFFLHdCQUF3QixFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ3ZFLENBQUM7QUFFRCxTQUFnQix3QkFBd0IsQ0FBQyxPQUFlO0lBQ3RELE9BQU8sSUFBSSxpQkFBaUIsQ0FBQyxHQUFHLEVBQUUsNkJBQTZCLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDNUUsQ0FBQztBQUVELFNBQWdCLGNBQWMsQ0FBQyxPQUFlO0lBQzVDLE9BQU8sSUFBSSxpQkFBaUIsQ0FBQyxHQUFHLEVBQUUsaUJBQWlCLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDaEUsQ0FBQztBQUVELFNBQWdCLGtCQUFrQixDQUFDLE9BQWU7SUFDaEQsT0FBTyxJQUFJLGlCQUFpQixDQUFDLEdBQUcsRUFBRSxxQkFBcUIsRUFBRSxPQUFPLENBQUMsQ0FBQztBQUNwRSxDQUFDO0FBRUQsU0FBZ0IsV0FBVyxDQUFDLE9BQWU7SUFDekMsT0FBTyxJQUFJLGlCQUFpQixDQUFDLEdBQUcsRUFBRSxjQUFjLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDN0QsQ0FBQyJ9
|
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.default = createOAuthRoutes;
|
|
7
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
8
|
+
const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
|
|
4
9
|
const bff_token_1 = require("./bff-token");
|
|
5
10
|
const forest_server_client_1 = require("./forest-server-client");
|
|
6
11
|
const oauth_error_1 = require("./oauth-error");
|
|
12
|
+
const session_lifecycle_1 = __importDefault(require("./session-lifecycle"));
|
|
13
|
+
function hashPresentedToken(token) {
|
|
14
|
+
return crypto_1.default.createHash('sha256').update(token).digest('base64url');
|
|
15
|
+
}
|
|
7
16
|
const CODE_VERIFIER_PATTERN = /^[A-Za-z0-9\-._~]{43,128}$/;
|
|
8
17
|
const S256_CODE_CHALLENGE_PATTERN = /^[A-Za-z0-9_-]{43}$/;
|
|
9
18
|
const SAFE_EXCHANGE_ERRORS = new Set([
|
|
@@ -123,15 +132,15 @@ function computeExpiresIn(serverTokens) {
|
|
|
123
132
|
}
|
|
124
133
|
return Math.min(bff_token_1.BFF_ACCESS_TOKEN_MAX_EXPIRES_IN, saasRemaining);
|
|
125
134
|
}
|
|
126
|
-
|
|
135
|
+
function parseBody(ctx) {
|
|
127
136
|
const { body } = ctx.request;
|
|
128
137
|
if (typeof body !== 'object' || body === null) {
|
|
129
138
|
throw (0, oauth_error_1.invalidRequest)('Missing request body');
|
|
130
139
|
}
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
140
|
+
return body;
|
|
141
|
+
}
|
|
142
|
+
async function parseTokenRequest(ctx, options) {
|
|
143
|
+
const params = parseBody(ctx);
|
|
135
144
|
const request = {
|
|
136
145
|
code: requireBodyString(params, 'code'),
|
|
137
146
|
clientId: requireBodyString(params, 'client_id'),
|
|
@@ -161,18 +170,27 @@ async function exchangeForServerTokens(request, options) {
|
|
|
161
170
|
function isRetriableExchangeError(error) {
|
|
162
171
|
return !(error instanceof oauth_error_1.OAuthRequestError) || error.status >= 500;
|
|
163
172
|
}
|
|
164
|
-
async function resolveIdentity(
|
|
173
|
+
async function resolveIdentity(renderingId, saasAccessToken, options) {
|
|
165
174
|
try {
|
|
166
|
-
return await options.serverClient.getUserInfo(
|
|
175
|
+
return await options.serverClient.getUserInfo(renderingId, saasAccessToken);
|
|
167
176
|
}
|
|
168
177
|
catch (error) {
|
|
169
|
-
options.logger('Warn', 'Failed to resolve user info after exchange', {
|
|
170
|
-
renderingId: serverTokens.renderingId,
|
|
171
|
-
});
|
|
178
|
+
options.logger('Warn', 'Failed to resolve user info after exchange', { renderingId });
|
|
172
179
|
throw mapIdentityError(error);
|
|
173
180
|
}
|
|
174
181
|
}
|
|
175
|
-
|
|
182
|
+
function writeTokenResponse(ctx, accessToken, expiresInSeconds, refreshToken) {
|
|
183
|
+
ctx.set('Cache-Control', 'no-store');
|
|
184
|
+
ctx.set('Pragma', 'no-cache');
|
|
185
|
+
ctx.status = 200;
|
|
186
|
+
ctx.body = {
|
|
187
|
+
access_token: accessToken,
|
|
188
|
+
token_type: 'Bearer',
|
|
189
|
+
expires_in: expiresInSeconds,
|
|
190
|
+
refresh_token: refreshToken,
|
|
191
|
+
};
|
|
192
|
+
}
|
|
193
|
+
async function handleAuthorizationCodeGrant(ctx, options) {
|
|
176
194
|
const request = await parseTokenRequest(ctx, options);
|
|
177
195
|
if (!options.sessionStore.claimAuthorizationCode(request.code)) {
|
|
178
196
|
throw (0, oauth_error_1.invalidGrant)('Authorization code has already been used');
|
|
@@ -188,7 +206,7 @@ async function handleToken(ctx, options) {
|
|
|
188
206
|
throw error;
|
|
189
207
|
}
|
|
190
208
|
const expiresInSeconds = computeExpiresIn(serverTokens);
|
|
191
|
-
const user = await resolveIdentity(serverTokens, options);
|
|
209
|
+
const user = await resolveIdentity(serverTokens.renderingId, serverTokens.saasAccessToken, options);
|
|
192
210
|
const { sid, refreshToken } = options.sessionStore.create({
|
|
193
211
|
saasAccessToken: serverTokens.saasAccessToken,
|
|
194
212
|
saasRefreshToken: serverTokens.saasRefreshToken,
|
|
@@ -206,15 +224,91 @@ async function handleToken(ctx, options) {
|
|
|
206
224
|
renderingId: serverTokens.renderingId,
|
|
207
225
|
userId: user.id,
|
|
208
226
|
});
|
|
209
|
-
ctx
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
227
|
+
writeTokenResponse(ctx, accessToken, expiresInSeconds, refreshToken);
|
|
228
|
+
}
|
|
229
|
+
function expiresInFromAccessToken(saasAccessToken) {
|
|
230
|
+
const decoded = jsonwebtoken_1.default.decode(saasAccessToken);
|
|
231
|
+
if (typeof decoded?.exp !== 'number' || !Number.isFinite(decoded.exp)) {
|
|
232
|
+
return bff_token_1.BFF_ACCESS_TOKEN_MAX_EXPIRES_IN;
|
|
233
|
+
}
|
|
234
|
+
const saasRemaining = decoded.exp - Math.floor(Date.now() / 1000);
|
|
235
|
+
if (saasRemaining <= 0) {
|
|
236
|
+
throw (0, oauth_error_1.sessionExpired)('The Forest server access token is already expired');
|
|
237
|
+
}
|
|
238
|
+
return Math.min(bff_token_1.BFF_ACCESS_TOKEN_MAX_EXPIRES_IN, saasRemaining);
|
|
239
|
+
}
|
|
240
|
+
async function issueAccessForSession(sid, renderingId, refreshToken, options) {
|
|
241
|
+
const saasAccessToken = await (0, session_lifecycle_1.default)({
|
|
242
|
+
sid,
|
|
243
|
+
store: options.sessionStore,
|
|
244
|
+
serverClient: options.serverClient,
|
|
245
|
+
});
|
|
246
|
+
const expiresInSeconds = expiresInFromAccessToken(saasAccessToken);
|
|
247
|
+
const user = await resolveIdentity(renderingId, saasAccessToken, options);
|
|
248
|
+
const accessToken = (0, bff_token_1.issueBffAccessToken)({
|
|
249
|
+
sid,
|
|
250
|
+
user,
|
|
251
|
+
renderingId,
|
|
252
|
+
authSecret: options.authSecret,
|
|
253
|
+
expiresInSeconds,
|
|
254
|
+
});
|
|
255
|
+
return { sid, accessToken, expiresInSeconds, newRefreshToken: refreshToken };
|
|
256
|
+
}
|
|
257
|
+
async function reissueThenCommitRotation(presentedToken, sid, renderingId, newRefreshToken, options) {
|
|
258
|
+
const result = await issueAccessForSession(sid, renderingId, newRefreshToken, options);
|
|
259
|
+
if (!options.sessionStore.commitRotation(presentedToken, newRefreshToken)) {
|
|
260
|
+
throw (0, oauth_error_1.sessionExpired)('Session expired during refresh');
|
|
261
|
+
}
|
|
262
|
+
return result;
|
|
263
|
+
}
|
|
264
|
+
async function handleRefreshGrant(ctx, options) {
|
|
265
|
+
const params = parseBody(ctx);
|
|
266
|
+
const presentedToken = requireBodyString(params, 'refresh_token');
|
|
267
|
+
const presentedHash = hashPresentedToken(presentedToken);
|
|
268
|
+
const inFlight = options.inFlightRefreshByPresentedHash;
|
|
269
|
+
let pending = inFlight.get(presentedHash);
|
|
270
|
+
if (!pending) {
|
|
271
|
+
const rotation = options.sessionStore.prepareRotation(presentedToken);
|
|
272
|
+
if (rotation.outcome === 'reuse') {
|
|
273
|
+
options.sessionStore.destroy(rotation.sid);
|
|
274
|
+
options.logger('Warn', 'Rotated-out refresh token replayed; session invalidated', {
|
|
275
|
+
sid: rotation.sid,
|
|
276
|
+
});
|
|
277
|
+
throw (0, oauth_error_1.sessionInvalidated)('Refresh token was already used; the session is invalidated');
|
|
278
|
+
}
|
|
279
|
+
if (rotation.outcome === 'unknown') {
|
|
280
|
+
throw (0, oauth_error_1.invalidGrant)('Unknown or malformed refresh token');
|
|
281
|
+
}
|
|
282
|
+
if (rotation.outcome === 'replay') {
|
|
283
|
+
options.logger('Info', 'Replayed the last issued pair for a benign retry', {
|
|
284
|
+
sid: rotation.sid,
|
|
285
|
+
});
|
|
286
|
+
pending = issueAccessForSession(rotation.sid, rotation.renderingId, rotation.lastIssuedRefreshToken, options).finally(() => {
|
|
287
|
+
inFlight.delete(presentedHash);
|
|
288
|
+
});
|
|
289
|
+
}
|
|
290
|
+
else {
|
|
291
|
+
pending = reissueThenCommitRotation(presentedToken, rotation.sid, rotation.renderingId, rotation.newRefreshToken, options).finally(() => {
|
|
292
|
+
inFlight.delete(presentedHash);
|
|
293
|
+
});
|
|
294
|
+
}
|
|
295
|
+
inFlight.set(presentedHash, pending);
|
|
296
|
+
}
|
|
297
|
+
const result = await pending;
|
|
298
|
+
options.logger('Info', 'Refreshed BFF session token', { sid: result.sid });
|
|
299
|
+
writeTokenResponse(ctx, result.accessToken, result.expiresInSeconds, result.newRefreshToken);
|
|
300
|
+
}
|
|
301
|
+
async function handleToken(ctx, options) {
|
|
302
|
+
const params = parseBody(ctx);
|
|
303
|
+
if (params.grant_type === 'refresh_token') {
|
|
304
|
+
await handleRefreshGrant(ctx, options);
|
|
305
|
+
return;
|
|
306
|
+
}
|
|
307
|
+
if (params.grant_type === 'authorization_code') {
|
|
308
|
+
await handleAuthorizationCodeGrant(ctx, options);
|
|
309
|
+
return;
|
|
310
|
+
}
|
|
311
|
+
throw (0, oauth_error_1.unsupportedGrantType)('Only authorization_code and refresh_token are supported');
|
|
218
312
|
}
|
|
219
313
|
function matchRoute(ctx) {
|
|
220
314
|
if (ctx.method === 'GET' && ctx.path === '/oauth/authorize')
|
|
@@ -237,6 +331,10 @@ function writeError(ctx, error, options) {
|
|
|
237
331
|
ctx.body = { error: 'server_error', error_description: 'OAuth processing failed' };
|
|
238
332
|
}
|
|
239
333
|
function createOAuthRoutes(options) {
|
|
334
|
+
const runtimeOptions = {
|
|
335
|
+
...options,
|
|
336
|
+
inFlightRefreshByPresentedHash: new Map(),
|
|
337
|
+
};
|
|
240
338
|
return async function oauthRoutes(ctx, next) {
|
|
241
339
|
const handler = matchRoute(ctx);
|
|
242
340
|
if (!handler) {
|
|
@@ -244,11 +342,11 @@ function createOAuthRoutes(options) {
|
|
|
244
342
|
return;
|
|
245
343
|
}
|
|
246
344
|
try {
|
|
247
|
-
await handler(ctx,
|
|
345
|
+
await handler(ctx, runtimeOptions);
|
|
248
346
|
}
|
|
249
347
|
catch (error) {
|
|
250
|
-
writeError(ctx, error,
|
|
348
|
+
writeError(ctx, error, runtimeOptions);
|
|
251
349
|
}
|
|
252
350
|
};
|
|
253
351
|
}
|
|
254
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth-routes.js","sourceRoot":"","sources":["../../src/oauth/oauth-routes.ts"],"names":[],"mappings":"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"}
|
|
352
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"oauth-routes.js","sourceRoot":"","sources":["../../src/oauth/oauth-routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,22 @@ export interface CreatedSession {
|
|
|
17
17
|
sid: string;
|
|
18
18
|
refreshToken: string;
|
|
19
19
|
}
|
|
20
|
+
export type PrepareRotationResult = {
|
|
21
|
+
outcome: 'ready';
|
|
22
|
+
sid: string;
|
|
23
|
+
renderingId: number;
|
|
24
|
+
newRefreshToken: string;
|
|
25
|
+
} | {
|
|
26
|
+
outcome: 'replay';
|
|
27
|
+
sid: string;
|
|
28
|
+
renderingId: number;
|
|
29
|
+
lastIssuedRefreshToken: string;
|
|
30
|
+
} | {
|
|
31
|
+
outcome: 'reuse';
|
|
32
|
+
sid: string;
|
|
33
|
+
} | {
|
|
34
|
+
outcome: 'unknown';
|
|
35
|
+
};
|
|
20
36
|
export interface UpdateSaasTokensInput {
|
|
21
37
|
saasAccessToken: string;
|
|
22
38
|
saasRefreshToken: string;
|
|
@@ -26,6 +42,9 @@ export interface SessionStore {
|
|
|
26
42
|
get(sid: string): StoredSession | undefined;
|
|
27
43
|
getSaasRefreshToken(sid: string): string | undefined;
|
|
28
44
|
updateSaasTokens(sid: string, tokens: UpdateSaasTokensInput): void;
|
|
45
|
+
prepareRotation(presentedToken: string): PrepareRotationResult;
|
|
46
|
+
commitRotation(presentedToken: string, newRefreshToken: string): boolean;
|
|
47
|
+
destroy(sid: string): void;
|
|
29
48
|
claimAuthorizationCode(code: string): boolean;
|
|
30
49
|
releaseAuthorizationCode(code: string): void;
|
|
31
50
|
pendingClaimCount(): number;
|
|
@@ -20,6 +20,24 @@ function hashToken(token) {
|
|
|
20
20
|
function createInMemorySessionStore({ cipher, now, sessionTtlSeconds, authCodeTtlSeconds = DEFAULT_AUTH_CODE_TTL_SECONDS, maxPendingCodes = DEFAULT_MAX_PENDING_CODES, }) {
|
|
21
21
|
const sessions = new Map();
|
|
22
22
|
const usedCodes = new Map();
|
|
23
|
+
const activeRefreshHashToSid = new Map();
|
|
24
|
+
const rotatedRefreshHashToSid = new Map();
|
|
25
|
+
const lastRotationBySid = new Map();
|
|
26
|
+
function forgetRefreshHashes(sid) {
|
|
27
|
+
for (const [hash, owner] of activeRefreshHashToSid) {
|
|
28
|
+
if (owner === sid)
|
|
29
|
+
activeRefreshHashToSid.delete(hash);
|
|
30
|
+
}
|
|
31
|
+
for (const [hash, owner] of rotatedRefreshHashToSid) {
|
|
32
|
+
if (owner === sid)
|
|
33
|
+
rotatedRefreshHashToSid.delete(hash);
|
|
34
|
+
}
|
|
35
|
+
lastRotationBySid.delete(sid);
|
|
36
|
+
}
|
|
37
|
+
function dropSession(sid) {
|
|
38
|
+
sessions.delete(sid);
|
|
39
|
+
forgetRefreshHashes(sid);
|
|
40
|
+
}
|
|
23
41
|
function purgeExpiredCodes() {
|
|
24
42
|
const current = now();
|
|
25
43
|
for (const [code, expiresAt] of usedCodes) {
|
|
@@ -31,7 +49,7 @@ function createInMemorySessionStore({ cipher, now, sessionTtlSeconds, authCodeTt
|
|
|
31
49
|
const current = now();
|
|
32
50
|
for (const [sid, session] of sessions) {
|
|
33
51
|
if (current >= session.expiresAt)
|
|
34
|
-
|
|
52
|
+
dropSession(sid);
|
|
35
53
|
}
|
|
36
54
|
}
|
|
37
55
|
function liveSession(sid) {
|
|
@@ -39,7 +57,7 @@ function createInMemorySessionStore({ cipher, now, sessionTtlSeconds, authCodeTt
|
|
|
39
57
|
if (!session)
|
|
40
58
|
return undefined;
|
|
41
59
|
if (now() >= session.expiresAt) {
|
|
42
|
-
|
|
60
|
+
dropSession(sid);
|
|
43
61
|
return undefined;
|
|
44
62
|
}
|
|
45
63
|
return session;
|
|
@@ -49,14 +67,16 @@ function createInMemorySessionStore({ cipher, now, sessionTtlSeconds, authCodeTt
|
|
|
49
67
|
purgeExpiredSessions();
|
|
50
68
|
const sid = createSid();
|
|
51
69
|
const refreshToken = createOpaqueToken();
|
|
70
|
+
const refreshTokenHash = hashToken(refreshToken);
|
|
52
71
|
sessions.set(sid, {
|
|
53
72
|
saasAccessToken: input.saasAccessToken,
|
|
54
73
|
saasRefreshTokenBlob: cipher.encrypt(input.saasRefreshToken),
|
|
55
|
-
refreshTokenHash
|
|
74
|
+
refreshTokenHash,
|
|
56
75
|
renderingId: input.renderingId,
|
|
57
76
|
userId: input.userId,
|
|
58
77
|
expiresAt: now() + sessionTtlSeconds * 1000,
|
|
59
78
|
});
|
|
79
|
+
activeRefreshHashToSid.set(refreshTokenHash, sid);
|
|
60
80
|
return { sid, refreshToken };
|
|
61
81
|
},
|
|
62
82
|
get(sid) {
|
|
@@ -74,6 +94,59 @@ function createInMemorySessionStore({ cipher, now, sessionTtlSeconds, authCodeTt
|
|
|
74
94
|
session.saasAccessToken = tokens.saasAccessToken;
|
|
75
95
|
session.saasRefreshTokenBlob = cipher.encrypt(tokens.saasRefreshToken);
|
|
76
96
|
},
|
|
97
|
+
prepareRotation(presentedToken) {
|
|
98
|
+
const hash = hashToken(presentedToken);
|
|
99
|
+
const reusedSid = rotatedRefreshHashToSid.get(hash);
|
|
100
|
+
if (reusedSid !== undefined) {
|
|
101
|
+
const session = liveSession(reusedSid);
|
|
102
|
+
if (!session)
|
|
103
|
+
return { outcome: 'unknown' };
|
|
104
|
+
const lastRotation = lastRotationBySid.get(reusedSid);
|
|
105
|
+
if (lastRotation?.rotatedHash === hash) {
|
|
106
|
+
return {
|
|
107
|
+
outcome: 'replay',
|
|
108
|
+
sid: reusedSid,
|
|
109
|
+
renderingId: session.renderingId,
|
|
110
|
+
lastIssuedRefreshToken: cipher.decrypt(lastRotation.issuedRefreshBlob),
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
return { outcome: 'reuse', sid: reusedSid };
|
|
114
|
+
}
|
|
115
|
+
const sid = activeRefreshHashToSid.get(hash);
|
|
116
|
+
if (sid === undefined)
|
|
117
|
+
return { outcome: 'unknown' };
|
|
118
|
+
const session = liveSession(sid);
|
|
119
|
+
if (!session)
|
|
120
|
+
return { outcome: 'unknown' };
|
|
121
|
+
return {
|
|
122
|
+
outcome: 'ready',
|
|
123
|
+
sid,
|
|
124
|
+
renderingId: session.renderingId,
|
|
125
|
+
newRefreshToken: createOpaqueToken(),
|
|
126
|
+
};
|
|
127
|
+
},
|
|
128
|
+
commitRotation(presentedToken, newRefreshToken) {
|
|
129
|
+
const hash = hashToken(presentedToken);
|
|
130
|
+
const sid = activeRefreshHashToSid.get(hash);
|
|
131
|
+
if (sid === undefined)
|
|
132
|
+
return false;
|
|
133
|
+
const session = liveSession(sid);
|
|
134
|
+
if (!session)
|
|
135
|
+
return false;
|
|
136
|
+
const newHash = hashToken(newRefreshToken);
|
|
137
|
+
activeRefreshHashToSid.delete(hash);
|
|
138
|
+
rotatedRefreshHashToSid.set(hash, sid);
|
|
139
|
+
lastRotationBySid.set(sid, {
|
|
140
|
+
rotatedHash: hash,
|
|
141
|
+
issuedRefreshBlob: cipher.encrypt(newRefreshToken),
|
|
142
|
+
});
|
|
143
|
+
activeRefreshHashToSid.set(newHash, sid);
|
|
144
|
+
session.refreshTokenHash = newHash;
|
|
145
|
+
return true;
|
|
146
|
+
},
|
|
147
|
+
destroy(sid) {
|
|
148
|
+
dropSession(sid);
|
|
149
|
+
},
|
|
77
150
|
claimAuthorizationCode(code) {
|
|
78
151
|
purgeExpiredCodes();
|
|
79
152
|
if (usedCodes.has(code))
|
|
@@ -92,4 +165,4 @@ function createInMemorySessionStore({ cipher, now, sessionTtlSeconds, authCodeTt
|
|
|
92
165
|
},
|
|
93
166
|
};
|
|
94
167
|
}
|
|
95
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
168
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2Vzc2lvbi1zdG9yZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9vYXV0aC9zZXNzaW9uLXN0b3JlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBNERBLDhCQUVDO0FBVUQsNkNBMExDO0FBaFFELG9EQUE0QjtBQXVENUIsTUFBTSw2QkFBNkIsR0FBRyxDQUFDLEdBQUcsRUFBRSxDQUFDO0FBQzdDLE1BQU0seUJBQXlCLEdBQUcsS0FBTSxDQUFDO0FBRXpDLFNBQWdCLFNBQVM7SUFDdkIsT0FBTyxnQkFBTSxDQUFDLFdBQVcsQ0FBQyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7QUFDdEQsQ0FBQztBQUVELFNBQVMsaUJBQWlCO0lBQ3hCLE9BQU8sZ0JBQU0sQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ3RELENBQUM7QUFFRCxTQUFTLFNBQVMsQ0FBQyxLQUFhO0lBQzlCLE9BQU8sZ0JBQU0sQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUN2RSxDQUFDO0FBRUQsU0FBd0IsMEJBQTBCLENBQUMsRUFDakQsTUFBTSxFQUNOLEdBQUcsRUFDSCxpQkFBaUIsRUFDakIsa0JBQWtCLEdBQUcsNkJBQTZCLEVBQ2xELGVBQWUsR0FBRyx5QkFBeUIsR0FDdkI7SUFDcEIsTUFBTSxRQUFRLEdBQUcsSUFBSSxHQUFHLEVBQXlCLENBQUM7SUFDbEQsTUFBTSxTQUFTLEdBQUcsSUFBSSxHQUFHLEVBQWtCLENBQUM7SUFDNUMsTUFBTSxzQkFBc0IsR0FBRyxJQUFJLEdBQUcsRUFBa0IsQ0FBQztJQUN6RCxNQUFNLHVCQUF1QixHQUFHLElBQUksR0FBRyxFQUFrQixDQUFDO0lBQzFELE1BQU0saUJBQWlCLEdBQUcsSUFBSSxHQUFHLEVBRzlCLENBQUM7SUFFSixTQUFTLG1CQUFtQixDQUFDLEdBQVc7UUFDdEMsS0FBSyxNQUFNLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxJQUFJLHNCQUFzQixFQUFFLENBQUM7WUFDbkQsSUFBSSxLQUFLLEtBQUssR0FBRztnQkFBRSxzQkFBc0IsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDekQsQ0FBQztRQUVELEtBQUssTUFBTSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSSx1QkFBdUIsRUFBRSxDQUFDO1lBQ3BELElBQUksS0FBSyxLQUFLLEdBQUc7Z0JBQUUsdUJBQXVCLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQzFELENBQUM7UUFFRCxpQkFBaUIsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVELFNBQVMsV0FBVyxDQUFDLEdBQVc7UUFDOUIsUUFBUSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixtQkFBbUIsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMzQixDQUFDO0lBRUQsU0FBUyxpQkFBaUI7UUFDeEIsTUFBTSxPQUFPLEdBQUcsR0FBRyxFQUFFLENBQUM7UUFFdEIsS0FBSyxNQUFNLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxJQUFJLFNBQVMsRUFBRSxDQUFDO1lBQzFDLElBQUksT0FBTyxJQUFJLFNBQVM7Z0JBQUUsU0FBUyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUNuRCxDQUFDO0lBQ0gsQ0FBQztJQUVELFNBQVMsb0JBQW9CO1FBQzNCLE1BQU0sT0FBTyxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBRXRCLEtBQUssTUFBTSxDQUFDLEdBQUcsRUFBRSxPQUFPLENBQUMsSUFBSSxRQUFRLEVBQUUsQ0FBQztZQUN0QyxJQUFJLE9BQU8sSUFBSSxPQUFPLENBQUMsU0FBUztnQkFBRSxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDckQsQ0FBQztJQUNILENBQUM7SUFFRCxTQUFTLFdBQVcsQ0FBQyxHQUFXO1FBQzlCLE1BQU0sT0FBTyxHQUFHLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLE9BQU87WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUUvQixJQUFJLEdBQUcsRUFBRSxJQUFJLE9BQU8sQ0FBQyxTQUFTLEVBQUUsQ0FBQztZQUMvQixXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7WUFFakIsT0FBTyxTQUFTLENBQUM7UUFDbkIsQ0FBQztRQUVELE9BQU8sT0FBTyxDQUFDO0lBQ2pCLENBQUM7SUFFRCxPQUFPO1FBQ0wsTUFBTSxDQUFDLEtBQUs7WUFDVixvQkFBb0IsRUFBRSxDQUFDO1lBQ3ZCLE1BQU0sR0FBRyxHQUFHLFNBQVMsRUFBRSxDQUFDO1lBQ3hCLE1BQU0sWUFBWSxHQUFHLGlCQUFpQixFQUFFLENBQUM7WUFDekMsTUFBTSxnQkFBZ0IsR0FBRyxTQUFTLENBQUMsWUFBWSxDQUFDLENBQUM7WUFFakQsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUU7Z0JBQ2hCLGVBQWUsRUFBRSxLQUFLLENBQUMsZUFBZTtnQkFDdEMsb0JBQW9CLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLENBQUM7Z0JBQzVELGdCQUFnQjtnQkFDaEIsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO2dCQUM5QixNQUFNLEVBQUUsS0FBSyxDQUFDLE1BQU07Z0JBQ3BCLFNBQVMsRUFBRSxHQUFHLEVBQUUsR0FBRyxpQkFBaUIsR0FBRyxJQUFJO2FBQzVDLENBQUMsQ0FBQztZQUNILHNCQUFzQixDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsRUFBRSxHQUFHLENBQUMsQ0FBQztZQUVsRCxPQUFPLEVBQUUsR0FBRyxFQUFFLFlBQVksRUFBRSxDQUFDO1FBQy9CLENBQUM7UUFFRCxHQUFHLENBQUMsR0FBRztZQUNMLE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUVqQyxPQUFPLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRSxHQUFHLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDOUMsQ0FBQztRQUVELG1CQUFtQixDQUFDLEdBQUc7WUFDckIsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1lBRWpDLE9BQU8sT0FBTyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDNUUsQ0FBQztRQUVELGdCQUFnQixDQUFDLEdBQUcsRUFBRSxNQUFNO1lBQzFCLE1BQU0sT0FBTyxHQUFHLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQztZQUNqQyxJQUFJLENBQUMsT0FBTztnQkFBRSxPQUFPO1lBRXJCLE9BQU8sQ0FBQyxlQUFlLEdBQUcsTUFBTSxDQUFDLGVBQWUsQ0FBQztZQUNqRCxPQUFPLENBQUMsb0JBQW9CLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUN6RSxDQUFDO1FBRUQsZUFBZSxDQUFDLGNBQWM7WUFDNUIsTUFBTSxJQUFJLEdBQUcsU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFDO1lBRXZDLE1BQU0sU0FBUyxHQUFHLHVCQUF1QixDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUVwRCxJQUFJLFNBQVMsS0FBSyxTQUFTLEVBQUUsQ0FBQztnQkFDNUIsTUFBTSxPQUFPLEdBQUcsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFDO2dCQUN2QyxJQUFJLENBQUMsT0FBTztvQkFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxDQUFDO2dCQUU1QyxNQUFNLFlBQVksR0FBRyxpQkFBaUIsQ0FBQyxHQUFHLENBQUMsU0FBUyxDQUFDLENBQUM7Z0JBRXRELElBQUksWUFBWSxFQUFFLFdBQVcsS0FBSyxJQUFJLEVBQUUsQ0FBQztvQkFDdkMsT0FBTzt3QkFDTCxPQUFPLEVBQUUsUUFBUTt3QkFDakIsR0FBRyxFQUFFLFNBQVM7d0JBQ2QsV0FBVyxFQUFFLE9BQU8sQ0FBQyxXQUFXO3dCQUNoQyxzQkFBc0IsRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLFlBQVksQ0FBQyxpQkFBaUIsQ0FBQztxQkFDdkUsQ0FBQztnQkFDSixDQUFDO2dCQUVELE9BQU8sRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxTQUFTLEVBQUUsQ0FBQztZQUM5QyxDQUFDO1lBRUQsTUFBTSxHQUFHLEdBQUcsc0JBQXNCLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzdDLElBQUksR0FBRyxLQUFLLFNBQVM7Z0JBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQztZQUVyRCxNQUFNLE9BQU8sR0FBRyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakMsSUFBSSxDQUFDLE9BQU87Z0JBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsQ0FBQztZQUU1QyxPQUFPO2dCQUNMLE9BQU8sRUFBRSxPQUFPO2dCQUNoQixHQUFHO2dCQUNILFdBQVcsRUFBRSxPQUFPLENBQUMsV0FBVztnQkFDaEMsZUFBZSxFQUFFLGlCQUFpQixFQUFFO2FBQ3JDLENBQUM7UUFDSixDQUFDO1FBRUQsY0FBYyxDQUFDLGNBQWMsRUFBRSxlQUFlO1lBQzVDLE1BQU0sSUFBSSxHQUFHLFNBQVMsQ0FBQyxjQUFjLENBQUMsQ0FBQztZQUN2QyxNQUFNLEdBQUcsR0FBRyxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7WUFFN0MsSUFBSSxHQUFHLEtBQUssU0FBUztnQkFBRSxPQUFPLEtBQUssQ0FBQztZQUVwQyxNQUFNLE9BQU8sR0FBRyxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7WUFDakMsSUFBSSxDQUFDLE9BQU87Z0JBQUUsT0FBTyxLQUFLLENBQUM7WUFFM0IsTUFBTSxPQUFPLEdBQUcsU0FBUyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQzNDLHNCQUFzQixDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztZQUNwQyx1QkFBdUIsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQ3ZDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUU7Z0JBQ3pCLFdBQVcsRUFBRSxJQUFJO2dCQUNqQixpQkFBaUIsRUFBRSxNQUFNLENBQUMsT0FBTyxDQUFDLGVBQWUsQ0FBQzthQUNuRCxDQUFDLENBQUM7WUFDSCxzQkFBc0IsQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLEdBQUcsQ0FBQyxDQUFDO1lBQ3pDLE9BQU8sQ0FBQyxnQkFBZ0IsR0FBRyxPQUFPLENBQUM7WUFFbkMsT0FBTyxJQUFJLENBQUM7UUFDZCxDQUFDO1FBRUQsT0FBTyxDQUFDLEdBQUc7WUFDVCxXQUFXLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsQ0FBQztRQUVELHNCQUFzQixDQUFDLElBQUk7WUFDekIsaUJBQWlCLEVBQUUsQ0FBQztZQUNwQixJQUFJLFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDO2dCQUFFLE9BQU8sS0FBSyxDQUFDO1lBRXRDLElBQUksU0FBUyxDQUFDLElBQUksSUFBSSxlQUFlO2dCQUFFLE9BQU8sS0FBSyxDQUFDO1lBRXBELFNBQVMsQ0FBQyxHQUFHLENBQUMsSUFBSSxFQUFFLEdBQUcsRUFBRSxHQUFHLGtCQUFrQixHQUFHLElBQUksQ0FBQyxDQUFDO1lBRXZELE9BQU8sSUFBSSxDQUFDO1FBQ2QsQ0FBQztRQUVELHdCQUF3QixDQUFDLElBQUk7WUFDM0IsU0FBUyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN6QixDQUFDO1FBRUQsaUJBQWlCO1lBQ2YsaUJBQWlCLEVBQUUsQ0FBQztZQUVwQixPQUFPLFNBQVMsQ0FBQyxJQUFJLENBQUM7UUFDeEIsQ0FBQztLQUNGLENBQUM7QUFDSixDQUFDIn0=
|