@allodium/auth 0.2.0 → 0.3.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 +62 -6
- package/dist/grants.d.ts.map +1 -1
- package/dist/grants.js +36 -20
- package/dist/grants.js.map +1 -1
- package/dist/routes.d.ts +28 -1
- package/dist/routes.d.ts.map +1 -1
- package/dist/routes.js +70 -5
- package/dist/routes.js.map +1 -1
- package/dist/sessions.d.ts +19 -2
- package/dist/sessions.d.ts.map +1 -1
- package/dist/sessions.js +31 -23
- package/dist/sessions.js.map +1 -1
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -26,6 +26,8 @@ Requires Node 20+ and PostgreSQL.
|
|
|
26
26
|
| **Cookies** | `createSessionCookies` — the access/refresh/CSRF triple, with Domain-correct clearing (the bug where a cookie "won't delete" is almost always this). |
|
|
27
27
|
| **Reset tokens** | `createResetTokens` — stateless HMAC, keyed partly on the user's *current* password hash, so a successful reset invalidates every outstanding token with no bookkeeping. |
|
|
28
28
|
| **Rate limiting** | `createRateLimiter` — sliding window, in-process, fail-open. |
|
|
29
|
+
| **Routes** | `createAuthRoutes` — login, logout, refresh and me as Web `Request → Response` handlers, with the details that are easy to get wrong already right. |
|
|
30
|
+
| **Grants** | `createAccessPolicy` / `createGrantLoader` — role × table × action, with optional row filters (`customer_id = $actor.customerId`). What `@allodium/admin` enforces. |
|
|
29
31
|
| **[Act as](../../docs/act-as.md)** | `createActAs` — resolve the app as another user for testing and support, without replacing your session. |
|
|
30
32
|
|
|
31
33
|
## Sessions in one screen
|
|
@@ -35,19 +37,71 @@ import { createSessionStore, createSessionCookies } from '@allodium/auth';
|
|
|
35
37
|
|
|
36
38
|
export const sessions = createSessionStore({
|
|
37
39
|
db, // your Drizzle instance
|
|
38
|
-
|
|
40
|
+
sessions: sessionsTable, // your sessions table — the shape is in sessions.ts
|
|
39
41
|
users: usersTable,
|
|
42
|
+
accessPrefix: 'app_at_', // how these tokens are recognised; unique to your app
|
|
43
|
+
refreshPrefix: 'app_rt_',
|
|
40
44
|
isUserActive: (u) => u.status === 'active',
|
|
41
45
|
});
|
|
42
46
|
|
|
43
|
-
const minted = await sessions.mint(user.id,
|
|
44
|
-
const who = await sessions.
|
|
45
|
-
const next = await sessions.
|
|
47
|
+
const minted = await sessions.mint({ userId: user.id, origin: 'web' });
|
|
48
|
+
const who = await sessions.resolveUser(accessToken, { origin: { equals: 'web' } });
|
|
49
|
+
const next = await sessions.rotate(refreshToken, { origin: { equals: 'web' } }); // single-use; races have one winner
|
|
50
|
+
await sessions.revoke({ accessToken, refreshToken }); // logout: by either token
|
|
46
51
|
```
|
|
47
52
|
|
|
48
53
|
The refresh rotation consumes the old token in the same statement that issues the new
|
|
49
54
|
one, so two tabs refreshing simultaneously produce exactly one winner rather than two
|
|
50
|
-
valid sessions or zero.
|
|
55
|
+
valid sessions or zero. Rotation also refuses a session whose user is no longer active
|
|
56
|
+
and, when scoped, one minted for another surface — a suspended account cannot keep its
|
|
57
|
+
session alive by refreshing. Revocation matches **either** token, because after a
|
|
58
|
+
rotation in another tab the access cookie is stale while the refresh cookie is live, and
|
|
59
|
+
revoking by the first one found would delete nothing.
|
|
60
|
+
|
|
61
|
+
## The four routes
|
|
62
|
+
|
|
63
|
+
```ts
|
|
64
|
+
import { createAuthRoutes, createRateLimiter, readCookie, PUBLIC_ACTOR } from '@allodium/auth';
|
|
65
|
+
|
|
66
|
+
export const auth = createAuthRoutes({
|
|
67
|
+
sessions,
|
|
68
|
+
cookies: createSessionCookies({ names: { access: 'at', refresh: 'rt', expires: 'exp' }, maxAgeSec: 7 * 86400, secure: true }),
|
|
69
|
+
origin: 'web', // the surface these sessions belong to
|
|
70
|
+
findUserByEmail: (email) => /* { id, passwordHash, status } | null */,
|
|
71
|
+
toPublicUser: (row) => ({ id: row.id, email: row.email }), // REQUIRED: what /me may say
|
|
72
|
+
actorFor: (id) => grants.actorFor(id, claims), // optional: roles + claims on /me
|
|
73
|
+
rateLimit: createRateLimiter(),
|
|
74
|
+
allowOrigins: ['https://app.example.com'], // omit for same-origin
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
// Next.js: app/api/auth/[action]/route.ts → auth.login(req) / auth.logout(req) / auth.refresh(req) / auth.me(req)
|
|
78
|
+
```
|
|
79
|
+
|
|
80
|
+
What they get right so you do not have to: a wrong password and an unknown email answer
|
|
81
|
+
identically, in the same time; `/me` returns only what `toPublicUser` says; a lost
|
|
82
|
+
refresh race does not clear the winner's cookies; logout clears cookies only once the
|
|
83
|
+
session is actually gone (a 500 with cookies intact otherwise); and a POST from an origin
|
|
84
|
+
that is neither this host nor allowlisted, or with a body not typed as JSON, is refused
|
|
85
|
+
— CORS headers say who may read a response, not who may send a request.
|
|
86
|
+
|
|
87
|
+
## Grants
|
|
88
|
+
|
|
89
|
+
```ts
|
|
90
|
+
const grants = createGrantLoader(pool); // reads roles / user_roles / role_permissions
|
|
91
|
+
const policy = await grants.policy(); // cached 30 s; grants.refresh() after editing
|
|
92
|
+
const actor = await grants.actorFor(userId, { customerId: 42 });
|
|
93
|
+
|
|
94
|
+
policy.can(actor, 'orders', 'read');
|
|
95
|
+
// → { allowed: true, scope: [{ column: 'customer_id', op: 'eq', value: 42 }], reason: '…' }
|
|
96
|
+
policy.can(PUBLIC_ACTOR, 'orders', 'read');
|
|
97
|
+
// → { allowed: false, scope: [], reason: 'no grant for read on orders (holding: public)' }
|
|
98
|
+
```
|
|
99
|
+
|
|
100
|
+
A `row_filter` on a grant is a JSON array of predicates; `$actor.<claim>` substitutes a
|
|
101
|
+
claim the app supplied, and a missing claim **denies**. So does a filter that cannot be
|
|
102
|
+
read — `{}` where `[]` was meant — which refuses the whole grant rather than quietly
|
|
103
|
+
widening it to every row. `policy.problems` lists what was refused and why. A
|
|
104
|
+
`super_admin` role bypasses the model by name and holds no rows.
|
|
51
105
|
|
|
52
106
|
## Act as (user switching)
|
|
53
107
|
|
|
@@ -91,8 +145,10 @@ and tested.
|
|
|
91
145
|
## Testing
|
|
92
146
|
|
|
93
147
|
```bash
|
|
94
|
-
|
|
148
|
+
npm test -w packages/auth # the whole battery; the database-backed files skip without DATABASE_URL
|
|
149
|
+
node packages/auth/test/integration.mjs # sessions, needs DATABASE_URL
|
|
95
150
|
node packages/auth/test/act-as.mjs # 42 checks, no database needed
|
|
151
|
+
node packages/auth/test/loader.mjs # the grant loader fails closed, no database needed
|
|
96
152
|
```
|
|
97
153
|
|
|
98
154
|
The integration battery runs against a real PostgreSQL because that is where the
|
package/dist/grants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grants.d.ts","sourceRoot":"","sources":["../src/grants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,YAAY,EAAE,KAAK,KAAK,EAAE,KAAK,KAAK,EAAuB,MAAM,aAAa,CAAC;AAEjH;;;;;;;;;;;;;GAaG;AAEH,uFAAuF;AACvF,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAChG;AAED,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kEAAkE;IAClE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,wDAAwD;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,0BAA0B;IAC1B,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3B,wCAAwC;IACxC,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAChC,2FAA2F;IAC3F,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC3E,sDAAsD;IACtD,OAAO,IAAI,IAAI,CAAC;CACjB;
|
|
1
|
+
{"version":3,"file":"grants.d.ts","sourceRoot":"","sources":["../src/grants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,KAAK,YAAY,EAAE,KAAK,KAAK,EAAE,KAAK,KAAK,EAAuB,MAAM,aAAa,CAAC;AAEjH;;;;;;;;;;;;;GAaG;AAEH,uFAAuF;AACvF,MAAM,WAAW,SAAS;IACxB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAAE,IAAI,EAAE,OAAO,EAAE,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC;CAChG;AAED,MAAM,WAAW,kBAAkB;IACjC,gEAAgE;IAChE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kEAAkE;IAClE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,wDAAwD;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,WAAW;IAC1B,0BAA0B;IAC1B,MAAM,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAC3B,wCAAwC;IACxC,MAAM,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAChC,2FAA2F;IAC3F,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C;;;;;OAKG;IACH,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC3E,sDAAsD;IACtD,OAAO,IAAI,IAAI,CAAC;CACjB;AAyCD,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,GAAE,kBAAuB,GAAG,WAAW,CAiE3F"}
|
package/dist/grants.js
CHANGED
|
@@ -1,23 +1,33 @@
|
|
|
1
1
|
import { createAccessPolicy } from './access.js';
|
|
2
2
|
const ident = (n) => '"' + n.replaceAll('"', '""') + '"';
|
|
3
|
-
/**
|
|
3
|
+
/**
|
|
4
|
+
* row_filter arrives as jsonb. Null or an empty array means every row; anything
|
|
5
|
+
* else must be an array of predicates that each name a column.
|
|
6
|
+
*
|
|
7
|
+
* A filter that cannot be read FAILS CLOSED: the whole grant is refused, not
|
|
8
|
+
* widened. The alternative — keep the grant and drop the filter — turns "the
|
|
9
|
+
* public may read published posts" into "the public may read every post" the
|
|
10
|
+
* moment somebody saves `{}` instead of `[]`, with nothing but a log line to say
|
|
11
|
+
* so. That is the failure mode row-level rules exist to prevent, and it is not
|
|
12
|
+
* one a warning is allowed to stand in for.
|
|
13
|
+
*/
|
|
4
14
|
function parseFilter(raw, where, problems) {
|
|
5
15
|
if (raw === null || raw === undefined)
|
|
6
|
-
return
|
|
16
|
+
return { ok: true };
|
|
7
17
|
const value = typeof raw === 'string' ? safeParse(raw) : raw;
|
|
8
18
|
if (!Array.isArray(value)) {
|
|
9
|
-
problems.push(`${where}: row_filter is not an array of predicates —
|
|
10
|
-
return
|
|
19
|
+
problems.push(`${where}: row_filter is not an array of predicates — this grant is REFUSED until it is fixed.`);
|
|
20
|
+
return { ok: false };
|
|
11
21
|
}
|
|
12
22
|
const out = [];
|
|
13
23
|
for (const p of value) {
|
|
14
|
-
if (!p || typeof p !== 'object' || typeof p.column !== 'string') {
|
|
15
|
-
problems.push(`${where}: a row_filter entry has no "column" —
|
|
16
|
-
|
|
24
|
+
if (!p || typeof p !== 'object' || typeof p.column !== 'string' || !p.column.trim()) {
|
|
25
|
+
problems.push(`${where}: a row_filter entry has no "column" — this grant is REFUSED until it is fixed.`);
|
|
26
|
+
return { ok: false };
|
|
17
27
|
}
|
|
18
28
|
out.push(p);
|
|
19
29
|
}
|
|
20
|
-
return out.length ? out :
|
|
30
|
+
return out.length ? { ok: true, filter: out } : { ok: true };
|
|
21
31
|
}
|
|
22
32
|
function safeParse(s) {
|
|
23
33
|
try {
|
|
@@ -43,18 +53,24 @@ export function createGrantLoader(db, opts = {}) {
|
|
|
43
53
|
join ${ident(rolesTable)} r on r.id = g.role_id
|
|
44
54
|
order by r.key, g.table_name`);
|
|
45
55
|
const problems = [];
|
|
46
|
-
const grants =
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
56
|
+
const grants = [];
|
|
57
|
+
for (const row of res.rows) {
|
|
58
|
+
const parsed = parseFilter(row.row_filter, `${row.role} on ${row.table_name}`, problems);
|
|
59
|
+
// A grant whose filter cannot be honoured is not loaded at all. With no
|
|
60
|
+
// grant, the policy denies — the same answer as if the row did not exist,
|
|
61
|
+
// which is the only safe reading of a row that cannot be understood.
|
|
62
|
+
if (!parsed.ok)
|
|
63
|
+
continue;
|
|
64
|
+
grants.push({
|
|
65
|
+
role: String(row.role),
|
|
66
|
+
table: String(row.table_name),
|
|
67
|
+
create: !!row.can_create,
|
|
68
|
+
read: !!row.can_read,
|
|
69
|
+
update: !!row.can_update,
|
|
70
|
+
delete: !!row.can_delete,
|
|
71
|
+
...(parsed.filter ? { rowFilter: parsed.filter } : {}),
|
|
72
|
+
});
|
|
73
|
+
}
|
|
58
74
|
cache = { at: Date.now(), grants, problems };
|
|
59
75
|
return cache;
|
|
60
76
|
}
|
package/dist/grants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grants.js","sourceRoot":"","sources":["../src/grants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAkE,MAAM,aAAa,CAAC;AAqDjH,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC;AAEjE
|
|
1
|
+
{"version":3,"file":"grants.js","sourceRoot":"","sources":["../src/grants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAkE,MAAM,aAAa,CAAC;AAqDjH,MAAM,KAAK,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC;AAEjE;;;;;;;;;;GAUG;AACH,SAAS,WAAW,CAAC,GAAY,EAAE,KAAa,EAAE,QAAkB;IAClE,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS;QAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IAC3D,MAAM,KAAK,GAAG,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,uFAAuF,CAAC,CAAC;QAC/G,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;IACD,MAAM,GAAG,GAAqB,EAAE,CAAC;IACjC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAQ,CAAoB,CAAC,MAAM,KAAK,QAAQ,IAAI,CAAE,CAAoB,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;YAC5H,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,iFAAiF,CAAC,CAAC;YACzG,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;QACvB,CAAC;QACD,GAAG,CAAC,IAAI,CAAC,CAAmB,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;AAC/D,CAAC;AAED,SAAS,SAAS,CAAC,CAAS;IAC1B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,EAAa,EAAE,OAA2B,EAAE;IAC5E,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,OAAO,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,kBAAkB,CAAC;IAC3D,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,YAAY,CAAC;IAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC;IAEjC,IAAI,KAAK,GAA+D,IAAI,CAAC;IAE7E,KAAK,UAAU,IAAI;QACjB,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,EAAE,GAAG,GAAG;YAAE,OAAO,KAAK,CAAC;QACvD,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,KAAK,CACxB;gBACU,CAAA,8DAA+D,EAAE;;gBAEjE,KAAK,CAAC,WAAW,CAAC;gBAClB,KAAK,CAAC,UAAU,CAAC;qCACI,CAChC,CAAC;QACF,MAAM,QAAQ,GAAa,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAY,EAAE,CAAC;QAC3B,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,IAAiC,EAAE,CAAC;YACxD,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,GAAG,CAAC,IAAI,OAAO,GAAG,CAAC,UAAU,EAAE,EAAE,QAAQ,CAAC,CAAC;YACzF,wEAAwE;YACxE,0EAA0E;YAC1E,qEAAqE;YACrE,IAAI,CAAC,MAAM,CAAC,EAAE;gBAAE,SAAS;YACzB,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;gBACtB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC;gBAC7B,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU;gBACxB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ;gBACpB,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU;gBACxB,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU;gBACxB,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACvD,CAAC,CAAC;QACL,CAAC;QACD,KAAK,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,KAAK,CAAC,MAAM;YACV,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QAC/B,CAAC;QACD,KAAK,CAAC,MAAM;YACV,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;YACnF,4EAA4E;YAC5E,uDAAuD;YACvD,OAAO,EAAE,GAAG,MAAM,EAAE,QAAQ,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpE,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,MAAM;YACnB,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC,KAAK,CACxB,qBAAqB,KAAK,CAAC,cAAc,CAAC,YAAY,KAAK,CAAC,UAAU,CAAC,+CAA+C,EACtH,CAAC,MAAM,CAAC,CACT,CAAC;YACF,OAAQ,GAAG,CAAC,IAA0B,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC3D,CAAC;QACD,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,EAAE;YAChC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;QAChE,CAAC;QACD,OAAO;YACL,KAAK,GAAG,IAAI,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/routes.d.ts
CHANGED
|
@@ -66,7 +66,7 @@ export interface AuthRoutesOptions {
|
|
|
66
66
|
export interface AuthRoutes {
|
|
67
67
|
/** POST — { email, password } */
|
|
68
68
|
login(request: Request): Promise<Response>;
|
|
69
|
-
/** POST — revokes whatever the cookie jar holds
|
|
69
|
+
/** POST — revokes the session by whatever the cookie jar holds. 500 with cookies intact if the revoke itself failed. */
|
|
70
70
|
logout(request: Request): Promise<Response>;
|
|
71
71
|
/** POST — single-use rotation of the refresh cookie. */
|
|
72
72
|
refresh(request: Request): Promise<Response>;
|
|
@@ -89,5 +89,32 @@ export declare function headerCookieSetter(): {
|
|
|
89
89
|
};
|
|
90
90
|
/** Read one cookie from a request. No dependency, and no need for a general parser. */
|
|
91
91
|
export declare function readCookie(request: Request, name: string): string | undefined;
|
|
92
|
+
/**
|
|
93
|
+
* Refuse a state-changing request that a browser sent from a site this app did
|
|
94
|
+
* not name — the cross-site request forgery check.
|
|
95
|
+
*
|
|
96
|
+
* CORS headers alone do not do this. They decide whether a script may READ the
|
|
97
|
+
* response; the request itself, cookies and all, has already reached the
|
|
98
|
+
* handler. SameSite cookies cover most of the gap, but not two surfaces on
|
|
99
|
+
* sibling subdomains, which are "same site" to a cookie and different origins
|
|
100
|
+
* to everything else — and that is exactly how a public site and its back
|
|
101
|
+
* office get deployed.
|
|
102
|
+
*
|
|
103
|
+
* Three cheap facts settle it. A browser always sends Origin on a cross-origin
|
|
104
|
+
* POST, so an Origin that is neither this host nor allowlisted is refused. A
|
|
105
|
+
* cross-site form cannot set `Content-Type: application/json` without a
|
|
106
|
+
* preflight, so a body typed as anything else is refused. And modern browsers
|
|
107
|
+
* label the request's provenance in Sec-Fetch-Site, which catches the case
|
|
108
|
+
* where Origin is absent. A request with no Origin, no provenance label and no
|
|
109
|
+
* body — curl, a server, a same-origin fetch — passes.
|
|
110
|
+
*
|
|
111
|
+
* Only the HOST of the origin is compared, not the scheme: behind a reverse
|
|
112
|
+
* proxy the handler sees http://host while the browser sent https://host, and
|
|
113
|
+
* refusing every write on that mismatch would be a very quiet outage.
|
|
114
|
+
*/
|
|
115
|
+
export declare function crossSiteWrite(request: Request, originAllowed: (origin: string) => boolean): {
|
|
116
|
+
status: number;
|
|
117
|
+
message: string;
|
|
118
|
+
} | null;
|
|
92
119
|
export declare function createAuthRoutes(opts: AuthRoutesOptions): AuthRoutes;
|
|
93
120
|
//# sourceMappingURL=routes.d.ts.map
|
package/dist/routes.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD;;;;;;;;;;;;GAYG;AAEH,mFAAmF;AACnF,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,8FAA8F;IAC9F,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,cAAc,CAAC;IACxB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,mFAAmF;IACnF,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC5D;;;;;;;OAOG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IACpD,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,uEAAuE;IACvE,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,uEAAuE;IACvE,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,UAAU;IACzB,iCAAiC;IACjC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3C,
|
|
1
|
+
{"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD;;;;;;;;;;;;GAYG;AAEH,mFAAmF;AACnF,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,8FAA8F;IAC9F,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,wFAAwF;IACxF,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,YAAY,CAAC;IACvB,OAAO,EAAE,cAAc,CAAC;IACxB;;;;OAIG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,mFAAmF;IACnF,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;IAC5D;;;;;;;OAOG;IACH,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;IACpD,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,uEAAuE;IACvE,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,uEAAuE;IACvE,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,MAAM,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAClE;;;;;;;OAOG;IACH,YAAY,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,CAAC;CACzD;AAED,MAAM,WAAW,UAAU;IACzB,iCAAiC;IACjC,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3C,wHAAwH;IACxH,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC5C,wDAAwD;IACxD,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,sCAAsC;IACtC,EAAE,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,qDAAqD;IACrD,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC;CACvC;AAcD;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,IAAI;IAAE,MAAM,EAAE,YAAY,CAAC;IAAC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CAqB9F;AAED,uFAAuF;AACvF,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAU7E;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAgBvI;AAID,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,iBAAiB,GAAG,UAAU,CAuKpE"}
|
package/dist/routes.js
CHANGED
|
@@ -61,6 +61,50 @@ export function readCookie(request, name) {
|
|
|
61
61
|
}
|
|
62
62
|
return undefined;
|
|
63
63
|
}
|
|
64
|
+
/**
|
|
65
|
+
* Refuse a state-changing request that a browser sent from a site this app did
|
|
66
|
+
* not name — the cross-site request forgery check.
|
|
67
|
+
*
|
|
68
|
+
* CORS headers alone do not do this. They decide whether a script may READ the
|
|
69
|
+
* response; the request itself, cookies and all, has already reached the
|
|
70
|
+
* handler. SameSite cookies cover most of the gap, but not two surfaces on
|
|
71
|
+
* sibling subdomains, which are "same site" to a cookie and different origins
|
|
72
|
+
* to everything else — and that is exactly how a public site and its back
|
|
73
|
+
* office get deployed.
|
|
74
|
+
*
|
|
75
|
+
* Three cheap facts settle it. A browser always sends Origin on a cross-origin
|
|
76
|
+
* POST, so an Origin that is neither this host nor allowlisted is refused. A
|
|
77
|
+
* cross-site form cannot set `Content-Type: application/json` without a
|
|
78
|
+
* preflight, so a body typed as anything else is refused. And modern browsers
|
|
79
|
+
* label the request's provenance in Sec-Fetch-Site, which catches the case
|
|
80
|
+
* where Origin is absent. A request with no Origin, no provenance label and no
|
|
81
|
+
* body — curl, a server, a same-origin fetch — passes.
|
|
82
|
+
*
|
|
83
|
+
* Only the HOST of the origin is compared, not the scheme: behind a reverse
|
|
84
|
+
* proxy the handler sees http://host while the browser sent https://host, and
|
|
85
|
+
* refusing every write on that mismatch would be a very quiet outage.
|
|
86
|
+
*/
|
|
87
|
+
export function crossSiteWrite(request, originAllowed) {
|
|
88
|
+
const origin = request.headers.get('origin');
|
|
89
|
+
if (origin) {
|
|
90
|
+
let sameHost = false;
|
|
91
|
+
try {
|
|
92
|
+
sameHost = new URL(origin).host === new URL(request.url).host;
|
|
93
|
+
}
|
|
94
|
+
catch {
|
|
95
|
+
/* an unparseable Origin is not this host */
|
|
96
|
+
}
|
|
97
|
+
if (!sameHost && !originAllowed(origin))
|
|
98
|
+
return { status: 403, message: `Cross-origin request from ${origin} refused` };
|
|
99
|
+
}
|
|
100
|
+
else if (request.headers.get('sec-fetch-site') === 'cross-site') {
|
|
101
|
+
return { status: 403, message: 'Cross-site request refused' };
|
|
102
|
+
}
|
|
103
|
+
const type = request.headers.get('content-type');
|
|
104
|
+
if (type && !/^\s*application\/json\b/i.test(type))
|
|
105
|
+
return { status: 415, message: 'Expected application/json' };
|
|
106
|
+
return null;
|
|
107
|
+
}
|
|
64
108
|
/* ------------------------------- factory ------------------------------- */
|
|
65
109
|
export function createAuthRoutes(opts) {
|
|
66
110
|
const activeStatuses = opts.activeStatuses ?? ['active'];
|
|
@@ -111,6 +155,11 @@ export function createAuthRoutes(opts) {
|
|
|
111
155
|
return new Response(null, { status: 204, headers });
|
|
112
156
|
},
|
|
113
157
|
async login(request) {
|
|
158
|
+
// Login CSRF is real: a forged sign-in as the attacker's account puts the
|
|
159
|
+
// victim's later activity in a session the attacker can read.
|
|
160
|
+
const refused = crossSiteWrite(request, originAllowed);
|
|
161
|
+
if (refused)
|
|
162
|
+
return json(request, { error: refused.message }, refused.status);
|
|
114
163
|
const { email, password } = (await body(request));
|
|
115
164
|
if (typeof email !== 'string' || typeof password !== 'string' || !email || !password) {
|
|
116
165
|
return json(request, { error: 'Email and password are required' }, 400);
|
|
@@ -155,21 +204,37 @@ export function createAuthRoutes(opts) {
|
|
|
155
204
|
return json(request, { user: row ? opts.toPublicUser(row) : null, expires: minted.expires }, 200, jar);
|
|
156
205
|
},
|
|
157
206
|
async logout(request) {
|
|
207
|
+
const refused = crossSiteWrite(request, originAllowed);
|
|
208
|
+
if (refused)
|
|
209
|
+
return json(request, { error: refused.message }, refused.status);
|
|
158
210
|
const accessToken = readCookie(request, opts.cookies.names.access);
|
|
159
211
|
const refreshToken = readCookie(request, opts.cookies.names.refresh);
|
|
160
|
-
//
|
|
161
|
-
//
|
|
162
|
-
//
|
|
163
|
-
|
|
212
|
+
// The cookies are cleared only once the session is gone. Clearing them over
|
|
213
|
+
// a revoke that failed would leave someone believing they are signed out
|
|
214
|
+
// while their session lives on in the database — the one outcome a logout
|
|
215
|
+
// must never produce. A failure here is a 500 with the cookies intact, so
|
|
216
|
+
// the person sees "try again" rather than a lie.
|
|
217
|
+
try {
|
|
218
|
+
await opts.sessions.revoke({ accessToken, refreshToken });
|
|
219
|
+
}
|
|
220
|
+
catch {
|
|
221
|
+
return json(request, { error: 'Sign-out did not complete — try again' }, 500);
|
|
222
|
+
}
|
|
164
223
|
const jar = headerCookieSetter();
|
|
165
224
|
opts.cookies.clear(jar.setter);
|
|
166
225
|
return json(request, { ok: true }, 200, jar);
|
|
167
226
|
},
|
|
168
227
|
async refresh(request) {
|
|
228
|
+
const refused = crossSiteWrite(request, originAllowed);
|
|
229
|
+
if (refused)
|
|
230
|
+
return json(request, { error: refused.message }, refused.status);
|
|
169
231
|
const refreshToken = readCookie(request, opts.cookies.names.refresh);
|
|
170
232
|
if (!refreshToken)
|
|
171
233
|
return json(request, { error: 'No session' }, 401);
|
|
172
|
-
|
|
234
|
+
// Scoped to this surface, as /me is: a refresh cookie carried over from
|
|
235
|
+
// the other surface must not rotate here and come back wearing this
|
|
236
|
+
// surface's cookie names.
|
|
237
|
+
const minted = await opts.sessions.rotate(refreshToken, { origin: { equals: opts.origin } });
|
|
173
238
|
// A 401 here means the token is genuinely spent or unknown. Cookies are NOT
|
|
174
239
|
// cleared: of two concurrent refreshes exactly one wins by design, and
|
|
175
240
|
// clearing on the loser would sign out a perfectly good session.
|
package/dist/routes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA+E3C,6EAA6E;AAE7E,MAAM,IAAI,GAA2B;IACnC,QAAQ,EAAE,UAAU;IACpB,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,SAAS;IACjB,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,SAAS;CACnB,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB;IAChC,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,OAAO;QACL,MAAM,EAAE;YACN,GAAG,CAAC,IAAY,EAAE,KAAa,EAAE,UAAmC,EAAE;gBACpE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACvD,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;oBACjD,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,KAAK;wBAAE,SAAS;oBACjE,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;oBACvB,IAAI,CAAC,IAAI;wBAAE,SAAS;oBACpB,IAAI,GAAG,KAAK,IAAI;wBAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;yBAC9B,IAAI,GAAG,KAAK,UAAU;wBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;;wBAC5G,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC5C,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAC7B,CAAC;SACF;QACD,OAAO,CAAC,OAAO;YACb,KAAK,MAAM,CAAC,IAAI,GAAG;gBAAE,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;QACvD,CAAC;KACF,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,MAAM,UAAU,UAAU,CAAC,OAAgB,EAAE,IAAY;IACvD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,EAAE,GAAG,CAAC;YAAE,SAAS;QACrB,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI;YAAE,SAAS;QAChD,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,cAAc,CAAC,OAAgB,EAAE,aAA0C;IACzF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC;YACH,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;QAChE,CAAC;QAAC,MAAM,CAAC;YACP,4CAA4C;QAC9C,CAAC;QACD,IAAI,CAAC,QAAQ,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,6BAA6B,MAAM,UAAU,EAAE,CAAC;IAC1H,CAAC;SAAM,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,KAAK,YAAY,EAAE,CAAC;QAClE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IAChE,CAAC;IACD,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACjD,IAAI,IAAI,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC;IACjH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,6EAA6E;AAE7E,MAAM,UAAU,gBAAgB,CAAC,IAAuB;IACtD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,QAAQ,IAAI,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,EAAE,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,EAAE,QAAQ,IAAI,EAAE,GAAG,MAAM,CAAC;IAEtD,MAAM,aAAa,GAAG,CAAC,MAAc,EAAW,EAAE;QAChD,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,KAAK,CAAC;QACrC,OAAO,OAAO,IAAI,CAAC,YAAY,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAClH,CAAC,CAAC;IAEF,oFAAoF;IACpF,MAAM,IAAI,GAAG,CAAC,OAAgB,EAA0B,EAAE;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAC;QACjD,OAAO;YACL,0EAA0E;YAC1E,4DAA4D;YAC5D,6BAA6B,EAAE,MAAM;YACrC,kCAAkC,EAAE,MAAM;YAC1C,IAAI,EAAE,QAAQ;SACf,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,IAAI,GAAG,CAAC,OAAgB,EAAE,IAAa,EAAE,MAAM,GAAG,GAAG,EAAE,aAA6C,EAAY,EAAE;QACtH,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACtF,aAAa,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QAChC,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;IACjE,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,OAAgB,EAAiB,EAAE,CACnD,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC;IAEvG,KAAK,UAAU,IAAI,CAAC,OAAgB;QAClC,IAAI,CAAC;YACH,MAAM,MAAM,GAAY,MAAM,OAAO,CAAC,IAAI,EAAE,CAAC;YAC7C,OAAO,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAE,MAAkC,CAAC,CAAC,CAAC,EAAE,CAAC;QACzF,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,OAAO;QACL,SAAS,CAAC,OAAO;YACf,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;gBAC1B,GAAG,IAAI,CAAC,OAAO,CAAC;gBAChB,8BAA8B,EAAE,oBAAoB;gBACpD,8BAA8B,EAAE,cAAc;gBAC9C,wBAAwB,EAAE,KAAK;aAChC,CAAC,CAAC;YACH,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;QACtD,CAAC;QAED,KAAK,CAAC,KAAK,CAAC,OAAO;YACjB,0EAA0E;YAC1E,8DAA8D;YAC9D,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACvD,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAE9E,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,CAA0C,CAAC;YAC3F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACrF,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,iCAAiC,EAAE,EAAE,GAAG,CAAC,CAAC;YAC1E,CAAC;YAED,MAAM,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;YAC7B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;gBACnB,wEAAwE;gBACxE,gDAAgD;gBAChD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,KAAK,CAAC,WAAW,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACzF,MAAM,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC3E,IAAI,CAAC,OAAO,IAAI,CAAC,IAAI;oBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,qCAAqC,EAAE,EAAE,GAAG,CAAC,CAAC;YACrG,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAE/C,2EAA2E;YAC3E,0EAA0E;YAC1E,8DAA8D;YAC9D,MAAM,MAAM,GAAG,IAAI,EAAE,YAAY,IAAI,mBAAmB,CAAC;YACzD,MAAM,OAAO,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACvD,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,OAAO,EAAE,CAAC;gBAC5C,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,uCAAuC,EAAE,EAAE,GAAG,CAAC,CAAC;YAChF,CAAC;YAED,0EAA0E;YAC1E,0EAA0E;YAC1E,yEAAyE;YACzE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;gBACjE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,mBAAmB,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;YAC9F,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACtC,MAAM,EAAE,IAAI,CAAC,EAAE;gBACf,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,EAAE;gBACF,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;aAC7C,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE;gBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO;aACzC,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACrG,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACzG,CAAC;QAED,KAAK,CAAC,MAAM,CAAC,OAAO;YAClB,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACvD,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAE9E,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnE,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrE,4EAA4E;YAC5E,yEAAyE;YACzE,0EAA0E;YAC1E,0EAA0E;YAC1E,iDAAiD;YACjD,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC5D,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,uCAAuC,EAAE,EAAE,GAAG,CAAC,CAAC;YAChF,CAAC;YACD,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;YAC/B,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;QAED,KAAK,CAAC,OAAO,CAAC,OAAO;YACnB,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;YACvD,IAAI,OAAO;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAE9E,MAAM,YAAY,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACrE,IAAI,CAAC,YAAY;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,GAAG,CAAC,CAAC;YAEtE,wEAAwE;YACxE,oEAAoE;YACpE,0BAA0B;YAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC7F,4EAA4E;YAC5E,uEAAuE;YACvE,iEAAiE;YACjE,IAAI,CAAC,MAAM;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,EAAE,GAAG,CAAC,CAAC;YAErE,MAAM,GAAG,GAAG,kBAAkB,EAAE,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE;gBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;gBACjC,WAAW,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,OAAO;aACzC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAC9D,CAAC;QAED,KAAK,CAAC,EAAE,CAAC,OAAO;YACd,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACnE,IAAI,CAAC,WAAW;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;YAExE,6EAA6E;YAC7E,4EAA4E;YAC5E,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAC9F,IAAI,CAAC,GAAG;gBAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;YAEhE,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAE,GAAwB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACpG,OAAO,IAAI,CAAC,OAAO,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9E,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/sessions.d.ts
CHANGED
|
@@ -52,8 +52,16 @@ export interface SessionStore {
|
|
|
52
52
|
* hash, so of two concurrent refreshes with the same token exactly one wins (the loser
|
|
53
53
|
* gets null → 401 → single-flight middleware forgiveness keeps the winner's cookies).
|
|
54
54
|
* Sliding window: each rotation extends the refresh expiry by refreshTtlMs.
|
|
55
|
+
*
|
|
56
|
+
* Refuses — null, nothing issued — when the session's user no longer passes
|
|
57
|
+
* `isUserActive`, or when `origin` is given and the session belongs to another
|
|
58
|
+
* surface. A suspended account must not be able to keep its session alive by
|
|
59
|
+
* refreshing, and a refresh cookie lifted from one surface must not rotate at
|
|
60
|
+
* another; both were holes that resolveUser closed and rotate left open.
|
|
55
61
|
*/
|
|
56
|
-
rotate(refreshToken: string
|
|
62
|
+
rotate(refreshToken: string, opts?: {
|
|
63
|
+
origin?: OriginScope;
|
|
64
|
+
}): Promise<MintedSession | null>;
|
|
57
65
|
/**
|
|
58
66
|
* Resolve an access token to its raw user row (drizzle camelCase properties — map to
|
|
59
67
|
* your wire shape and strip credential columns in YOUR binding). Null on unknown or
|
|
@@ -66,7 +74,16 @@ export interface SessionStore {
|
|
|
66
74
|
resolveUser(accessToken: string, opts?: {
|
|
67
75
|
origin?: OriginScope;
|
|
68
76
|
}): Promise<Record<string, unknown> | null>;
|
|
69
|
-
/**
|
|
77
|
+
/**
|
|
78
|
+
* Logout: revoke by EVERY token the cookie jar holds, not the first one that
|
|
79
|
+
* looks right. After a rotation in another tab the access cookie here is stale
|
|
80
|
+
* and matches nothing, while the refresh cookie may still be live — revoking by
|
|
81
|
+
* the access token alone then deletes nothing and the session survives logout.
|
|
82
|
+
*
|
|
83
|
+
* Throws when the database refuses. Swallowing that would let the caller clear
|
|
84
|
+
* the cookies over a session that still exists, which is a person believing
|
|
85
|
+
* they are signed out when they are not.
|
|
86
|
+
*/
|
|
70
87
|
revoke(tokens: {
|
|
71
88
|
accessToken?: string;
|
|
72
89
|
refreshToken?: string;
|
package/dist/sessions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAY,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,sFAAsF;AACtF,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IACnC,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IACpC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3B
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAY,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,aAAa;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,mFAAmF;IACnF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,sFAAsF;AACtF,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,aAAa,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IACnC,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IACpC;;;;;OAKG;IACH,IAAI,CAAC,IAAI,EAAE;QACT,MAAM,EAAE,MAAM,CAAC;QACf,MAAM,EAAE,MAAM,CAAC;QACf,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QACnB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;QAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC3B;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC7F;;;;;;;;OAQG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;IAC3G;;;;;;;;;OASG;IACH,MAAM,CAAC,MAAM,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/E,6FAA6F;IAC7F,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAE,iBAAiB,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxF;AAOD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IAEvC,EAAE,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kFAAkF;IAClF,YAAY,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC;IACzD,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,YAAY,CA+Hf"}
|
package/dist/sessions.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createHash, randomBytes } from 'node:crypto';
|
|
2
|
-
import { and, eq, getTableColumns, gt, lt, ne } from 'drizzle-orm';
|
|
2
|
+
import { and, eq, getTableColumns, gt, lt, ne, or } from 'drizzle-orm';
|
|
3
3
|
const sha256 = (t) => createHash('sha256').update(t).digest('hex');
|
|
4
4
|
/* The drizzle call sites cast through `any`: typing a caller-supplied table pair
|
|
5
5
|
* generically against drizzle's builder generics costs far more than it buys at this
|
|
@@ -13,6 +13,8 @@ export function createSessionStore(opts) {
|
|
|
13
13
|
const isAccessToken = (t) => typeof t === 'string' && t.startsWith(accessPrefix);
|
|
14
14
|
const isRefreshToken = (t) => typeof t === 'string' && t.startsWith(refreshPrefix);
|
|
15
15
|
const newToken = (prefix) => prefix + randomBytes(32).toString('base64url');
|
|
16
|
+
/** The surface restriction as WHERE conditions — none when unscoped. Shared by every read of a session. */
|
|
17
|
+
const originClause = (scope) => scope === undefined ? [] : 'equals' in scope ? [eq(sessions.origin, scope.equals)] : [ne(sessions.origin, scope.not)];
|
|
16
18
|
return {
|
|
17
19
|
accessTtlMs,
|
|
18
20
|
refreshTtlMs,
|
|
@@ -34,13 +36,28 @@ export function createSessionStore(opts) {
|
|
|
34
36
|
});
|
|
35
37
|
return { accessToken, refreshToken, expires: accessTtlMs };
|
|
36
38
|
},
|
|
37
|
-
async rotate(refreshToken) {
|
|
39
|
+
async rotate(refreshToken, callOpts = {}) {
|
|
38
40
|
if (!isRefreshToken(refreshToken))
|
|
39
41
|
return null;
|
|
40
|
-
const accessToken = newToken(accessPrefix);
|
|
41
|
-
const nextRefreshToken = newToken(refreshPrefix);
|
|
42
42
|
const now = Date.now();
|
|
43
43
|
const nowIso = new Date(now).toISOString();
|
|
44
|
+
const hash = sha256(refreshToken);
|
|
45
|
+
const live = [eq(sessions.refreshHash, hash), gt(sessions.refreshExpiresAt, nowIso), ...originClause(callOpts.origin)];
|
|
46
|
+
// Whose session this is, checked BEFORE anything is issued. isUserActive is
|
|
47
|
+
// the caller's predicate over the user row, so it cannot go in the WHERE;
|
|
48
|
+
// the single-use guarantee is unaffected, because the UPDATE below still
|
|
49
|
+
// consumes the hash atomically.
|
|
50
|
+
const found = await db
|
|
51
|
+
.select({ u: getTableColumns(users) })
|
|
52
|
+
.from(sessions)
|
|
53
|
+
.innerJoin(users, eq(sessions.userId, users.id))
|
|
54
|
+
.where(and(...live))
|
|
55
|
+
.limit(1);
|
|
56
|
+
const u = found[0]?.u;
|
|
57
|
+
if (!u || !isUserActive(u))
|
|
58
|
+
return null;
|
|
59
|
+
const accessToken = newToken(accessPrefix);
|
|
60
|
+
const nextRefreshToken = newToken(refreshPrefix);
|
|
44
61
|
const rotated = await db
|
|
45
62
|
.update(sessions)
|
|
46
63
|
.set({
|
|
@@ -50,7 +67,7 @@ export function createSessionStore(opts) {
|
|
|
50
67
|
refreshExpiresAt: new Date(now + refreshTtlMs).toISOString(),
|
|
51
68
|
lastUsedAt: nowIso,
|
|
52
69
|
})
|
|
53
|
-
.where(and(
|
|
70
|
+
.where(and(...live))
|
|
54
71
|
.returning({ id: sessions.id });
|
|
55
72
|
if (!rotated.length)
|
|
56
73
|
return null;
|
|
@@ -66,17 +83,11 @@ export function createSessionStore(opts) {
|
|
|
66
83
|
async resolveUser(accessToken, callOpts = {}) {
|
|
67
84
|
if (!isAccessToken(accessToken))
|
|
68
85
|
return null;
|
|
69
|
-
const scope = callOpts.origin;
|
|
70
|
-
const originCond = scope === undefined
|
|
71
|
-
? undefined
|
|
72
|
-
: 'equals' in scope
|
|
73
|
-
? eq(sessions.origin, scope.equals)
|
|
74
|
-
: ne(sessions.origin, scope.not);
|
|
75
86
|
const rows = await db
|
|
76
87
|
.select({ u: getTableColumns(users) })
|
|
77
88
|
.from(sessions)
|
|
78
89
|
.innerJoin(users, eq(sessions.userId, users.id))
|
|
79
|
-
.where(and(eq(sessions.accessHash, sha256(accessToken)), gt(sessions.accessExpiresAt, new Date().toISOString()), ...(
|
|
90
|
+
.where(and(eq(sessions.accessHash, sha256(accessToken)), gt(sessions.accessExpiresAt, new Date().toISOString()), ...originClause(callOpts.origin)))
|
|
80
91
|
.limit(1);
|
|
81
92
|
const u = rows[0]?.u;
|
|
82
93
|
if (!u || !isUserActive(u))
|
|
@@ -84,17 +95,14 @@ export function createSessionStore(opts) {
|
|
|
84
95
|
return u;
|
|
85
96
|
},
|
|
86
97
|
async revoke(tokens) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
catch (e) {
|
|
96
|
-
console.error('session revoke failed:', e);
|
|
97
|
-
}
|
|
98
|
+
const byEither = [];
|
|
99
|
+
if (tokens.accessToken && isAccessToken(tokens.accessToken))
|
|
100
|
+
byEither.push(eq(sessions.accessHash, sha256(tokens.accessToken)));
|
|
101
|
+
if (tokens.refreshToken && isRefreshToken(tokens.refreshToken))
|
|
102
|
+
byEither.push(eq(sessions.refreshHash, sha256(tokens.refreshToken)));
|
|
103
|
+
if (!byEither.length)
|
|
104
|
+
return;
|
|
105
|
+
await db.delete(sessions).where(byEither.length === 1 ? byEither[0] : or(...byEither));
|
|
98
106
|
},
|
|
99
107
|
async revokeAllForUser(userId, callOpts = {}) {
|
|
100
108
|
const except = callOpts.exceptAccessToken && isAccessToken(callOpts.exceptAccessToken)
|
package/dist/sessions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,eAAe,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@allodium/auth",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"description": "First-party auth you own: argon2 passwords, session store, rotating refresh, OIDC, WebAuthn passkeys, reset emails, tenant membership.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"scripts": {
|
|
25
25
|
"build": "tsc -p tsconfig.json",
|
|
26
26
|
"typecheck": "tsc -p tsconfig.json --noEmit",
|
|
27
|
-
"test": "node test/act-as.mjs && node test/access.mjs && node test/grants.mjs && node test/routes.mjs"
|
|
27
|
+
"test": "node test/act-as.mjs && node test/access.mjs && node test/grants.mjs && node test/routes.mjs && node test/loader.mjs"
|
|
28
28
|
},
|
|
29
29
|
"engines": {
|
|
30
30
|
"node": ">=20"
|