@cogenta/auth 0.7.2 → 0.7.4
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/dist/audit.d.ts +32 -0
- package/dist/audit.d.ts.map +1 -1
- package/dist/audit.js +45 -1
- package/dist/audit.js.map +1 -1
- package/dist/credential-sealer.d.ts +9 -0
- package/dist/credential-sealer.d.ts.map +1 -0
- package/dist/credential-sealer.js +65 -0
- package/dist/credential-sealer.js.map +1 -0
- package/dist/credentials.d.ts +12 -1
- package/dist/credentials.d.ts.map +1 -1
- package/dist/credentials.js +81 -12
- package/dist/credentials.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/login.d.ts +16 -0
- package/dist/login.d.ts.map +1 -1
- package/dist/login.js +41 -12
- package/dist/login.js.map +1 -1
- package/dist/password.d.ts +8 -0
- package/dist/password.d.ts.map +1 -1
- package/dist/password.js +38 -9
- package/dist/password.js.map +1 -1
- package/dist/rate-limit.d.ts.map +1 -1
- package/dist/rate-limit.js +15 -0
- package/dist/rate-limit.js.map +1 -1
- package/dist/recovery-codes.js +2 -2
- package/dist/recovery-codes.js.map +1 -1
- package/dist/store.js +1 -1
- package/dist/store.js.map +1 -1
- package/dist/tables.d.ts +10 -0
- package/dist/tables.d.ts.map +1 -1
- package/dist/tables.js +21 -0
- package/dist/tables.js.map +1 -1
- package/dist/users.d.ts +8 -1
- package/dist/users.d.ts.map +1 -1
- package/dist/users.js +78 -13
- package/dist/users.js.map +1 -1
- package/package.json +4 -4
package/dist/login.js
CHANGED
|
@@ -137,6 +137,23 @@ function webauthnNotConfigured() {
|
|
|
137
137
|
hint: 'Set relyingPartyName, relyingPartyId and origin when creating the auth service.',
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
|
+
/**
|
|
141
|
+
* `AuthService.revokeSignInTickets` without a service — for a caller that has
|
|
142
|
+
* a database and no signing key, such as `cogenta users reset-password --token`.
|
|
143
|
+
*/
|
|
144
|
+
export async function revokeSignInTickets(db, userId) {
|
|
145
|
+
const tickets = identifier(TABLES.loginTickets, db.dialect);
|
|
146
|
+
await db.query(sql `delete from ${tickets} where user_id = ${userId}`);
|
|
147
|
+
}
|
|
148
|
+
/** An address short enough to be a rate-limit subject as it is; longer ones are hashed. */
|
|
149
|
+
const LIMITER_SUBJECT_MAX = 160;
|
|
150
|
+
function limiterSubject(subject) {
|
|
151
|
+
return subject.length <= LIMITER_SUBJECT_MAX
|
|
152
|
+
? subject
|
|
153
|
+
: `h:${createHash('sha256').update(subject).digest('base64url')}`;
|
|
154
|
+
}
|
|
155
|
+
/** The longest address that can exist (RFC 5321 section 4.5.3.1.3). */
|
|
156
|
+
export const MAX_EMAIL_LENGTH = 254;
|
|
140
157
|
export function createAuthService(options) {
|
|
141
158
|
// `options.collections` is deliberately not read here any more: since
|
|
142
159
|
// ADR-0021 the second-factor challenge follows what a person enrolled, not
|
|
@@ -146,7 +163,7 @@ export function createAuthService(options) {
|
|
|
146
163
|
const issuer = options.issuer ?? 'Cogenta';
|
|
147
164
|
const now = options.now ?? Date.now;
|
|
148
165
|
const users = createUserStore(db, now);
|
|
149
|
-
const credentials = createCredentialStore(db, now);
|
|
166
|
+
const credentials = createCredentialStore(db, now, { signingKey });
|
|
150
167
|
const sessions = createSessionStore(db, now);
|
|
151
168
|
const rateLimit = createRateLimiter(db, now);
|
|
152
169
|
const tickets = identifier(TABLES.loginTickets, db.dialect);
|
|
@@ -205,7 +222,7 @@ export function createAuthService(options) {
|
|
|
205
222
|
}
|
|
206
223
|
/** A change of second factor voids every sign-in step already in flight. */
|
|
207
224
|
async function revokeLoginTickets(userId) {
|
|
208
|
-
await db
|
|
225
|
+
await revokeSignInTickets(db, userId);
|
|
209
226
|
}
|
|
210
227
|
async function issueSession(user, context) {
|
|
211
228
|
const session = await sessions.create(user.id, {
|
|
@@ -271,6 +288,13 @@ export function createAuthService(options) {
|
|
|
271
288
|
availableFactors: available,
|
|
272
289
|
};
|
|
273
290
|
}
|
|
291
|
+
function invalidCredentials() {
|
|
292
|
+
return new CogentaError({
|
|
293
|
+
code: 'AUTH_INVALID_CREDENTIALS',
|
|
294
|
+
message: 'Incorrect email or password.',
|
|
295
|
+
hint: 'Check the email and password. Repeated failures are rate-limited.',
|
|
296
|
+
});
|
|
297
|
+
}
|
|
274
298
|
function accountGone() {
|
|
275
299
|
return new CogentaError({
|
|
276
300
|
code: 'AUTH_USER_NOT_FOUND',
|
|
@@ -297,13 +321,22 @@ export function createAuthService(options) {
|
|
|
297
321
|
}
|
|
298
322
|
return {
|
|
299
323
|
passwordLogin: async (email, password, context) => {
|
|
324
|
+
// No address is longer than 254 characters (RFC 5321), so nothing here
|
|
325
|
+
// can match one; refusing early keeps a megabyte-long "email" out of the
|
|
326
|
+
// limiter's table and the audit log, with the answer any other wrong
|
|
327
|
+
// credential gets.
|
|
328
|
+
if (email.length > MAX_EMAIL_LENGTH)
|
|
329
|
+
throw invalidCredentials();
|
|
300
330
|
const subject = email.trim().toLowerCase();
|
|
331
|
+
// The limiter's column is 255 characters wide and a scoped subject adds a
|
|
332
|
+
// place to the address; a long address is counted under its digest.
|
|
333
|
+
const limited = limiterSubject(subject);
|
|
301
334
|
if (context?.ip === undefined || context.ip === '') {
|
|
302
|
-
await rateLimit.reserve(
|
|
335
|
+
await rateLimit.reserve(limited);
|
|
303
336
|
}
|
|
304
337
|
else {
|
|
305
338
|
const place = `ip:${createHash('sha256').update(context.ip).digest('base64url').slice(0, 16)}`;
|
|
306
|
-
await rateLimit.reserveScoped(
|
|
339
|
+
await rateLimit.reserveScoped(limited, place, ACCOUNT_WIDE_SCALE);
|
|
307
340
|
}
|
|
308
341
|
const user = await users.byEmail(subject);
|
|
309
342
|
let valid = false;
|
|
@@ -311,14 +344,9 @@ export function createAuthService(options) {
|
|
|
311
344
|
await spendOnePasswordCheck(password);
|
|
312
345
|
else
|
|
313
346
|
valid = await credentials.verifyPassword(user.id, password);
|
|
314
|
-
if (!valid || user === null || user.status !== 'active')
|
|
315
|
-
throw
|
|
316
|
-
|
|
317
|
-
message: 'Incorrect email or password.',
|
|
318
|
-
hint: 'Check the email and password. Repeated failures are rate-limited.',
|
|
319
|
-
});
|
|
320
|
-
}
|
|
321
|
-
await rateLimit.clear(subject);
|
|
347
|
+
if (!valid || user === null || user.status !== 'active')
|
|
348
|
+
throw invalidCredentials();
|
|
349
|
+
await rateLimit.clear(limited);
|
|
322
350
|
// What decides the challenge is what this person enrolled, not what
|
|
323
351
|
// their role is (ADR-0021). A brand-new admin signs straight in; an
|
|
324
352
|
// account that turned TOTP on still has to produce a code, because
|
|
@@ -507,6 +535,7 @@ export function createAuthService(options) {
|
|
|
507
535
|
await credentials.removeRecoveryCodes(userId);
|
|
508
536
|
await revokeLoginTickets(userId);
|
|
509
537
|
},
|
|
538
|
+
revokeSignInTickets: revokeLoginTickets,
|
|
510
539
|
regenerateRecoveryCodes: async (userId) => {
|
|
511
540
|
const totp = await credentials.totpSecret(userId);
|
|
512
541
|
if (totp === null || !totp.verified) {
|
package/dist/login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../src/login.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../src/login.ts"],"names":[],"mappings":"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"}
|
package/dist/password.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
export declare function hashPassword(password: string): Promise<string>;
|
|
2
|
+
/** Hash for a random, high-entropy secret (a recovery code) — see `RECOVERY_SCRYPT_PARAMS`. Verifies with `verifyPassword`. */
|
|
3
|
+
export declare function hashRandomSecret(secret: string): Promise<string>;
|
|
2
4
|
/**
|
|
3
5
|
* Verifies a password against a stored hash.
|
|
4
6
|
*
|
|
@@ -8,4 +10,10 @@ export declare function hashPassword(password: string): Promise<string>;
|
|
|
8
10
|
* kind of wrong the guess was.
|
|
9
11
|
*/
|
|
10
12
|
export declare function verifyPassword(password: string, stored: string): Promise<boolean>;
|
|
13
|
+
/**
|
|
14
|
+
* True when `stored` is a well-formed hash written with weaker parameters than
|
|
15
|
+
* the current ones — the caller, holding the plaintext after a successful
|
|
16
|
+
* verification, should store `hashPassword(password)` in its place.
|
|
17
|
+
*/
|
|
18
|
+
export declare function needsRehash(stored: string): boolean;
|
|
11
19
|
//# sourceMappingURL=password.d.ts.map
|
package/dist/password.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../src/password.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../src/password.ts"],"names":[],"mappings":"AAyDA,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEpE;AAED,+HAA+H;AAC/H,wBAAsB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEtE;AAcD;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAYvF;AAED;;;;GAIG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAInD"}
|
package/dist/password.js
CHANGED
|
@@ -6,9 +6,9 @@ import { CogentaError } from '@cogenta/core';
|
|
|
6
6
|
function scrypt(password, salt, keyLength, params) {
|
|
7
7
|
return new Promise((resolve, reject) => {
|
|
8
8
|
// Node refuses to run scrypt above its default 32MB `maxmem` ceiling, and
|
|
9
|
-
// the
|
|
10
|
-
//
|
|
11
|
-
//
|
|
9
|
+
// the cost below (N=2^15, r=8) needs `128 * N * r` = exactly that many
|
|
10
|
+
// bytes before OpenSSL's own overhead — so the default clips it. Raise the
|
|
11
|
+
// ceiling instead of lowering the cost. `p` adds CPU, not memory.
|
|
12
12
|
const maxmem = 128 * params.N * params.r * 2;
|
|
13
13
|
scryptCallback(password, salt, keyLength, { ...params, maxmem }, (error, derived) => {
|
|
14
14
|
if (error)
|
|
@@ -27,19 +27,37 @@ function scrypt(password, salt, keyLength, params) {
|
|
|
27
27
|
*/
|
|
28
28
|
const KEY_LENGTH = 64;
|
|
29
29
|
const SALT_LENGTH = 16;
|
|
30
|
-
//
|
|
31
|
-
//
|
|
32
|
-
//
|
|
33
|
-
|
|
30
|
+
// OWASP's Password Storage Cheat Sheet lists, for scrypt, N=2^17,r=8,p=1 or
|
|
31
|
+
// N=2^16,r=8,p=2 or N=2^15,r=8,p=3 (and weaker ones as minimums). This is the
|
|
32
|
+
// last of them: the same 32 MiB per hash as before, three times the CPU. The
|
|
33
|
+
// 128 MiB profile was passed over on purpose — a login holds its memory for the
|
|
34
|
+
// whole derivation, and the target pods (512Mi-1Gi) and shared hosting cannot
|
|
35
|
+
// afford several concurrent logins at that size. Raised from p=1 (pentest
|
|
36
|
+
// 2026-11-01, AUTH-04; the old comment called p=1 the OWASP floor, which it is
|
|
37
|
+
// not); hashes written before keep verifying and are upgraded by `needsRehash`.
|
|
38
|
+
const SCRYPT_PARAMS = { N: 2 ** 15, r: 8, p: 3 };
|
|
39
|
+
// What a TOTP recovery code is hashed with: the cost passwords had before
|
|
40
|
+
// AUTH-04. A recovery code is 50 random bits, not something a person chose, so
|
|
41
|
+
// offline guessing is bounded by its entropy and a heavier KDF buys little;
|
|
42
|
+
// and checking one means hashing against every unused code (ten), so tripling
|
|
43
|
+
// the cost would triple the sign-in latency for nothing.
|
|
44
|
+
const RECOVERY_SCRYPT_PARAMS = { N: 2 ** 15, r: 8, p: 1 };
|
|
34
45
|
const MAX_INPUT_LENGTH = 512;
|
|
35
46
|
export async function hashPassword(password) {
|
|
47
|
+
return hashWith(password, SCRYPT_PARAMS);
|
|
48
|
+
}
|
|
49
|
+
/** Hash for a random, high-entropy secret (a recovery code) — see `RECOVERY_SCRYPT_PARAMS`. Verifies with `verifyPassword`. */
|
|
50
|
+
export async function hashRandomSecret(secret) {
|
|
51
|
+
return hashWith(secret, RECOVERY_SCRYPT_PARAMS);
|
|
52
|
+
}
|
|
53
|
+
async function hashWith(password, params) {
|
|
36
54
|
assertLength(password);
|
|
37
55
|
const salt = randomBytes(SALT_LENGTH);
|
|
38
|
-
const derived = await scrypt(password.normalize('NFKC'), salt, KEY_LENGTH,
|
|
56
|
+
const derived = await scrypt(password.normalize('NFKC'), salt, KEY_LENGTH, params);
|
|
39
57
|
// Parameters travel with the hash, the way bcrypt embeds its cost factor.
|
|
40
58
|
// Raising SCRYPT_PARAMS later must not invalidate every password already
|
|
41
59
|
// stored — it invalidates none, because each hash carries what made it.
|
|
42
|
-
const { N, r, p } =
|
|
60
|
+
const { N, r, p } = params;
|
|
43
61
|
return `scrypt$${N}$${r}$${p}$${salt.toString('base64url')}$${derived.toString('base64url')}`;
|
|
44
62
|
}
|
|
45
63
|
/**
|
|
@@ -63,6 +81,17 @@ export async function verifyPassword(password, stored) {
|
|
|
63
81
|
});
|
|
64
82
|
return derived.length === parsed.expected.length && timingSafeEqual(derived, parsed.expected);
|
|
65
83
|
}
|
|
84
|
+
/**
|
|
85
|
+
* True when `stored` is a well-formed hash written with weaker parameters than
|
|
86
|
+
* the current ones — the caller, holding the plaintext after a successful
|
|
87
|
+
* verification, should store `hashPassword(password)` in its place.
|
|
88
|
+
*/
|
|
89
|
+
export function needsRehash(stored) {
|
|
90
|
+
const parsed = parseHash(stored);
|
|
91
|
+
if (parsed === null)
|
|
92
|
+
return false;
|
|
93
|
+
return parsed.N < SCRYPT_PARAMS.N || parsed.r < SCRYPT_PARAMS.r || parsed.p < SCRYPT_PARAMS.p;
|
|
94
|
+
}
|
|
66
95
|
function parseHash(stored) {
|
|
67
96
|
const parts = stored.split('$');
|
|
68
97
|
if (parts.length !== 6 || parts[0] !== 'scrypt')
|
package/dist/password.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password.js","sourceRoot":"","sources":["../src/password.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,IAAI,cAAc,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AACpF,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAQ5C,4EAA4E;AAC5E,4EAA4E;AAC5E,2EAA2E;AAC3E,SAAS,MAAM,CACb,QAAgB,EAChB,IAAY,EACZ,SAAiB,EACjB,MAAoB;IAEpB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,0EAA0E;QAC1E,
|
|
1
|
+
{"version":3,"file":"password.js","sourceRoot":"","sources":["../src/password.ts"],"names":[],"mappings":"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"}
|
package/dist/rate-limit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAMpB,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"rate-limit.d.ts","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAMpB,MAAM,eAAe,CAAA;AAmBtB,4FAA4F;AAC5F,eAAO,MAAM,uBAAuB,QAAY,CAAA;AAKhD;;;;;;;GAOG;AACH,MAAM,WAAW,mBAAmB;IAClC,uFAAuF;IACvF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACvB,+DAA+D;IAC/D,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,yEAAyE;IACzE,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACtC;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACvC;;;;;;;OAOG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAClF,iHAAiH;IACjH,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACrC;;;;;;;;OAQG;IACH,cAAc,CAAC,OAAO,CAAC,EAAE;QACvB,iFAAiF;QACjF,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAA;QAC7B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KACxB,GAAG,OAAO,CAAC,SAAS,mBAAmB,EAAE,CAAC,CAAA;CAC5C;AAOD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,GAAE,MAAM,MAAiB,GAAG,WAAW,CA6M/F"}
|
package/dist/rate-limit.js
CHANGED
|
@@ -12,6 +12,8 @@ import { TABLES } from './tables.js';
|
|
|
12
12
|
*/
|
|
13
13
|
const WINDOW_MS = 15 * 60 * 1000;
|
|
14
14
|
const ATTEMPTS_BEFORE_REFUSAL = 5;
|
|
15
|
+
/** How often a write sweeps the rows that have left the window. */
|
|
16
|
+
const PRUNE_INTERVAL_MS = 60 * 1000;
|
|
15
17
|
/** How long failed attempts keep counting. Exported so a reader shares the exact window. */
|
|
16
18
|
export const LOGIN_ATTEMPT_WINDOW_MS = WINDOW_MS;
|
|
17
19
|
/** The number of attempts past which a subject is being backed off at all. */
|
|
@@ -93,7 +95,20 @@ export function createRateLimiter(db, now = Date.now) {
|
|
|
93
95
|
and (subject = ${account} or subject like ${scopedPattern(account)} escape '!')
|
|
94
96
|
order by at asc limit ${sqlLimit(1)} offset ${sqlLimit(offset)}`);
|
|
95
97
|
}
|
|
98
|
+
// Failures older than the window can never change an answer, and a script
|
|
99
|
+
// that never signs in successfully is never `clear`ed, so each write checks
|
|
100
|
+
// — at most once a minute per process — whether anything has aged out.
|
|
101
|
+
let lastPrunedAt = 0;
|
|
102
|
+
async function pruneExpired() {
|
|
103
|
+
const at = now();
|
|
104
|
+
if (at - lastPrunedAt < PRUNE_INTERVAL_MS)
|
|
105
|
+
return;
|
|
106
|
+
lastPrunedAt = at;
|
|
107
|
+
const since = new Date(at - WINDOW_MS).toISOString();
|
|
108
|
+
await db.query(sql `delete from ${table} where at < ${since}`).catch(() => undefined);
|
|
109
|
+
}
|
|
96
110
|
async function insertAttempt(subject) {
|
|
111
|
+
await pruneExpired();
|
|
97
112
|
await db.query(sql `
|
|
98
113
|
insert into ${table} (id, subject, at) values (${newId(now)}, ${subject}, ${new Date(now()).toISOString()})`);
|
|
99
114
|
}
|
package/dist/rate-limit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"rate-limit.js","sourceRoot":"","sources":["../src/rate-limit.ts"],"names":[],"mappings":"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"}
|
package/dist/recovery-codes.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomInt } from 'node:crypto';
|
|
2
|
-
import {
|
|
2
|
+
import { hashRandomSecret, verifyPassword } from './password.js';
|
|
3
3
|
/**
|
|
4
4
|
* TOTP recovery codes (fiche 18 task 1) — the way back in for an account that
|
|
5
5
|
* enrolled a second factor and then lost the device that produces it.
|
|
@@ -48,7 +48,7 @@ export function normaliseRecoveryCode(input) {
|
|
|
48
48
|
.replace(/[^A-Z0-9]/gu, '');
|
|
49
49
|
}
|
|
50
50
|
export function hashRecoveryCode(code) {
|
|
51
|
-
return
|
|
51
|
+
return hashRandomSecret(normaliseRecoveryCode(code));
|
|
52
52
|
}
|
|
53
53
|
export function verifyRecoveryCode(code, hash) {
|
|
54
54
|
return verifyPassword(normaliseRecoveryCode(code), hash);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recovery-codes.js","sourceRoot":"","sources":["../src/recovery-codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"recovery-codes.js","sourceRoot":"","sources":["../src/recovery-codes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAEhE;;;;;;;;;;;GAWG;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,EAAE,CAAA;AAErC,8EAA8E;AAC9E,8DAA8D;AAC9D,MAAM,aAAa,GAAG,kCAAkC,CAAA;AACxD,MAAM,YAAY,GAAG,CAAC,CAAA;AAEtB,SAAS,WAAW;IAClB,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,KAAK,IAAI,aAAa,CAAC,SAAS,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAA;IACzD,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,yGAAyG;AACzG,SAAS,UAAU;IACjB,OAAO,GAAG,WAAW,EAAE,IAAI,WAAW,EAAE,EAAE,CAAA;AAC5C,CAAC;AAED,qHAAqH;AACrH,MAAM,UAAU,qBAAqB,CAAC,KAAK,GAAW,mBAAmB;IACvE,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAA;IAC/B,OAAO,KAAK,CAAC,IAAI,GAAG,KAAK;QAAE,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;IAClD,OAAO,CAAC,GAAG,KAAK,CAAC,CAAA;AACnB,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,KAAa;IACjD,OAAO,KAAK;SACT,IAAI,EAAE;SACN,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,OAAO,gBAAgB,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,IAAY;IAC3D,OAAO,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAA;AAC1D,CAAC"}
|
package/dist/store.js
CHANGED
|
@@ -14,7 +14,7 @@ export async function createAuthStore(options) {
|
|
|
14
14
|
const audit = createAuditLog(options.db, now);
|
|
15
15
|
return {
|
|
16
16
|
users: createUserStore(options.db, now),
|
|
17
|
-
credentials: createCredentialStore(options.db, now),
|
|
17
|
+
credentials: createCredentialStore(options.db, now, { signingKey: options.signingKey }),
|
|
18
18
|
sessions: createSessionStore(options.db, now),
|
|
19
19
|
audit,
|
|
20
20
|
auditIntegrity: createAuditIntegrityStore(options.db, audit, { now }),
|
package/dist/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AA6B5C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAyB;IAC7D,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAClC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAA;IACnC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAE7C,OAAO;QACL,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;QACvC,WAAW,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../src/store.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAC3C,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAA;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAA;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AA6B5C,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAyB;IAC7D,MAAM,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;IAClC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG,CAAA;IACnC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC,CAAA;IAE7C,OAAO;QACL,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;QACvC,WAAW,EAAE,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;QACvF,QAAQ,EAAE,kBAAkB,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;QAC7C,KAAK;QACL,cAAc,EAAE,yBAAyB,CAAC,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;QACrE,SAAS,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;QAC7C,MAAM,EAAE,wBAAwB,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;QACjD,OAAO,EAAE,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,GAAG,CAAC;QAC3C,KAAK,EAAE,iBAAiB,CAAC;YACvB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,GAAG;YACH,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC;YACnE,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC;SAC1E,CAAC;KACH,CAAA;AACH,CAAC"}
|
package/dist/tables.d.ts
CHANGED
|
@@ -31,7 +31,17 @@ export declare const TABLES: {
|
|
|
31
31
|
* spent yet. Owned by `login.ts`.
|
|
32
32
|
*/
|
|
33
33
|
readonly loginTickets: 'cogenta_login_tickets';
|
|
34
|
+
/**
|
|
35
|
+
* Pentest 2026-11-01 AUTH-02: named single-row locks. Writing a row is the
|
|
36
|
+
* one way to serialise a read-decide-write across concurrent transactions on
|
|
37
|
+
* all three dialects (SQLite's write lock, a row lock on Postgres and MySQL),
|
|
38
|
+
* which is how "keep one active admin" holds when two changes are in flight.
|
|
39
|
+
* Owned by `users.ts`.
|
|
40
|
+
*/
|
|
41
|
+
readonly authLocks: 'cogenta_auth_locks';
|
|
34
42
|
};
|
|
43
|
+
/** The lock every change that could remove an active admin takes first. */
|
|
44
|
+
export declare const ADMIN_GUARD_LOCK = "admin-guard";
|
|
35
45
|
/**
|
|
36
46
|
* Every table this package owns.
|
|
37
47
|
*
|
package/dist/tables.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAKpB,MAAM,eAAe,CAAA;AAEtB,eAAO,MAAM,MAAM;aACjB,KAAK,EAAE,eAAe;aACtB,WAAW,EAAE,qBAAqB;aAClC,QAAQ,EAAE,kBAAkB;aAC5B,aAAa,EAAE,wBAAwB;aACvC,cAAc,EAAE,yBAAyB;aACzC,QAAQ,EAAE,mBAAmB;aAC7B,OAAO,EAAE,kBAAkB;IAC3B,oFAAoF;aACpF,WAAW,EAAE,uBAAuB;IACpC;;;;;;;OAOG;aACH,YAAY,EAAE,uBAAuB;IACrC;;;;OAIG;aACH,cAAc,EAAE,yBAAyB;IACzC;;;;;OAKG;aACH,YAAY,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,cAAc,EAKpB,MAAM,eAAe,CAAA;AAEtB,eAAO,MAAM,MAAM;aACjB,KAAK,EAAE,eAAe;aACtB,WAAW,EAAE,qBAAqB;aAClC,QAAQ,EAAE,kBAAkB;aAC5B,aAAa,EAAE,wBAAwB;aACvC,cAAc,EAAE,yBAAyB;aACzC,QAAQ,EAAE,mBAAmB;aAC7B,OAAO,EAAE,kBAAkB;IAC3B,oFAAoF;aACpF,WAAW,EAAE,uBAAuB;IACpC;;;;;;;OAOG;aACH,YAAY,EAAE,uBAAuB;IACrC;;;;OAIG;aACH,cAAc,EAAE,yBAAyB;IACzC;;;;;OAKG;aACH,YAAY,EAAE,uBAAuB;IACrC;;;;;;OAMG;aACH,SAAS,EAAE,oBAAoB;CACvB,CAAA;AAEV,2EAA2E;AAC3E,eAAO,MAAM,gBAAgB,gBAAgB,CAAA;AAW7C;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CAAC,EAAE,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAwQxE"}
|
package/dist/tables.js
CHANGED
|
@@ -31,7 +31,17 @@ export const TABLES = {
|
|
|
31
31
|
* spent yet. Owned by `login.ts`.
|
|
32
32
|
*/
|
|
33
33
|
loginTickets: 'cogenta_login_tickets',
|
|
34
|
+
/**
|
|
35
|
+
* Pentest 2026-11-01 AUTH-02: named single-row locks. Writing a row is the
|
|
36
|
+
* one way to serialise a read-decide-write across concurrent transactions on
|
|
37
|
+
* all three dialects (SQLite's write lock, a row lock on Postgres and MySQL),
|
|
38
|
+
* which is how "keep one active admin" holds when two changes are in flight.
|
|
39
|
+
* Owned by `users.ts`.
|
|
40
|
+
*/
|
|
41
|
+
authLocks: 'cogenta_auth_locks',
|
|
34
42
|
};
|
|
43
|
+
/** The lock every change that could remove an active admin takes first. */
|
|
44
|
+
export const ADMIN_GUARD_LOCK = 'admin-guard';
|
|
35
45
|
/** `varchar` on Postgres/MySQL, `text` on SQLite — encapsulated once, here. */
|
|
36
46
|
function textColumn(dialect, length) {
|
|
37
47
|
return unsafeRaw(dialect === 'sqlite' ? 'text' : `varchar(${length})`);
|
|
@@ -59,6 +69,7 @@ export async function ensureAuthTables(db) {
|
|
|
59
69
|
const auditGenesis = identifier(TABLES.auditGenesis, d);
|
|
60
70
|
const auditIntegrity = identifier(TABLES.auditIntegrity, d);
|
|
61
71
|
const loginTickets = identifier(TABLES.loginTickets, d);
|
|
72
|
+
const authLocks = identifier(TABLES.authLocks, d);
|
|
62
73
|
const t512 = textColumn(d, 512);
|
|
63
74
|
const t255 = textColumn(d, 255);
|
|
64
75
|
const t64 = textColumn(d, 64);
|
|
@@ -255,6 +266,16 @@ export async function ensureAuthTables(db) {
|
|
|
255
266
|
used_at ${t64}
|
|
256
267
|
)`);
|
|
257
268
|
await createIndexIfMissing(db, 'cogenta_login_tickets_user', loginTickets, sql `(user_id)`);
|
|
269
|
+
// Pentest 2026-11-01 AUTH-02: one row per named lock, seeded once. Additive;
|
|
270
|
+
// rolling back is `drop table`.
|
|
271
|
+
await db.query(sql `
|
|
272
|
+
create table if not exists ${authLocks} (
|
|
273
|
+
id ${t64} not null primary key,
|
|
274
|
+
counter integer not null
|
|
275
|
+
)`);
|
|
276
|
+
await db
|
|
277
|
+
.query(sql `insert into ${authLocks} (id, counter) values (${ADMIN_GUARD_LOCK}, ${0})`)
|
|
278
|
+
.catch(() => undefined); // already seeded
|
|
258
279
|
// Session device metadata (fiche 18 task 2): additive for a database that
|
|
259
280
|
// already had this table before this fiche — there is no portable "add
|
|
260
281
|
// column if not exists", so the failure this swallows is exactly "already
|
package/dist/tables.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EAEV,GAAG,EACH,SAAS,GACV,MAAM,eAAe,CAAA;AAEtB,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,KAAK,EAAE,eAAe;IACtB,WAAW,EAAE,qBAAqB;IAClC,QAAQ,EAAE,kBAAkB;IAC5B,aAAa,EAAE,wBAAwB;IACvC,cAAc,EAAE,yBAAyB;IACzC,QAAQ,EAAE,mBAAmB;IAC7B,OAAO,EAAE,kBAAkB;IAC3B,oFAAoF;IACpF,WAAW,EAAE,uBAAuB;IACpC;;;;;;;OAOG;IACH,YAAY,EAAE,uBAAuB;IACrC;;;;OAIG;IACH,cAAc,EAAE,yBAAyB;IACzC;;;;;OAKG;IACH,YAAY,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"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"}
|
package/dist/users.d.ts
CHANGED
|
@@ -4,7 +4,14 @@ export interface UserStore {
|
|
|
4
4
|
create(input: CreateUserInput): Promise<User>;
|
|
5
5
|
byEmail(email: string): Promise<User | null>;
|
|
6
6
|
byId(id: string): Promise<User | null>;
|
|
7
|
+
/**
|
|
8
|
+
* Throws `FORBIDDEN`, having written nothing, when this would leave the site
|
|
9
|
+
* with no active admin — the check and the write share one serialised
|
|
10
|
+
* transaction (see `guardedChange`), so two simultaneous changes cannot each
|
|
11
|
+
* see the other admin still standing.
|
|
12
|
+
*/
|
|
7
13
|
setRoles(id: string, roles: readonly string[]): Promise<void>;
|
|
14
|
+
/** Same last-admin guarantee as `setRoles`. Leaving `disabled` or `invited` for `active` never takes it. */
|
|
8
15
|
setStatus(id: string, status: User['status']): Promise<void>;
|
|
9
16
|
list(): Promise<readonly User[]>;
|
|
10
17
|
/** Self-service profile fields (fiche 17 task 3) — see `UpdateProfileInput`'s doc comment. */
|
|
@@ -27,7 +34,7 @@ export interface UserStore {
|
|
|
27
34
|
* the original email is never stored anywhere, hashed or otherwise — there
|
|
28
35
|
* is nothing left in this table (or this process) that could reconstruct
|
|
29
36
|
* it. Returns the updated row so the caller can build one response instead
|
|
30
|
-
* of anonymizing and then re-reading.
|
|
37
|
+
* of anonymizing and then re-reading. Same last-admin guarantee as `setRoles`.
|
|
31
38
|
*/
|
|
32
39
|
anonymize(id: string): Promise<User>;
|
|
33
40
|
}
|
package/dist/users.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,cAAc,EAMpB,MAAM,eAAe,CAAA;AAEtB,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AA8C3E,MAAM,WAAW,SAAS;IACxB,MAAM,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7C,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IAC5C,IAAI,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IACtC;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC7D,4GAA4G;IAC5G,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IAC5D,IAAI,IAAI,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;IAChC,8FAA8F;IAC9F,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACnE;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;IACjC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CACrC;AAcD,wBAAgB,eAAe,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,GAAE,MAAM,MAAiB,GAAG,SAAS,CAoM3F"}
|