@commonpub/server 2.44.1 → 2.44.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/publicApi/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGtC,MAAM,MAAM,WAAW,GACnB,SAAS,GACT,WAAW,GACX,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEd,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,IAAI,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;AAEpD;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/publicApi/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGtC,MAAM,MAAM,WAAW,GACnB,SAAS,GACT,WAAW,GACX,WAAW,GACX,SAAS,GACT,SAAS,CAAC;AAEd,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,IAAI,CAAC;IACT,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,KAAK,CAAC;IACV,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;AAEpD;;;;;;;;;;;GAWG;AACH,wBAAsB,kBAAkB,CAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC,CA4BlG"}
|
package/dist/publicApi/auth.js
CHANGED
|
@@ -19,19 +19,26 @@ export async function authenticateApiKey(db, rawToken) {
|
|
|
19
19
|
const prefix = extractPrefix(rawToken);
|
|
20
20
|
if (!prefix)
|
|
21
21
|
return { ok: false, reason: 'malformed' };
|
|
22
|
-
|
|
22
|
+
// 24-char prefix (11 random chars past the fixed head) makes collisions
|
|
23
|
+
// astronomically unlikely, but we still iterate defensively — a future
|
|
24
|
+
// prefix-length change or a monstrously-unlucky collision should never
|
|
25
|
+
// silently reject a valid key. Match count is effectively always 0 or 1
|
|
26
|
+
// in practice, so the loop cost is negligible.
|
|
27
|
+
const rows = await db
|
|
23
28
|
.select()
|
|
24
29
|
.from(apiKeys)
|
|
25
|
-
.where(and(eq(apiKeys.prefix, prefix), isNull(apiKeys.revokedAt)))
|
|
26
|
-
|
|
27
|
-
if (!row)
|
|
30
|
+
.where(and(eq(apiKeys.prefix, prefix), isNull(apiKeys.revokedAt)));
|
|
31
|
+
if (rows.length === 0)
|
|
28
32
|
return { ok: false, reason: 'not_found' };
|
|
29
33
|
const providedHash = hashApiKey(rawToken);
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
+
for (const row of rows) {
|
|
35
|
+
if (!compareKeyHash(providedHash, row.keyHash))
|
|
36
|
+
continue;
|
|
37
|
+
if (row.expiresAt && row.expiresAt.getTime() < Date.now()) {
|
|
38
|
+
return { ok: false, reason: 'expired' };
|
|
39
|
+
}
|
|
40
|
+
return { ok: true, key: row };
|
|
34
41
|
}
|
|
35
|
-
return { ok:
|
|
42
|
+
return { ok: false, reason: 'not_found' };
|
|
36
43
|
}
|
|
37
44
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/publicApi/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAqBtE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAM,EAAE,QAA4B;IAC3E,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAEvD,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAEvD,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/publicApi/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAqBtE;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EAAM,EAAE,QAA4B;IAC3E,IAAI,CAAC,QAAQ;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IAEvD,MAAM,MAAM,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACvC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAEvD,wEAAwE;IACxE,uEAAuE;IACvE,uEAAuE;IACvE,wEAAwE;IACxE,+CAA+C;IAC/C,MAAM,IAAI,GAAG,MAAM,EAAE;SAClB,MAAM,EAAE;SACR,IAAI,CAAC,OAAO,CAAC;SACb,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAErE,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAEjE,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,CAAC,cAAc,CAAC,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC;YAAE,SAAS;QACzD,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC;YAC1D,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC1C,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;IAChC,CAAC;IAED,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AAC5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/publicApi/keys.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"keys.d.ts","sourceRoot":"","sources":["../../src/publicApi/keys.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,YAAY;IAC3B,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC;IACd,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,wBAAgB,cAAc,IAAI,YAAY,CAM7C;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAM9E;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAK7E"}
|
package/dist/publicApi/keys.js
CHANGED
|
@@ -2,13 +2,20 @@ import { randomBytes, createHash, timingSafeEqual } from 'node:crypto';
|
|
|
2
2
|
/**
|
|
3
3
|
* Raw-token format: `cpub_<env>_<type>_<32 random bytes base64url>`.
|
|
4
4
|
*
|
|
5
|
-
* -
|
|
6
|
-
*
|
|
5
|
+
* - PREFIX_BASE is the fixed literal secret scanners (GitGuardian, Gitleaks)
|
|
6
|
+
* recognise.
|
|
7
|
+
* - PREFIX_LENGTH is how many chars of the token we index for O(1) lookup.
|
|
8
|
+
* It includes PREFIX_BASE plus enough random chars that prefix collisions
|
|
9
|
+
* are astronomical. Earlier drafts of this module used length 16 (only 3
|
|
10
|
+
* random chars) — at the birthday bound that gave ~2% collision at 100
|
|
11
|
+
* keys. Current length 24 gives 11 random chars = 64^11 ≈ 2^66 distinct
|
|
12
|
+
* prefixes, so collisions are a practical impossibility — and the auth
|
|
13
|
+
* path still loops defensively in case one ever happens.
|
|
7
14
|
* - 32 random bytes → 256 bits entropy → SHA-256 for storage is fine
|
|
8
15
|
* (bcrypt's KDF cost only matters for low-entropy user-chosen secrets).
|
|
9
16
|
*/
|
|
10
17
|
const PREFIX_BASE = 'cpub_live_ak_';
|
|
11
|
-
const PREFIX_LENGTH =
|
|
18
|
+
const PREFIX_LENGTH = 24;
|
|
12
19
|
export function generateApiKey() {
|
|
13
20
|
const random = randomBytes(32).toString('base64url');
|
|
14
21
|
const token = `${PREFIX_BASE}${random}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../src/publicApi/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEvE
|
|
1
|
+
{"version":3,"file":"keys.js","sourceRoot":"","sources":["../../src/publicApi/keys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEvE;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,GAAG,eAAe,CAAC;AACpC,MAAM,aAAa,GAAG,EAAE,CAAC;AAWzB,MAAM,UAAU,cAAc;IAC5B,MAAM,MAAM,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,GAAG,WAAW,GAAG,MAAM,EAAE,CAAC;IACxC,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAa;IACtC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,WAAmB,EAAE,SAAiB;IACnE,IAAI,WAAW,CAAC,MAAM,KAAK,SAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1D,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACxC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IACxC,OAAO,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,KAAgC;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,IAAI,KAAK,CAAC,MAAM,GAAG,aAAa,GAAG,EAAE;QAAE,OAAO,IAAI,CAAC;IACnD,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;AACvC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@commonpub/server",
|
|
3
|
-
"version": "2.44.
|
|
3
|
+
"version": "2.44.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Framework-agnostic business logic for CommonPub instances",
|
|
6
6
|
"license": "AGPL-3.0-or-later",
|
|
@@ -103,18 +103,18 @@
|
|
|
103
103
|
"LICENSE"
|
|
104
104
|
],
|
|
105
105
|
"dependencies": {
|
|
106
|
-
"@commonpub/schema": "^0.14.
|
|
106
|
+
"@commonpub/schema": "^0.14.1",
|
|
107
107
|
"@mozilla/readability": "^0.6.0",
|
|
108
108
|
"isomorphic-dompurify": "^3.3.0",
|
|
109
109
|
"linkedom": "^0.18.12",
|
|
110
110
|
"turndown": "^7.2.4",
|
|
111
|
-
"@commonpub/
|
|
112
|
-
"@commonpub/protocol": "0.9.9",
|
|
113
|
-
"@commonpub/learning": "0.5.0",
|
|
111
|
+
"@commonpub/config": "0.11.0",
|
|
114
112
|
"@commonpub/infra": "0.5.1",
|
|
113
|
+
"@commonpub/protocol": "0.9.9",
|
|
115
114
|
"@commonpub/editor": "0.7.9",
|
|
116
115
|
"@commonpub/docs": "0.6.2",
|
|
117
|
-
"@commonpub/
|
|
116
|
+
"@commonpub/learning": "0.5.0",
|
|
117
|
+
"@commonpub/auth": "0.5.1"
|
|
118
118
|
},
|
|
119
119
|
"peerDependencies": {
|
|
120
120
|
"drizzle-orm": "^0.45.1"
|