@allodium/auth 0.0.1 → 0.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/LICENSE +21 -0
- package/README.md +103 -0
- package/dist/access.d.ts +105 -0
- package/dist/access.d.ts.map +1 -0
- package/dist/access.js +101 -0
- package/dist/access.js.map +1 -0
- package/dist/actAs.d.ts +100 -0
- package/dist/actAs.d.ts.map +1 -0
- package/dist/actAs.js +127 -0
- package/dist/actAs.js.map +1 -0
- package/dist/cookies.d.ts +51 -0
- package/dist/cookies.d.ts.map +1 -0
- package/dist/cookies.js +47 -0
- package/dist/cookies.js.map +1 -0
- package/dist/grants.d.ts +53 -0
- package/dist/grants.d.ts.map +1 -0
- package/dist/grants.js +84 -0
- package/dist/grants.js.map +1 -0
- package/dist/index.d.ts +19 -26
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +19 -20
- package/dist/index.js.map +1 -1
- package/dist/ip.d.ts +7 -0
- package/dist/ip.d.ts.map +1 -0
- package/dist/ip.js +10 -0
- package/dist/ip.js.map +1 -0
- package/dist/passwords.d.ts +20 -0
- package/dist/passwords.d.ts.map +1 -0
- package/dist/passwords.js +32 -0
- package/dist/passwords.js.map +1 -0
- package/dist/rateLimit.d.ts +23 -0
- package/dist/rateLimit.d.ts.map +1 -0
- package/dist/rateLimit.js +48 -0
- package/dist/rateLimit.js.map +1 -0
- package/dist/routes.d.ts +93 -0
- package/dist/routes.d.ts.map +1 -0
- package/dist/routes.js +201 -0
- package/dist/routes.js.map +1 -0
- package/dist/sessions.d.ts +92 -0
- package/dist/sessions.d.ts.map +1 -0
- package/dist/sessions.js +109 -0
- package/dist/sessions.js.map +1 -0
- package/dist/signedTokens.d.ts +45 -0
- package/dist/signedTokens.d.ts.map +1 -0
- package/dist/signedTokens.js +111 -0
- package/dist/signedTokens.js.map +1 -0
- package/package.json +25 -5
package/dist/routes.js
ADDED
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
import { verifyPassword, DUMMY_ARGON2ID_HASH } from './passwords.js';
|
|
2
|
+
import { firstForwardedIp } from './ip.js';
|
|
3
|
+
/* --------------------------- cookie plumbing --------------------------- */
|
|
4
|
+
const ATTR = {
|
|
5
|
+
httpOnly: 'HttpOnly',
|
|
6
|
+
secure: 'Secure',
|
|
7
|
+
sameSite: 'SameSite',
|
|
8
|
+
path: 'Path',
|
|
9
|
+
maxAge: 'Max-Age',
|
|
10
|
+
domain: 'Domain',
|
|
11
|
+
expires: 'Expires',
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* A `CookieSetter` that writes into response headers.
|
|
15
|
+
*
|
|
16
|
+
* The cookie helper speaks the Next/`cookies()` shape — `set(name, value, opts)`
|
|
17
|
+
* — so bridging it to a Web Response means serialising here. Every cookie gets
|
|
18
|
+
* its own Set-Cookie header; folding them into one comma-separated value is a
|
|
19
|
+
* classic way to lose all but the first.
|
|
20
|
+
*/
|
|
21
|
+
export function headerCookieSetter() {
|
|
22
|
+
const jar = [];
|
|
23
|
+
return {
|
|
24
|
+
setter: {
|
|
25
|
+
set(name, value, options = {}) {
|
|
26
|
+
const parts = [`${name}=${encodeURIComponent(value)}`];
|
|
27
|
+
for (const [key, raw] of Object.entries(options)) {
|
|
28
|
+
if (raw === undefined || raw === null || raw === false)
|
|
29
|
+
continue;
|
|
30
|
+
const attr = ATTR[key];
|
|
31
|
+
if (!attr)
|
|
32
|
+
continue;
|
|
33
|
+
if (raw === true)
|
|
34
|
+
parts.push(attr);
|
|
35
|
+
else if (key === 'sameSite')
|
|
36
|
+
parts.push(`${attr}=${String(raw).charAt(0).toUpperCase()}${String(raw).slice(1)}`);
|
|
37
|
+
else
|
|
38
|
+
parts.push(`${attr}=${String(raw)}`);
|
|
39
|
+
}
|
|
40
|
+
jar.push(parts.join('; '));
|
|
41
|
+
},
|
|
42
|
+
},
|
|
43
|
+
applyTo(headers) {
|
|
44
|
+
for (const c of jar)
|
|
45
|
+
headers.append('Set-Cookie', c);
|
|
46
|
+
},
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
/** Read one cookie from a request. No dependency, and no need for a general parser. */
|
|
50
|
+
export function readCookie(request, name) {
|
|
51
|
+
const header = request.headers.get('cookie');
|
|
52
|
+
if (!header)
|
|
53
|
+
return undefined;
|
|
54
|
+
for (const part of header.split(';')) {
|
|
55
|
+
const eq = part.indexOf('=');
|
|
56
|
+
if (eq < 0)
|
|
57
|
+
continue;
|
|
58
|
+
if (part.slice(0, eq).trim() !== name)
|
|
59
|
+
continue;
|
|
60
|
+
return decodeURIComponent(part.slice(eq + 1).trim());
|
|
61
|
+
}
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
/* ------------------------------- factory ------------------------------- */
|
|
65
|
+
export function createAuthRoutes(opts) {
|
|
66
|
+
const activeStatuses = opts.activeStatuses ?? ['active'];
|
|
67
|
+
const perEmail = opts.limits?.perEmail ?? 5;
|
|
68
|
+
const perIp = opts.limits?.perIp ?? 20;
|
|
69
|
+
const windowMs = opts.limits?.windowMs ?? 15 * 60_000;
|
|
70
|
+
const originAllowed = (origin) => {
|
|
71
|
+
if (!opts.allowOrigins)
|
|
72
|
+
return false;
|
|
73
|
+
return typeof opts.allowOrigins === 'function' ? opts.allowOrigins(origin) : opts.allowOrigins.includes(origin);
|
|
74
|
+
};
|
|
75
|
+
/** CORS headers for a request, or nothing when it is same-origin or not allowed. */
|
|
76
|
+
const cors = (request) => {
|
|
77
|
+
const origin = request.headers.get('origin');
|
|
78
|
+
if (!origin || !originAllowed(origin))
|
|
79
|
+
return {};
|
|
80
|
+
return {
|
|
81
|
+
// The exact origin, never "*": a wildcard is ignored when credentials are
|
|
82
|
+
// in play, and these endpoints are nothing but credentials.
|
|
83
|
+
'Access-Control-Allow-Origin': origin,
|
|
84
|
+
'Access-Control-Allow-Credentials': 'true',
|
|
85
|
+
Vary: 'Origin',
|
|
86
|
+
};
|
|
87
|
+
};
|
|
88
|
+
const json = (request, body, status = 200, cookieHeaders) => {
|
|
89
|
+
const headers = new Headers({ 'Content-Type': 'application/json', ...cors(request) });
|
|
90
|
+
cookieHeaders?.applyTo(headers);
|
|
91
|
+
return new Response(JSON.stringify(body), { status, headers });
|
|
92
|
+
};
|
|
93
|
+
const clientIp = (request) => firstForwardedIp(request.headers.get('x-forwarded-for')) ?? request.headers.get('x-real-ip') ?? null;
|
|
94
|
+
async function body(request) {
|
|
95
|
+
try {
|
|
96
|
+
const parsed = await request.json();
|
|
97
|
+
return parsed && typeof parsed === 'object' ? parsed : {};
|
|
98
|
+
}
|
|
99
|
+
catch {
|
|
100
|
+
return {};
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
return {
|
|
104
|
+
preflight(request) {
|
|
105
|
+
const headers = new Headers({
|
|
106
|
+
...cors(request),
|
|
107
|
+
'Access-Control-Allow-Methods': 'GET, POST, OPTIONS',
|
|
108
|
+
'Access-Control-Allow-Headers': 'Content-Type',
|
|
109
|
+
'Access-Control-Max-Age': '600',
|
|
110
|
+
});
|
|
111
|
+
return new Response(null, { status: 204, headers });
|
|
112
|
+
},
|
|
113
|
+
async login(request) {
|
|
114
|
+
const { email, password } = (await body(request));
|
|
115
|
+
if (typeof email !== 'string' || typeof password !== 'string' || !email || !password) {
|
|
116
|
+
return json(request, { error: 'Email and password are required' }, 400);
|
|
117
|
+
}
|
|
118
|
+
const ip = clientIp(request);
|
|
119
|
+
if (opts.rateLimit) {
|
|
120
|
+
// Per email AND per IP: per-email alone lets one host walk a user list,
|
|
121
|
+
// per-IP alone lets a botnet grind one account.
|
|
122
|
+
const emailOk = opts.rateLimit(`login:email:${email.toLowerCase()}`, perEmail, windowMs);
|
|
123
|
+
const ipOk = ip ? opts.rateLimit(`login:ip:${ip}`, perIp, windowMs) : true;
|
|
124
|
+
if (!emailOk || !ipOk)
|
|
125
|
+
return json(request, { error: 'Too many attempts. Try again later.' }, 429);
|
|
126
|
+
}
|
|
127
|
+
const user = await opts.findUserByEmail(email);
|
|
128
|
+
// Verify against a real digest even when the account does not exist, so an
|
|
129
|
+
// unknown email costs the same time as a wrong password. Skipping this is
|
|
130
|
+
// how a login endpoint becomes an account-enumeration oracle.
|
|
131
|
+
const digest = user?.passwordHash ?? DUMMY_ARGON2ID_HASH;
|
|
132
|
+
const correct = await verifyPassword(digest, password);
|
|
133
|
+
if (!user || !user.passwordHash || !correct) {
|
|
134
|
+
return json(request, { error: 'Those details do not match an account' }, 401);
|
|
135
|
+
}
|
|
136
|
+
// Status failures ARE distinguishable, deliberately: the person typed the
|
|
137
|
+
// right password, and "your account is suspended" is the only answer that
|
|
138
|
+
// lets them do anything about it. It reveals nothing they did not prove.
|
|
139
|
+
if (user.status != null && !activeStatuses.includes(user.status)) {
|
|
140
|
+
return json(request, { error: `This account is ${user.status}`, status: user.status }, 403);
|
|
141
|
+
}
|
|
142
|
+
const minted = await opts.sessions.mint({
|
|
143
|
+
userId: user.id,
|
|
144
|
+
origin: opts.origin,
|
|
145
|
+
ip,
|
|
146
|
+
userAgent: request.headers.get('user-agent'),
|
|
147
|
+
});
|
|
148
|
+
const jar = headerCookieSetter();
|
|
149
|
+
opts.cookies.set(jar.setter, {
|
|
150
|
+
accessToken: minted.accessToken,
|
|
151
|
+
refreshToken: minted.refreshToken,
|
|
152
|
+
expiresAtMs: Date.now() + minted.expires,
|
|
153
|
+
});
|
|
154
|
+
const row = await opts.sessions.resolveUser(minted.accessToken, { origin: { equals: opts.origin } });
|
|
155
|
+
return json(request, { user: row ? opts.toPublicUser(row) : null, expires: minted.expires }, 200, jar);
|
|
156
|
+
},
|
|
157
|
+
async logout(request) {
|
|
158
|
+
const accessToken = readCookie(request, opts.cookies.names.access);
|
|
159
|
+
const refreshToken = readCookie(request, opts.cookies.names.refresh);
|
|
160
|
+
// Best effort, and 200 regardless: a logout that fails leaves someone
|
|
161
|
+
// believing they are signed out when they are not, which is worse than a
|
|
162
|
+
// revoke that was already unnecessary.
|
|
163
|
+
await opts.sessions.revoke({ accessToken, refreshToken }).catch(() => { });
|
|
164
|
+
const jar = headerCookieSetter();
|
|
165
|
+
opts.cookies.clear(jar.setter);
|
|
166
|
+
return json(request, { ok: true }, 200, jar);
|
|
167
|
+
},
|
|
168
|
+
async refresh(request) {
|
|
169
|
+
const refreshToken = readCookie(request, opts.cookies.names.refresh);
|
|
170
|
+
if (!refreshToken)
|
|
171
|
+
return json(request, { error: 'No session' }, 401);
|
|
172
|
+
const minted = await opts.sessions.rotate(refreshToken);
|
|
173
|
+
// A 401 here means the token is genuinely spent or unknown. Cookies are NOT
|
|
174
|
+
// cleared: of two concurrent refreshes exactly one wins by design, and
|
|
175
|
+
// clearing on the loser would sign out a perfectly good session.
|
|
176
|
+
if (!minted)
|
|
177
|
+
return json(request, { error: 'Session expired' }, 401);
|
|
178
|
+
const jar = headerCookieSetter();
|
|
179
|
+
opts.cookies.set(jar.setter, {
|
|
180
|
+
accessToken: minted.accessToken,
|
|
181
|
+
refreshToken: minted.refreshToken,
|
|
182
|
+
expiresAtMs: Date.now() + minted.expires,
|
|
183
|
+
});
|
|
184
|
+
return json(request, { expires: minted.expires }, 200, jar);
|
|
185
|
+
},
|
|
186
|
+
async me(request) {
|
|
187
|
+
const accessToken = readCookie(request, opts.cookies.names.access);
|
|
188
|
+
if (!accessToken)
|
|
189
|
+
return json(request, { error: 'Not signed in' }, 401);
|
|
190
|
+
// Scoped to this surface: a cookie lifted from the admin origin and replayed
|
|
191
|
+
// at the site resolves to nothing, which is the point of storing an origin.
|
|
192
|
+
const row = await opts.sessions.resolveUser(accessToken, { origin: { equals: opts.origin } });
|
|
193
|
+
if (!row)
|
|
194
|
+
return json(request, { error: 'Not signed in' }, 401);
|
|
195
|
+
const user = opts.toPublicUser(row);
|
|
196
|
+
const actor = opts.actorFor ? await opts.actorFor(String(row.id)) : undefined;
|
|
197
|
+
return json(request, actor === undefined ? { user } : { user, actor }, 200);
|
|
198
|
+
},
|
|
199
|
+
};
|
|
200
|
+
}
|
|
201
|
+
//# sourceMappingURL=routes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../src/routes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import type { NodePgDatabase } from 'drizzle-orm/node-postgres';
|
|
2
|
+
import type { PgTable } from 'drizzle-orm/pg-core';
|
|
3
|
+
/**
|
|
4
|
+
* First-party session store: short-lived access token + single-use rotating refresh
|
|
5
|
+
* token, both opaque (prefix + 32 random bytes base64url). Tokens live only in httpOnly
|
|
6
|
+
* cookies; the database stores sha256 hex digests. The prefixes are how middleware and
|
|
7
|
+
* read paths recognize these tokens without any flag column — pick ones unique to your
|
|
8
|
+
* app (they also namespace tokens during a migration's parallel-run).
|
|
9
|
+
*
|
|
10
|
+
* Required `sessions` table shape (drizzle property names, string-mode timestamptz):
|
|
11
|
+
* id, userId, accessHash (char 64), refreshHash (char 64), accessExpiresAt,
|
|
12
|
+
* refreshExpiresAt, lastUsedAt, ip (varchar 64), userAgent (varchar 255),
|
|
13
|
+
* origin (varchar) — with UNIQUE indexes on both hash columns.
|
|
14
|
+
* Required `users` table shape: an `id` property the sessions.userId FK points at.
|
|
15
|
+
*/
|
|
16
|
+
export interface MintedSession {
|
|
17
|
+
accessToken: string;
|
|
18
|
+
refreshToken: string;
|
|
19
|
+
/** Access-token TTL in ms — the `expires` value auth endpoints put on the wire. */
|
|
20
|
+
expires: number;
|
|
21
|
+
}
|
|
22
|
+
/** Origin scoping for resolveUser — see the note on cross-surface token isolation. */
|
|
23
|
+
export type OriginScope = {
|
|
24
|
+
equals: string;
|
|
25
|
+
} | {
|
|
26
|
+
not: string;
|
|
27
|
+
};
|
|
28
|
+
export interface SessionStore {
|
|
29
|
+
accessTtlMs: number;
|
|
30
|
+
refreshTtlMs: number;
|
|
31
|
+
/**
|
|
32
|
+
* Plain booleans on purpose (not type predicates): a predicate would narrow
|
|
33
|
+
* `string | undefined` to `never` in callers' else-branches (legacy token paths).
|
|
34
|
+
*/
|
|
35
|
+
isAccessToken(t: unknown): boolean;
|
|
36
|
+
isRefreshToken(t: unknown): boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Create a session for a user. Caller has already authenticated them. ttlMs overrides
|
|
39
|
+
* the access TTL for fixed-length sessions with no refresh cycle (admin surfaces);
|
|
40
|
+
* the returned `expires` is always the store's standard TTL, matching what refresh
|
|
41
|
+
* endpoints advertise.
|
|
42
|
+
*/
|
|
43
|
+
mint(args: {
|
|
44
|
+
userId: string;
|
|
45
|
+
origin: string;
|
|
46
|
+
ip?: string | null;
|
|
47
|
+
userAgent?: string | null;
|
|
48
|
+
ttlMs?: number;
|
|
49
|
+
}): Promise<MintedSession>;
|
|
50
|
+
/**
|
|
51
|
+
* Single-use refresh rotation. Atomic: the UPDATE's WHERE consumes the old refresh
|
|
52
|
+
* hash, so of two concurrent refreshes with the same token exactly one wins (the loser
|
|
53
|
+
* gets null → 401 → single-flight middleware forgiveness keeps the winner's cookies).
|
|
54
|
+
* Sliding window: each rotation extends the refresh expiry by refreshTtlMs.
|
|
55
|
+
*/
|
|
56
|
+
rotate(refreshToken: string): Promise<MintedSession | null>;
|
|
57
|
+
/**
|
|
58
|
+
* Resolve an access token to its raw user row (drizzle camelCase properties — map to
|
|
59
|
+
* your wire shape and strip credential columns in YOUR binding). Null on unknown or
|
|
60
|
+
* expired token, or when isUserActive rejects the row.
|
|
61
|
+
*
|
|
62
|
+
* Origin scoping is real security logic when two surfaces share the store (an app and
|
|
63
|
+
* an admin console): scope each surface so a cookie value manually moved across
|
|
64
|
+
* origins resolves to nothing.
|
|
65
|
+
*/
|
|
66
|
+
resolveUser(accessToken: string, opts?: {
|
|
67
|
+
origin?: OriginScope;
|
|
68
|
+
}): Promise<Record<string, unknown> | null>;
|
|
69
|
+
/** Logout: revoke by whichever token the cookie jar still has. Best-effort, never throws. */
|
|
70
|
+
revoke(tokens: {
|
|
71
|
+
accessToken?: string;
|
|
72
|
+
refreshToken?: string;
|
|
73
|
+
}): Promise<void>;
|
|
74
|
+
/** Revoke all of a user's sessions (password reset), optionally sparing one access token. */
|
|
75
|
+
revokeAllForUser(userId: string, opts?: {
|
|
76
|
+
exceptAccessToken?: string;
|
|
77
|
+
}): Promise<void>;
|
|
78
|
+
}
|
|
79
|
+
export declare function createSessionStore(opts: {
|
|
80
|
+
db: NodePgDatabase<any>;
|
|
81
|
+
sessions: PgTable;
|
|
82
|
+
users: PgTable;
|
|
83
|
+
accessPrefix: string;
|
|
84
|
+
refreshPrefix: string;
|
|
85
|
+
accessTtlMs?: number;
|
|
86
|
+
refreshTtlMs?: number;
|
|
87
|
+
/** Gate on the joined user row (e.g. status === 'active'). Default: allow all. */
|
|
88
|
+
isUserActive?: (row: Record<string, unknown>) => boolean;
|
|
89
|
+
/** Rotation lazily deletes sessions dead longer than this. Default 24 h. */
|
|
90
|
+
sweepGraceMs?: number;
|
|
91
|
+
}): SessionStore;
|
|
92
|
+
//# sourceMappingURL=sessions.d.ts.map
|
|
@@ -0,0 +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;;;;;OAKG;IACH,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IAC5D;;;;;;;;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,6FAA6F;IAC7F,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,CAuHf"}
|
package/dist/sessions.js
ADDED
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
import { createHash, randomBytes } from 'node:crypto';
|
|
2
|
+
import { and, eq, getTableColumns, gt, lt, ne } from 'drizzle-orm';
|
|
3
|
+
const sha256 = (t) => createHash('sha256').update(t).digest('hex');
|
|
4
|
+
/* The drizzle call sites cast through `any`: typing a caller-supplied table pair
|
|
5
|
+
* generically against drizzle's builder generics costs far more than it buys at this
|
|
6
|
+
* layer, and the column-property contract is documented above. */
|
|
7
|
+
export function createSessionStore(opts) {
|
|
8
|
+
const { db, accessPrefix, refreshPrefix, accessTtlMs = 15 * 60_000, refreshTtlMs = 7 * 24 * 3_600_000, isUserActive = () => true, sweepGraceMs = 24 * 3_600_000, } = opts;
|
|
9
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
10
|
+
const sessions = opts.sessions;
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12
|
+
const users = opts.users;
|
|
13
|
+
const isAccessToken = (t) => typeof t === 'string' && t.startsWith(accessPrefix);
|
|
14
|
+
const isRefreshToken = (t) => typeof t === 'string' && t.startsWith(refreshPrefix);
|
|
15
|
+
const newToken = (prefix) => prefix + randomBytes(32).toString('base64url');
|
|
16
|
+
return {
|
|
17
|
+
accessTtlMs,
|
|
18
|
+
refreshTtlMs,
|
|
19
|
+
isAccessToken,
|
|
20
|
+
isRefreshToken,
|
|
21
|
+
async mint(args) {
|
|
22
|
+
const accessToken = newToken(accessPrefix);
|
|
23
|
+
const refreshToken = newToken(refreshPrefix);
|
|
24
|
+
const now = Date.now();
|
|
25
|
+
await db.insert(sessions).values({
|
|
26
|
+
userId: args.userId,
|
|
27
|
+
accessHash: sha256(accessToken),
|
|
28
|
+
refreshHash: sha256(refreshToken),
|
|
29
|
+
accessExpiresAt: new Date(now + (args.ttlMs ?? accessTtlMs)).toISOString(),
|
|
30
|
+
refreshExpiresAt: new Date(now + refreshTtlMs).toISOString(),
|
|
31
|
+
ip: args.ip ? args.ip.slice(0, 64) : null,
|
|
32
|
+
userAgent: args.userAgent ? args.userAgent.slice(0, 255) : null,
|
|
33
|
+
origin: args.origin,
|
|
34
|
+
});
|
|
35
|
+
return { accessToken, refreshToken, expires: accessTtlMs };
|
|
36
|
+
},
|
|
37
|
+
async rotate(refreshToken) {
|
|
38
|
+
if (!isRefreshToken(refreshToken))
|
|
39
|
+
return null;
|
|
40
|
+
const accessToken = newToken(accessPrefix);
|
|
41
|
+
const nextRefreshToken = newToken(refreshPrefix);
|
|
42
|
+
const now = Date.now();
|
|
43
|
+
const nowIso = new Date(now).toISOString();
|
|
44
|
+
const rotated = await db
|
|
45
|
+
.update(sessions)
|
|
46
|
+
.set({
|
|
47
|
+
accessHash: sha256(accessToken),
|
|
48
|
+
refreshHash: sha256(nextRefreshToken),
|
|
49
|
+
accessExpiresAt: new Date(now + accessTtlMs).toISOString(),
|
|
50
|
+
refreshExpiresAt: new Date(now + refreshTtlMs).toISOString(),
|
|
51
|
+
lastUsedAt: nowIso,
|
|
52
|
+
})
|
|
53
|
+
.where(and(eq(sessions.refreshHash, sha256(refreshToken)), gt(sessions.refreshExpiresAt, nowIso)))
|
|
54
|
+
.returning({ id: sessions.id });
|
|
55
|
+
if (!rotated.length)
|
|
56
|
+
return null;
|
|
57
|
+
// Lazy sweep: drop long-dead sessions on the way through.
|
|
58
|
+
try {
|
|
59
|
+
await db.delete(sessions).where(lt(sessions.refreshExpiresAt, new Date(now - sweepGraceMs).toISOString()));
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
/* housekeeping only */
|
|
63
|
+
}
|
|
64
|
+
return { accessToken, refreshToken: nextRefreshToken, expires: accessTtlMs };
|
|
65
|
+
},
|
|
66
|
+
async resolveUser(accessToken, callOpts = {}) {
|
|
67
|
+
if (!isAccessToken(accessToken))
|
|
68
|
+
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
|
+
const rows = await db
|
|
76
|
+
.select({ u: getTableColumns(users) })
|
|
77
|
+
.from(sessions)
|
|
78
|
+
.innerJoin(users, eq(sessions.userId, users.id))
|
|
79
|
+
.where(and(eq(sessions.accessHash, sha256(accessToken)), gt(sessions.accessExpiresAt, new Date().toISOString()), ...(originCond ? [originCond] : [])))
|
|
80
|
+
.limit(1);
|
|
81
|
+
const u = rows[0]?.u;
|
|
82
|
+
if (!u || !isUserActive(u))
|
|
83
|
+
return null;
|
|
84
|
+
return u;
|
|
85
|
+
},
|
|
86
|
+
async revoke(tokens) {
|
|
87
|
+
try {
|
|
88
|
+
if (tokens.accessToken && isAccessToken(tokens.accessToken)) {
|
|
89
|
+
await db.delete(sessions).where(eq(sessions.accessHash, sha256(tokens.accessToken)));
|
|
90
|
+
}
|
|
91
|
+
else if (tokens.refreshToken && isRefreshToken(tokens.refreshToken)) {
|
|
92
|
+
await db.delete(sessions).where(eq(sessions.refreshHash, sha256(tokens.refreshToken)));
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
catch (e) {
|
|
96
|
+
console.error('session revoke failed:', e);
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
async revokeAllForUser(userId, callOpts = {}) {
|
|
100
|
+
const except = callOpts.exceptAccessToken && isAccessToken(callOpts.exceptAccessToken)
|
|
101
|
+
? sha256(callOpts.exceptAccessToken)
|
|
102
|
+
: null;
|
|
103
|
+
await db
|
|
104
|
+
.delete(sessions)
|
|
105
|
+
.where(except ? and(eq(sessions.userId, userId), ne(sessions.accessHash, except)) : eq(sessions.userId, userId));
|
|
106
|
+
},
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
//# sourceMappingURL=sessions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/** `${b64url(JSON payload)}.${hmac}` — the signing primitive behind every token here. */
|
|
2
|
+
export declare function signPayload(key: string, payload: unknown): string;
|
|
3
|
+
/**
|
|
4
|
+
* Verify a signed token's HMAC (timing-safe) and return its decoded payload, or null.
|
|
5
|
+
* Expiry is the caller's concern — payload shapes differ.
|
|
6
|
+
*/
|
|
7
|
+
export declare function verifySignedPayload(key: string, token: string): unknown | null;
|
|
8
|
+
export interface ResetTokenPayload {
|
|
9
|
+
/** User id the token was issued for. */
|
|
10
|
+
u: string;
|
|
11
|
+
/** Expiry, ms since epoch. */
|
|
12
|
+
exp: number;
|
|
13
|
+
}
|
|
14
|
+
export interface ResetTokens {
|
|
15
|
+
/** Issue a token for a user. Throws when the secret is unset (callers guard). */
|
|
16
|
+
make(user: {
|
|
17
|
+
id: string;
|
|
18
|
+
password: string | null;
|
|
19
|
+
}): string;
|
|
20
|
+
/**
|
|
21
|
+
* Structure-only decode (NO verification) so the reset route can learn which user to
|
|
22
|
+
* load before verifying. Never trust the result without verify().
|
|
23
|
+
*/
|
|
24
|
+
decode(token: string): ResetTokenPayload | null;
|
|
25
|
+
/**
|
|
26
|
+
* Verify against the user's CURRENT password hash: HMAC (timing-safe) + expiry.
|
|
27
|
+
* False on any mismatch, expiry, malformed token, or missing secret.
|
|
28
|
+
*/
|
|
29
|
+
verify(token: string, user: {
|
|
30
|
+
password: string | null;
|
|
31
|
+
}): boolean;
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Reset-token factory. `secret` is read per call (pass `() => process.env.AUTH_SECRET`)
|
|
35
|
+
* so an unset secret degrades per-request rather than at module load.
|
|
36
|
+
*/
|
|
37
|
+
export declare function createResetTokens(opts: {
|
|
38
|
+
secret: () => string | undefined;
|
|
39
|
+
ttlMs?: number;
|
|
40
|
+
}): ResetTokens;
|
|
41
|
+
/** Sign an opaque state string with an expiry — store it in an httpOnly cookie. */
|
|
42
|
+
export declare function makeStateToken(secret: string, state: string, ttlMs: number): string;
|
|
43
|
+
/** Verify + unwrap a state token: the stored state, or null on any failure/expiry. */
|
|
44
|
+
export declare function readStateToken(secret: string, token: string): string | null;
|
|
45
|
+
//# sourceMappingURL=signedTokens.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signedTokens.d.ts","sourceRoot":"","sources":["../src/signedTokens.ts"],"names":[],"mappings":"AAkBA,yFAAyF;AACzF,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,CAGjE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAgB9E;AAMD,MAAM,WAAW,iBAAiB;IAChC,wCAAwC;IACxC,CAAC,EAAE,MAAM,CAAC;IACV,8BAA8B;IAC9B,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,WAAW;IAC1B,iFAAiF;IACjF,IAAI,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,MAAM,CAAC;IAC5D;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAAC;IAChD;;;OAGG;IACH,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,OAAO,CAAC;CACnE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,MAAM,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,GAAG,WAAW,CA0Cd;AAMD,mFAAmF;AACnF,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED,sFAAsF;AACtF,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAK3E"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { createHmac, timingSafeEqual } from 'node:crypto';
|
|
2
|
+
/**
|
|
3
|
+
* Stateless HMAC-signed auth artifacts: `${payloadB64url}.${hmacB64url}`, verified with
|
|
4
|
+
* timingSafeEqual — no server-side token store. Payloads are unencrypted b64url JSON:
|
|
5
|
+
* they carry only ids and expiries, nothing secret; the HMAC is what makes them
|
|
6
|
+
* unforgeable.
|
|
7
|
+
*
|
|
8
|
+
* The password-reset variant additionally mixes the user's CURRENT password hash into
|
|
9
|
+
* the HMAC key (`secret + ':' + passwordHash`). A successful reset changes the hash, so
|
|
10
|
+
* every outstanding token for that user stops verifying — single-use without any
|
|
11
|
+
* bookkeeping. This trick is the reason to use these over random-token-in-a-table.
|
|
12
|
+
*/
|
|
13
|
+
function hmacB64url(key, data) {
|
|
14
|
+
return createHmac('sha256', key).update(data).digest('base64url');
|
|
15
|
+
}
|
|
16
|
+
/** `${b64url(JSON payload)}.${hmac}` — the signing primitive behind every token here. */
|
|
17
|
+
export function signPayload(key, payload) {
|
|
18
|
+
const payloadB64url = Buffer.from(JSON.stringify(payload), 'utf8').toString('base64url');
|
|
19
|
+
return `${payloadB64url}.${hmacB64url(key, payloadB64url)}`;
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Verify a signed token's HMAC (timing-safe) and return its decoded payload, or null.
|
|
23
|
+
* Expiry is the caller's concern — payload shapes differ.
|
|
24
|
+
*/
|
|
25
|
+
export function verifySignedPayload(key, token) {
|
|
26
|
+
const dot = token.indexOf('.');
|
|
27
|
+
if (dot <= 0)
|
|
28
|
+
return null;
|
|
29
|
+
const payloadB64url = token.slice(0, dot);
|
|
30
|
+
const mac = token.slice(dot + 1);
|
|
31
|
+
const macBuf = Buffer.from(mac);
|
|
32
|
+
const expectedBuf = Buffer.from(hmacB64url(key, payloadB64url));
|
|
33
|
+
if (macBuf.length !== expectedBuf.length || !timingSafeEqual(macBuf, expectedBuf)) {
|
|
34
|
+
return null;
|
|
35
|
+
}
|
|
36
|
+
try {
|
|
37
|
+
return JSON.parse(Buffer.from(payloadB64url, 'base64url').toString('utf8'));
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return null;
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
/**
|
|
44
|
+
* Reset-token factory. `secret` is read per call (pass `() => process.env.AUTH_SECRET`)
|
|
45
|
+
* so an unset secret degrades per-request rather than at module load.
|
|
46
|
+
*/
|
|
47
|
+
export function createResetTokens(opts) {
|
|
48
|
+
const ttlMs = opts.ttlMs ?? 3_600_000; // 1 hour
|
|
49
|
+
const resetKey = (passwordHash) => {
|
|
50
|
+
const secret = opts.secret();
|
|
51
|
+
if (!secret)
|
|
52
|
+
throw new Error('auth secret is not set — password-reset tokens are not configured');
|
|
53
|
+
return `${secret}:${passwordHash ?? ''}`;
|
|
54
|
+
};
|
|
55
|
+
const decode = (token) => {
|
|
56
|
+
const dot = token.indexOf('.');
|
|
57
|
+
if (dot <= 0)
|
|
58
|
+
return null;
|
|
59
|
+
let payload;
|
|
60
|
+
try {
|
|
61
|
+
payload = JSON.parse(Buffer.from(token.slice(0, dot), 'base64url').toString('utf8'));
|
|
62
|
+
}
|
|
63
|
+
catch {
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
if (typeof payload?.u !== 'string' || !payload.u)
|
|
67
|
+
return null;
|
|
68
|
+
if (typeof payload.exp !== 'number')
|
|
69
|
+
return null;
|
|
70
|
+
return { u: payload.u, exp: payload.exp };
|
|
71
|
+
};
|
|
72
|
+
return {
|
|
73
|
+
make(user) {
|
|
74
|
+
const payload = { u: user.id, exp: Date.now() + ttlMs };
|
|
75
|
+
return signPayload(resetKey(user.password), payload);
|
|
76
|
+
},
|
|
77
|
+
decode,
|
|
78
|
+
verify(token, user) {
|
|
79
|
+
if (!opts.secret())
|
|
80
|
+
return false;
|
|
81
|
+
let key;
|
|
82
|
+
try {
|
|
83
|
+
key = resetKey(user.password);
|
|
84
|
+
}
|
|
85
|
+
catch {
|
|
86
|
+
return false;
|
|
87
|
+
}
|
|
88
|
+
if (verifySignedPayload(key, token) === null)
|
|
89
|
+
return false;
|
|
90
|
+
const payload = decode(token);
|
|
91
|
+
return payload !== null && Date.now() < payload.exp;
|
|
92
|
+
},
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
// ---------------------------------------------------------------------------
|
|
96
|
+
// One-shot state tokens (OAuth `state` CSRF binding, and similar)
|
|
97
|
+
// ---------------------------------------------------------------------------
|
|
98
|
+
/** Sign an opaque state string with an expiry — store it in an httpOnly cookie. */
|
|
99
|
+
export function makeStateToken(secret, state, ttlMs) {
|
|
100
|
+
return signPayload(secret, { s: state, exp: Date.now() + ttlMs });
|
|
101
|
+
}
|
|
102
|
+
/** Verify + unwrap a state token: the stored state, or null on any failure/expiry. */
|
|
103
|
+
export function readStateToken(secret, token) {
|
|
104
|
+
const payload = verifySignedPayload(secret, token);
|
|
105
|
+
if (!payload || typeof payload.s !== 'string' || !payload.s)
|
|
106
|
+
return null;
|
|
107
|
+
if (typeof payload.exp !== 'number' || Date.now() > payload.exp)
|
|
108
|
+
return null;
|
|
109
|
+
return payload.s;
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=signedTokens.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signedTokens.js","sourceRoot":"","sources":["../src/signedTokens.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@allodium/auth",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.2.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
|
+
"repository": {
|
|
7
|
+
"type": "git",
|
|
8
|
+
"url": "git+https://github.com/glossydev/allodium.git",
|
|
9
|
+
"directory": "packages/auth"
|
|
10
|
+
},
|
|
6
11
|
"type": "module",
|
|
7
12
|
"main": "./dist/index.js",
|
|
8
13
|
"types": "./dist/index.d.ts",
|
|
@@ -10,12 +15,27 @@
|
|
|
10
15
|
".": {
|
|
11
16
|
"types": "./dist/index.d.ts",
|
|
12
17
|
"import": "./dist/index.js"
|
|
13
|
-
}
|
|
18
|
+
},
|
|
19
|
+
"./package.json": "./package.json"
|
|
14
20
|
},
|
|
15
|
-
"files": [
|
|
21
|
+
"files": [
|
|
22
|
+
"dist"
|
|
23
|
+
],
|
|
16
24
|
"scripts": {
|
|
17
25
|
"build": "tsc -p tsconfig.json",
|
|
18
|
-
"typecheck": "tsc -p tsconfig.json --noEmit"
|
|
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"
|
|
28
|
+
},
|
|
29
|
+
"engines": {
|
|
30
|
+
"node": ">=20"
|
|
31
|
+
},
|
|
32
|
+
"peerDependencies": {
|
|
33
|
+
"argon2": ">=0.31.0",
|
|
34
|
+
"drizzle-orm": ">=0.38.0"
|
|
19
35
|
},
|
|
20
|
-
"
|
|
36
|
+
"devDependencies": {
|
|
37
|
+
"@types/node": "^22.0.0",
|
|
38
|
+
"argon2": "^0.44.0",
|
|
39
|
+
"drizzle-orm": "^0.45.0"
|
|
40
|
+
}
|
|
21
41
|
}
|