@plumbus/core 0.6.18 → 0.7.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/CHANGELOG.md +72 -0
- package/README.md +5 -0
- package/dist/.tsbuildinfo +1 -1
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.d.ts +5 -0
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.d.ts.map +1 -0
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.js +15 -0
- package/dist/ai/__typecheck-fixtures__/legacy-cost-api.js.map +1 -0
- package/dist/ai/ai/cost-tracker.d.ts +4 -3
- package/dist/ai/ai/model-pricing.d.ts +14 -5
- package/dist/ai/ai/usage-client.d.ts +2 -0
- package/dist/ai/ai/usage-validation.d.ts +3 -0
- package/dist/ai/ai-service.d.ts.map +1 -1
- package/dist/ai/ai-service.js +101 -33
- package/dist/ai/ai-service.js.map +1 -1
- package/dist/ai/cost-tracker.d.ts +4 -3
- package/dist/ai/cost-tracker.d.ts.map +1 -1
- package/dist/ai/cost-tracker.js +33 -14
- package/dist/ai/cost-tracker.js.map +1 -1
- package/dist/ai/errors/data-errors.d.ts +22 -0
- package/dist/ai/errors/index.d.ts +21 -0
- package/dist/ai/errors/plumbus-error.d.ts +12 -0
- package/dist/ai/index.d.ts +1 -1
- package/dist/ai/index.d.ts.map +1 -1
- package/dist/ai/index.js +1 -1
- package/dist/ai/index.js.map +1 -1
- package/dist/ai/model-pricing.d.ts +14 -5
- package/dist/ai/model-pricing.d.ts.map +1 -1
- package/dist/ai/model-pricing.js +88 -45
- package/dist/ai/model-pricing.js.map +1 -1
- package/dist/ai/provider.d.ts.map +1 -1
- package/dist/ai/provider.js +234 -9
- package/dist/ai/provider.js.map +1 -1
- package/dist/ai/rag/pipeline.d.ts +2 -0
- package/dist/ai/rag/pipeline.d.ts.map +1 -1
- package/dist/ai/rag/pipeline.js +6 -1
- package/dist/ai/rag/pipeline.js.map +1 -1
- package/dist/ai/security.d.ts.map +1 -1
- package/dist/ai/security.js +1 -0
- package/dist/ai/security.js.map +1 -1
- package/dist/ai/tool-loop.d.ts +1 -0
- package/dist/ai/tool-loop.d.ts.map +1 -1
- package/dist/ai/tool-loop.js +23 -4
- package/dist/ai/tool-loop.js.map +1 -1
- package/dist/ai/types/errors.d.ts +14 -0
- package/dist/ai/usage-client.d.ts +2 -0
- package/dist/ai/usage-client.d.ts.map +1 -1
- package/dist/ai/usage-client.js +2 -0
- package/dist/ai/usage-client.js.map +1 -1
- package/dist/ai/usage-validation.d.ts +4 -0
- package/dist/ai/usage-validation.d.ts.map +1 -0
- package/dist/ai/usage-validation.js +23 -0
- package/dist/ai/usage-validation.js.map +1 -0
- package/dist/ai/validation.d.ts +1 -5
- package/dist/ai/validation.d.ts.map +1 -1
- package/dist/api/cookies.d.ts.map +1 -1
- package/dist/api/cookies.js +7 -2
- package/dist/api/cookies.js.map +1 -1
- package/dist/audit/service.d.ts.map +1 -1
- package/dist/audit/service.js +21 -3
- package/dist/audit/service.js.map +1 -1
- package/dist/audit/writer.d.ts.map +1 -1
- package/dist/audit/writer.js +7 -2
- package/dist/audit/writer.js.map +1 -1
- package/dist/auth/adapter.d.ts +5 -1
- package/dist/auth/adapter.d.ts.map +1 -1
- package/dist/auth/adapter.js +36 -6
- package/dist/auth/adapter.js.map +1 -1
- package/dist/auth/index.d.ts +1 -0
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +1 -0
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/jwt-policy.d.ts +3 -0
- package/dist/auth/jwt-policy.d.ts.map +1 -0
- package/dist/auth/jwt-policy.js +11 -0
- package/dist/auth/jwt-policy.js.map +1 -0
- package/dist/auth/oidc-adapter.d.ts.map +1 -1
- package/dist/auth/oidc-adapter.js +30 -13
- package/dist/auth/oidc-adapter.js.map +1 -1
- package/dist/auth/saml-adapter.d.ts +7 -1
- package/dist/auth/saml-adapter.d.ts.map +1 -1
- package/dist/auth/saml-adapter.js +42 -5
- package/dist/auth/saml-adapter.js.map +1 -1
- package/dist/cli/commands/create.d.ts.map +1 -1
- package/dist/cli/commands/create.js +21 -0
- package/dist/cli/commands/create.js.map +1 -1
- package/dist/cli/commands/generate.d.ts.map +1 -1
- package/dist/cli/commands/generate.js +4 -3
- package/dist/cli/commands/generate.js.map +1 -1
- package/dist/cli/commands/init.d.ts +1 -1
- package/dist/cli/commands/init.d.ts.map +1 -1
- package/dist/cli/commands/init.js +7 -1
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/mcp.d.ts.map +1 -1
- package/dist/cli/commands/mcp.js +4 -3
- package/dist/cli/commands/mcp.js.map +1 -1
- package/dist/cli/commands/translation.d.ts.map +1 -1
- package/dist/cli/commands/translation.js +8 -4
- package/dist/cli/commands/translation.js.map +1 -1
- package/dist/cli/mcp-serve-context.d.ts.map +1 -1
- package/dist/cli/mcp-serve-context.js +25 -6
- package/dist/cli/mcp-serve-context.js.map +1 -1
- package/dist/cli/scaffold-validation.d.ts +6 -0
- package/dist/cli/scaffold-validation.d.ts.map +1 -0
- package/dist/cli/scaffold-validation.js +57 -0
- package/dist/cli/scaffold-validation.js.map +1 -0
- package/dist/cli/scaffold-write.d.ts.map +1 -1
- package/dist/cli/scaffold-write.js +13 -3
- package/dist/cli/scaffold-write.js.map +1 -1
- package/dist/cli/templates/resources.d.ts.map +1 -1
- package/dist/cli/templates/resources.js +10 -0
- package/dist/cli/templates/resources.js.map +1 -1
- package/dist/cli/utils.d.ts +1 -1
- package/dist/cli/utils.d.ts.map +1 -1
- package/dist/cli/utils.js +13 -2
- package/dist/cli/utils.js.map +1 -1
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +7 -4
- package/dist/config/loader.js.map +1 -1
- package/dist/errors/http.d.ts.map +1 -1
- package/dist/errors/http.js +8 -3
- package/dist/errors/http.js.map +1 -1
- package/dist/events/queue.d.ts.map +1 -1
- package/dist/events/queue.js +27 -4
- package/dist/events/queue.js.map +1 -1
- package/dist/execution/capability-executor.js +2 -1
- package/dist/execution/capability-executor.js.map +1 -1
- package/dist/execution/context-factory.d.ts.map +1 -1
- package/dist/execution/context-factory.js +6 -2
- package/dist/execution/context-factory.js.map +1 -1
- package/dist/flows/engine.d.ts.map +1 -1
- package/dist/flows/engine.js +28 -18
- package/dist/flows/engine.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/runtime/start-worker-pool.d.ts.map +1 -1
- package/dist/runtime/start-worker-pool.js +21 -9
- package/dist/runtime/start-worker-pool.js.map +1 -1
- package/dist/server/bootstrap.d.ts.map +1 -1
- package/dist/server/bootstrap.js +13 -9
- package/dist/server/bootstrap.js.map +1 -1
- package/dist/testing/e2e.js +1 -1
- package/dist/testing/e2e.js.map +1 -1
- package/dist/types/audit.d.ts +2 -0
- package/dist/types/audit.d.ts.map +1 -1
- package/dist/types/context.d.ts +11 -1
- package/dist/types/context.d.ts.map +1 -1
- package/instructions/README.md +1 -0
- package/instructions/ai.md +11 -3
- package/instructions/deployment.md +5 -2
- package/instructions/flows.md +3 -0
- package/instructions/framework.md +7 -0
- package/instructions/mcp.md +5 -2
- package/instructions/peer-dependencies.md +28 -64
- package/instructions/security.md +8 -1
- package/instructions/upgrading-0.5-capabilities.md +4 -1
- package/instructions/upgrading-security-release.md +65 -0
- package/package.json +11 -10
package/dist/api/cookies.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/api/cookies.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,MAA0B;IAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAA2B,
|
|
1
|
+
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../src/api/cookies.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,iBAAiB,CAAC,MAA0B;IAC1D,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,OAAO,GAA2B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IAErC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAC5B,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC;YACX,SAAS;QACX,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QACzC,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,SAAS;QACX,CAAC;QAED,IAAI,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,SAAS;QACnC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC;YACjC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;YACrB,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACrB,SAAS;QACX,CAAC;QAED,MAAM,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC9C,IAAI,CAAC;YACH,OAAO,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;QAC3B,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGxD,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,kBAAkB,CAAC;IACvB,IAAI,EAAE,WAAW,CAAC;IAClB,mEAAmE;IACnE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,kBAAkB,GAAG,YAAY,CAwC3E"}
|
package/dist/audit/service.js
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { createErrorService } from '../errors/index.js';
|
|
1
3
|
import { createDatabaseAuditWriter } from './writer.js';
|
|
2
4
|
/**
|
|
3
5
|
* Creates a persistent AuditService that writes records to PostgreSQL.
|
|
@@ -7,13 +9,19 @@ export function createAuditService(config) {
|
|
|
7
9
|
const writer = config.writer ?? createDatabaseAuditWriter(db);
|
|
8
10
|
return {
|
|
9
11
|
async record(eventType, metadata) {
|
|
10
|
-
const
|
|
12
|
+
const parsedOutcome = z
|
|
13
|
+
.enum(['success', 'failure', 'denied'])
|
|
14
|
+
.safeParse(metadata?.outcome ?? 'success');
|
|
15
|
+
if (!parsedOutcome.success)
|
|
16
|
+
throw createErrorService().validation('Invalid audit outcome');
|
|
17
|
+
const outcome = parsedOutcome.data;
|
|
11
18
|
const maskedFields = metadata?._maskedFields ?? undefined;
|
|
12
19
|
const storedMetadata = metadata ? { ...metadata } : undefined;
|
|
13
20
|
if (storedMetadata) {
|
|
14
21
|
delete storedMetadata._maskedFields;
|
|
15
22
|
}
|
|
16
|
-
|
|
23
|
+
const event = {
|
|
24
|
+
id: crypto.randomUUID(),
|
|
17
25
|
actor: auth.userId ?? 'anonymous',
|
|
18
26
|
tenantId: auth.tenantId,
|
|
19
27
|
component,
|
|
@@ -22,7 +30,17 @@ export function createAuditService(config) {
|
|
|
22
30
|
timestamp: new Date(),
|
|
23
31
|
metadata: storedMetadata,
|
|
24
32
|
maskedFields,
|
|
25
|
-
}
|
|
33
|
+
};
|
|
34
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
35
|
+
try {
|
|
36
|
+
await writer.write(event);
|
|
37
|
+
return;
|
|
38
|
+
}
|
|
39
|
+
catch (error) {
|
|
40
|
+
if (attempt === 2)
|
|
41
|
+
throw createErrorService().internal('Audit persistence failed', { cause: error });
|
|
42
|
+
}
|
|
43
|
+
}
|
|
26
44
|
},
|
|
27
45
|
};
|
|
28
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../src/audit/service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAIxD,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAUxD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAA0B;IAC3D,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,GAAG,QAAQ,EAAE,GAAG,MAAM,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,yBAAyB,CAAC,EAAE,CAAC,CAAC;IAE9D,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,SAAiB,EAAE,QAAkC;YAChE,MAAM,aAAa,GAAG,CAAC;iBACpB,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;iBACtC,SAAS,CAAC,QAAQ,EAAE,OAAO,IAAI,SAAS,CAAC,CAAC;YAC7C,IAAI,CAAC,aAAa,CAAC,OAAO;gBAAE,MAAM,kBAAkB,EAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;YAC3F,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC;YACnC,MAAM,YAAY,GAAI,QAAQ,EAAE,aAA0B,IAAI,SAAS,CAAC;YAExE,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9D,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO,cAAc,CAAC,aAAa,CAAC;YACtC,CAAC;YAED,MAAM,KAAK,GAAG;gBACZ,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE;gBACvB,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,WAAW;gBACjC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,SAAS;gBACT,MAAM,EAAE,SAAS;gBACjB,OAAO;gBACP,SAAS,EAAE,IAAI,IAAI,EAAE;gBACrB,QAAQ,EAAE,cAAc;gBACxB,YAAY;aACb,CAAC;YACF,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;gBAC7C,IAAI,CAAC;oBACH,MAAM,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC1B,OAAO;gBACT,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,OAAO,KAAK,CAAC;wBACf,MAAM,kBAAkB,EAAE,CAAC,QAAQ,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;gBACtF,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGjE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"writer.d.ts","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,KAAK,EAAc,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGjE,wBAAgB,yBAAyB,CAAC,EAAE,EAAE,kBAAkB,GAAG,WAAW,CAmB7E"}
|
package/dist/audit/writer.js
CHANGED
|
@@ -2,7 +2,10 @@ import { auditRecords } from './schema.js';
|
|
|
2
2
|
export function createDatabaseAuditWriter(db) {
|
|
3
3
|
return {
|
|
4
4
|
async write(event) {
|
|
5
|
-
await db
|
|
5
|
+
await db
|
|
6
|
+
.insert(auditRecords)
|
|
7
|
+
.values({
|
|
8
|
+
id: event.id ?? crypto.randomUUID(),
|
|
6
9
|
actor: event.actor ?? 'anonymous',
|
|
7
10
|
tenantId: event.tenantId ?? null,
|
|
8
11
|
component: event.component,
|
|
@@ -10,7 +13,9 @@ export function createDatabaseAuditWriter(db) {
|
|
|
10
13
|
outcome: event.outcome,
|
|
11
14
|
metadata: event.metadata ?? null,
|
|
12
15
|
maskedFields: event.maskedFields ?? null,
|
|
13
|
-
|
|
16
|
+
timestamp: event.timestamp ?? new Date(),
|
|
17
|
+
})
|
|
18
|
+
.onConflictDoNothing({ target: auditRecords.id });
|
|
14
19
|
},
|
|
15
20
|
};
|
|
16
21
|
}
|
package/dist/audit/writer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,UAAU,yBAAyB,CAAC,EAAsB;IAC9D,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,KAAiB;YAC3B,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"writer.js","sourceRoot":"","sources":["../../src/audit/writer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,UAAU,yBAAyB,CAAC,EAAsB;IAC9D,OAAO;QACL,KAAK,CAAC,KAAK,CAAC,KAAiB;YAC3B,MAAM,EAAE;iBACL,MAAM,CAAC,YAAY,CAAC;iBACpB,MAAM,CAAC;gBACN,EAAE,EAAE,KAAK,CAAC,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE;gBACnC,KAAK,EAAE,KAAK,CAAC,KAAK,IAAI,WAAW;gBACjC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;gBAChC,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,IAAI;gBAChC,YAAY,EAAE,KAAK,CAAC,YAAY,IAAI,IAAI;gBACxC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE;aACzC,CAAC;iBACD,mBAAmB,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACtD,CAAC;KACF,CAAC;AACJ,CAAC"}
|
package/dist/auth/adapter.d.ts
CHANGED
|
@@ -17,6 +17,8 @@ export interface JwtAdapterConfig {
|
|
|
17
17
|
issuer?: string;
|
|
18
18
|
/** Expected audience (aud claim) */
|
|
19
19
|
audience?: string;
|
|
20
|
+
/** Optional maximum accepted token lifetime in seconds; omitted preserves issuer-selected finite lifetimes. */
|
|
21
|
+
maxTokenLifetimeSeconds?: number;
|
|
20
22
|
/**
|
|
21
23
|
* Map JWT claims to AuthContext fields.
|
|
22
24
|
* Defaults: sub→userId, roles→roles, scope→scopes, tenant_id→tenantId
|
|
@@ -45,7 +47,9 @@ export interface SignJwtOptions {
|
|
|
45
47
|
expiresIn?: number;
|
|
46
48
|
/** Issuer */
|
|
47
49
|
issuer?: string;
|
|
48
|
-
/**
|
|
50
|
+
/** Expected token audience */
|
|
51
|
+
audience?: string;
|
|
52
|
+
/** Additional claims (reserved authentication claims are rejected) */
|
|
49
53
|
claims?: Record<string, unknown>;
|
|
50
54
|
}
|
|
51
55
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/auth/adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/auth/adapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B;;;OAGG;IACH,YAAY,CAAC,mBAAmB,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC;CACpF;AAED,MAAM,WAAW,gBAAgB;IAC/B,gEAAgE;IAChE,MAAM,EAAE,MAAM,CAAC;IACf,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,+GAA+G;IAC/G,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;CACzC;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAeD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,WAAW,CAgFtE;AA6DD,MAAM,WAAW,cAAc;IAC7B,yCAAyC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,uBAAuB;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,YAAY;IACZ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,gBAAgB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;;GAGG;AACH,wBAAgB,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,MAAM,CAsCvD"}
|
package/dist/auth/adapter.js
CHANGED
|
@@ -1,3 +1,6 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { createErrorService } from '../errors/index.js';
|
|
3
|
+
import { isValidJwtSecret } from './jwt-policy.js';
|
|
1
4
|
import { createHmac, timingSafeEqual } from 'node:crypto';
|
|
2
5
|
const defaultClaimMapping = {
|
|
3
6
|
userId: 'sub',
|
|
@@ -11,9 +14,12 @@ const defaultClaimMapping = {
|
|
|
11
14
|
*/
|
|
12
15
|
const MIN_JWT_SECRET_LENGTH = 32;
|
|
13
16
|
export function createJwtAdapter(config) {
|
|
14
|
-
if (config.secret
|
|
15
|
-
throw
|
|
17
|
+
if (!isValidJwtSecret(config.secret)) {
|
|
18
|
+
throw createErrorService().validation(`JWT secret must be at least ${MIN_JWT_SECRET_LENGTH} non-padding characters and must not be a development placeholder`);
|
|
16
19
|
}
|
|
20
|
+
if (config.maxTokenLifetimeSeconds != null &&
|
|
21
|
+
!z.number().finite().positive().safeParse(config.maxTokenLifetimeSeconds).success)
|
|
22
|
+
throw createErrorService().validation('Invalid JWT maximum lifetime');
|
|
17
23
|
const mapping = { ...defaultClaimMapping, ...config.claimMapping };
|
|
18
24
|
return {
|
|
19
25
|
async authenticate(authorizationHeader) {
|
|
@@ -38,11 +44,24 @@ export function createJwtAdapter(config) {
|
|
|
38
44
|
return null;
|
|
39
45
|
}
|
|
40
46
|
}
|
|
41
|
-
|
|
42
|
-
const
|
|
43
|
-
|
|
47
|
+
const now = Date.now() / 1000;
|
|
48
|
+
const times = z
|
|
49
|
+
.object({
|
|
50
|
+
exp: z.number().finite(),
|
|
51
|
+
iat: z.number().finite().optional(),
|
|
52
|
+
nbf: z.number().finite().optional(),
|
|
53
|
+
})
|
|
54
|
+
.safeParse(payload);
|
|
55
|
+
if (!times.success)
|
|
56
|
+
return null;
|
|
57
|
+
const { exp, iat, nbf } = times.data;
|
|
58
|
+
if (exp <= now || (nbf != null && nbf > now) || (iat != null && iat > now))
|
|
59
|
+
return null;
|
|
60
|
+
if (config.maxTokenLifetimeSeconds != null &&
|
|
61
|
+
exp - (iat ?? now) > config.maxTokenLifetimeSeconds)
|
|
62
|
+
return null;
|
|
63
|
+
if (!z.string().min(1).safeParse(payload[mapping.userId]).success)
|
|
44
64
|
return null;
|
|
45
|
-
}
|
|
46
65
|
// Map claims to AuthContext
|
|
47
66
|
const rawRoles = payload[mapping.roles];
|
|
48
67
|
const rawScopes = payload[mapping.scopes];
|
|
@@ -121,6 +140,15 @@ function verifyJwtHs256(token, secret) {
|
|
|
121
140
|
* Returns the signed token string (header.payload.signature).
|
|
122
141
|
*/
|
|
123
142
|
export function signJwt(options) {
|
|
143
|
+
const reserved = ['sub', 'iat', 'exp', 'nbf', 'iss', 'aud', 'roles', 'scope', 'tenant_id'];
|
|
144
|
+
if (reserved.some((claim) => Object.hasOwn(options.claims ?? {}, claim)))
|
|
145
|
+
throw createErrorService().validation('JWT additional claims must not override reserved authentication claims');
|
|
146
|
+
if (!z
|
|
147
|
+
.number()
|
|
148
|
+
.finite()
|
|
149
|
+
.positive()
|
|
150
|
+
.safeParse(options.expiresIn ?? 86400).success)
|
|
151
|
+
throw createErrorService().validation('Invalid JWT expiration');
|
|
124
152
|
const now = Math.floor(Date.now() / 1000);
|
|
125
153
|
const exp = now + (options.expiresIn ?? 86400);
|
|
126
154
|
const header = { alg: 'HS256', typ: 'JWT' };
|
|
@@ -138,6 +166,8 @@ export function signJwt(options) {
|
|
|
138
166
|
payload.tenant_id = options.tenantId;
|
|
139
167
|
if (options.issuer)
|
|
140
168
|
payload.iss = options.issuer;
|
|
169
|
+
if (options.audience)
|
|
170
|
+
payload.aud = options.audience;
|
|
141
171
|
const headerB64 = Buffer.from(JSON.stringify(header)).toString('base64url');
|
|
142
172
|
const payloadB64 = Buffer.from(JSON.stringify(payload)).toString('base64url');
|
|
143
173
|
const signature = createHmac('sha256', options.secret)
|
package/dist/auth/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/auth/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/auth/adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/index.d.ts
CHANGED
|
@@ -10,4 +10,5 @@ export { createSamlAdapter } from './saml-adapter.js';
|
|
|
10
10
|
export type { SamlAdapterConfig } from './saml-adapter.js';
|
|
11
11
|
export { createScimService } from './scim.js';
|
|
12
12
|
export type { ScimEmail, ScimError, ScimListResponse, ScimService, ScimServiceConfig, ScimUser, ScimUserRepository, ScimUserResource, } from './scim.js';
|
|
13
|
+
export { isValidJwtSecret } from './jwt-policy.js';
|
|
13
14
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/auth/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACzD,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnG,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mCAAmC,EACnC,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,YAAY,EAAE,iBAAiB,EAAE,UAAU,IAAI,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,YAAY,EACV,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACzD,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnG,YAAY,EACV,qBAAqB,EACrB,oBAAoB,EACpB,oBAAoB,GACrB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,mCAAmC,EACnC,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,YAAY,EAAE,iBAAiB,EAAE,UAAU,IAAI,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,YAAY,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,YAAY,EACV,SAAS,EACT,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EACjB,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,GACjB,MAAM,WAAW,CAAC;AAEnB,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC"}
|
package/dist/auth/index.js
CHANGED
|
@@ -7,4 +7,5 @@ export { createOidcAdapter } from './oidc-adapter.js';
|
|
|
7
7
|
export { hashPassword, verifyPassword } from './password.js';
|
|
8
8
|
export { createSamlAdapter } from './saml-adapter.js';
|
|
9
9
|
export { createScimService } from './scim.js';
|
|
10
|
+
export { isValidJwtSecret } from './jwt-policy.js';
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,iEAAiE;AACjE,gFAAgF;AAEhF,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAOzD,OAAO,EACL,mCAAmC,EACnC,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA,oBAAoB;AACpB,iEAAiE;AACjE,gFAAgF;AAEhF,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAOzD,OAAO,EACL,mCAAmC,EACnC,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAY9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jwt-policy.d.ts","sourceRoot":"","sources":["../../src/auth/jwt-policy.ts"],"names":[],"mappings":"AAUA,oFAAoF;AACpF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,OAAO,GAAG,MAAM,IAAI,MAAM,CAElE"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
const secretSchema = z.string().refine((secret) => {
|
|
3
|
+
const value = secret.trim();
|
|
4
|
+
return (value.length >= 32 &&
|
|
5
|
+
!['development-secret', 'development-secret-placeholder-32chars-min'].includes(value));
|
|
6
|
+
});
|
|
7
|
+
/** Reject known shared defaults and short/padded HMAC keys in every environment. */
|
|
8
|
+
export function isValidJwtSecret(secret) {
|
|
9
|
+
return secretSchema.safeParse(secret).success;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=jwt-policy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jwt-policy.js","sourceRoot":"","sources":["../../src/auth/jwt-policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,YAAY,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5B,OAAO,CACL,KAAK,CAAC,MAAM,IAAI,EAAE;QAClB,CAAC,CAAC,oBAAoB,EAAE,4CAA4C,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CACtF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,oFAAoF;AACpF,MAAM,UAAU,gBAAgB,CAAC,MAAe;IAC9C,OAAO,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;AAChD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc-adapter.d.ts","sourceRoot":"","sources":["../../src/auth/oidc-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAMjE,MAAM,WAAW,iBAAiB;IAChC,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACxC,8EAA8E;IAC9E,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW,
|
|
1
|
+
{"version":3,"file":"oidc-adapter.d.ts","sourceRoot":"","sources":["../../src/auth/oidc-adapter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAMjE,MAAM,WAAW,iBAAiB;IAChC,uDAAuD;IACvD,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,6DAA6D;IAC7D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,YAAY,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC;IACxC,8EAA8E;IAC9E,OAAO,CAAC,EAAE,OAAO,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAgBD;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW,CA6HxE"}
|
|
@@ -15,12 +15,14 @@ export function createOidcAdapter(config) {
|
|
|
15
15
|
const cacheTtl = (config.jwksCacheTtl ?? 3600) * 1000;
|
|
16
16
|
const fetchFn = config.fetchFn ?? globalThis.fetch;
|
|
17
17
|
let jwksCache = null;
|
|
18
|
+
let lastRefreshAt = -Infinity;
|
|
19
|
+
let refreshPromise;
|
|
18
20
|
let discoveredJwksUri = config.jwksUri ?? null;
|
|
19
21
|
async function discoverJwksUri() {
|
|
20
22
|
if (discoveredJwksUri)
|
|
21
23
|
return discoveredJwksUri;
|
|
22
24
|
const discoveryUrl = `${config.issuer.replace(/\/$/, '')}/.well-known/openid-configuration`;
|
|
23
|
-
const response = await fetchFn(discoveryUrl);
|
|
25
|
+
const response = await fetchFn(discoveryUrl, { signal: AbortSignal.timeout(10_000) });
|
|
24
26
|
if (!response.ok) {
|
|
25
27
|
throw new Error(`OIDC discovery failed: ${response.status}`);
|
|
26
28
|
}
|
|
@@ -31,19 +33,31 @@ export function createOidcAdapter(config) {
|
|
|
31
33
|
discoveredJwksUri = doc.jwks_uri;
|
|
32
34
|
return discoveredJwksUri;
|
|
33
35
|
}
|
|
34
|
-
async function fetchJwks() {
|
|
35
|
-
if (jwksCache && jwksCache.expiresAt > Date.now())
|
|
36
|
+
async function fetchJwks(force = false) {
|
|
37
|
+
if (!force && jwksCache && jwksCache.expiresAt > Date.now())
|
|
36
38
|
return jwksCache.keys;
|
|
39
|
+
if (refreshPromise)
|
|
40
|
+
return refreshPromise;
|
|
41
|
+
// One bounded cooldown covers all unknown kids, including random-kid floods.
|
|
42
|
+
if (Date.now() - lastRefreshAt < 30_000)
|
|
43
|
+
return jwksCache?.keys ?? [];
|
|
44
|
+
lastRefreshAt = Date.now();
|
|
45
|
+
refreshPromise = (async () => {
|
|
46
|
+
const jwksUri = await discoverJwksUri();
|
|
47
|
+
const response = await fetchFn(jwksUri, { signal: AbortSignal.timeout(10_000) });
|
|
48
|
+
if (!response.ok)
|
|
49
|
+
throw new Error(`JWKS fetch failed: ${response.status}`);
|
|
50
|
+
const jwks = (await response.json());
|
|
51
|
+
const keys = jwks.keys ?? [];
|
|
52
|
+
jwksCache = { keys, expiresAt: Date.now() + cacheTtl };
|
|
53
|
+
return keys;
|
|
54
|
+
})();
|
|
55
|
+
try {
|
|
56
|
+
return await refreshPromise;
|
|
37
57
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
if (!response.ok) {
|
|
41
|
-
throw new Error(`JWKS fetch failed: ${response.status}`);
|
|
58
|
+
finally {
|
|
59
|
+
refreshPromise = undefined;
|
|
42
60
|
}
|
|
43
|
-
const jwks = (await response.json());
|
|
44
|
-
const keys = jwks.keys ?? [];
|
|
45
|
-
jwksCache = { keys, expiresAt: Date.now() + cacheTtl };
|
|
46
|
-
return keys;
|
|
47
61
|
}
|
|
48
62
|
function findKey(kid, keys) {
|
|
49
63
|
if (kid) {
|
|
@@ -89,9 +103,8 @@ export function createOidcAdapter(config) {
|
|
|
89
103
|
const jwk = findKey(header.kid, keys);
|
|
90
104
|
if (!jwk) {
|
|
91
105
|
// Key not found — try refreshing cache in case of rotation
|
|
92
|
-
jwksCache = null;
|
|
93
106
|
try {
|
|
94
|
-
keys = await fetchJwks();
|
|
107
|
+
keys = await fetchJwks(true);
|
|
95
108
|
}
|
|
96
109
|
catch {
|
|
97
110
|
return null;
|
|
@@ -106,6 +119,10 @@ export function createOidcAdapter(config) {
|
|
|
106
119
|
};
|
|
107
120
|
}
|
|
108
121
|
function verifyAndMap(_token, headerStr, payloadStr, signatureStr, jwk, alg, config, mapping) {
|
|
122
|
+
if ((jwk.alg && jwk.alg !== alg) ||
|
|
123
|
+
(alg === 'RS256' && jwk.kty !== 'RSA') ||
|
|
124
|
+
(alg === 'ES256' && (jwk.kty !== 'EC' || jwk.crv !== 'P-256')))
|
|
125
|
+
return null;
|
|
109
126
|
// Verify signature
|
|
110
127
|
try {
|
|
111
128
|
const publicKey = createPublicKey({ key: jwk, format: 'jwk' });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc-adapter.js","sourceRoot":"","sources":["../../src/auth/oidc-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAwCtD,MAAM,mBAAmB,GAAoB;IAC3C,MAAM,EAAE,KAAK;IACb,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,OAAO;IACf,QAAQ,EAAE,WAAW;CACtB,CAAC;AAEF,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAEzD;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAAyB;IACzD,MAAM,OAAO,GAAG,EAAE,GAAG,mBAAmB,EAAE,GAAG,MAAM,CAAC,YAAY,EAAE,CAAC;IACnE,MAAM,QAAQ,GAAG,CAAC,MAAM,CAAC,YAAY,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC;IACtD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,UAAU,CAAC,KAAK,CAAC;IAEnD,IAAI,SAAS,GAAqB,IAAI,CAAC;IACvC,IAAI,iBAAiB,GAAkB,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC;IAE9D,KAAK,UAAU,eAAe;QAC5B,IAAI,iBAAiB;YAAE,OAAO,iBAAiB,CAAC;QAEhD,MAAM,YAAY,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,mCAAmC,CAAC;QAC5F,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"oidc-adapter.js","sourceRoot":"","sources":["../../src/auth/oidc-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,12 @@ export interface SamlAdapterConfig {
|
|
|
7
7
|
issuer: string;
|
|
8
8
|
/** Expected audience (SP entity ID / ACS URL) */
|
|
9
9
|
audience: string;
|
|
10
|
+
/** Assertion consumer endpoint; defaults to audience for compatibility. */
|
|
11
|
+
recipient?: string;
|
|
12
|
+
/** Explicit opt-in to IdP-initiated / bearer assertions without a request ID. */
|
|
13
|
+
allowUnsolicited?: boolean;
|
|
14
|
+
/** Optional atomic replay check for an application-owned synchronous shared store. */
|
|
15
|
+
consumeAssertion?: (id: string, expiresAt: Date) => boolean;
|
|
10
16
|
/** Attribute mapping for SAML claim extraction */
|
|
11
17
|
attributeMapping?: Partial<SamlAttributeMapping>;
|
|
12
18
|
}
|
|
@@ -33,6 +39,6 @@ export interface SamlAuthResult extends AuthContext {
|
|
|
33
39
|
* Response from the IdP (used in SSO callback handlers).
|
|
34
40
|
*/
|
|
35
41
|
export declare function createSamlAdapter(config: SamlAdapterConfig): AuthAdapter & {
|
|
36
|
-
processSamlResponse(samlResponseB64: string): SamlAuthResult | null;
|
|
42
|
+
processSamlResponse(samlResponseB64: string, expectedRequestId?: string): SamlAuthResult | null;
|
|
37
43
|
};
|
|
38
44
|
//# sourceMappingURL=saml-adapter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saml-adapter.d.ts","sourceRoot":"","sources":["../../src/auth/saml-adapter.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAOhD,MAAM,WAAW,iBAAiB;IAChC,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,6CAA6C;IAC7C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"saml-adapter.d.ts","sourceRoot":"","sources":["../../src/auth/saml-adapter.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAOhD,MAAM,WAAW,iBAAiB;IAChC,4DAA4D;IAC5D,cAAc,EAAE,MAAM,CAAC;IACvB,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,iDAAiD;IACjD,QAAQ,EAAE,MAAM,CAAC;IACjB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,sFAAsF;IACtF,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,KAAK,OAAO,CAAC;IAC5D,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,6CAA6C;IAC7C,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACrC,kBAAkB;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB;AAoBD;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,WAAW,GAAG;IAC1E,mBAAmB,CAAC,eAAe,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAAC;CACjG,CAgHA"}
|
|
@@ -25,7 +25,9 @@ function asDomNode(node) {
|
|
|
25
25
|
*/
|
|
26
26
|
export function createSamlAdapter(config) {
|
|
27
27
|
const mapping = { ...defaultAttributeMapping, ...config.attributeMapping };
|
|
28
|
-
|
|
28
|
+
const consumed = new Map();
|
|
29
|
+
const recipient = config.recipient ?? config.audience;
|
|
30
|
+
function parseAssertion(xml, expectedRequestId) {
|
|
29
31
|
let verifiedAssertion;
|
|
30
32
|
try {
|
|
31
33
|
verifiedAssertion = verifySignedAssertion(xml, config.idpCertificate);
|
|
@@ -40,6 +42,41 @@ export function createSamlAdapter(config) {
|
|
|
40
42
|
return null;
|
|
41
43
|
if (!validateConditions(verifiedAssertion, config.audience))
|
|
42
44
|
return null;
|
|
45
|
+
if (!expectedRequestId && !config.allowUnsolicited)
|
|
46
|
+
return null;
|
|
47
|
+
const assertion = xpath.select(ASSERTION_XPATH, asDomNode(verifiedAssertion))[0];
|
|
48
|
+
const assertionId = assertion?.getAttribute('ID');
|
|
49
|
+
if (!assertionId)
|
|
50
|
+
return null;
|
|
51
|
+
const confirmations = xpath.select("//*[local-name()='SubjectConfirmationData' and namespace-uri()='urn:oasis:names:tc:SAML:2.0:assertion']", asDomNode(verifiedAssertion));
|
|
52
|
+
if (confirmations.length !== 1)
|
|
53
|
+
return null;
|
|
54
|
+
const confirmation = confirmations[0];
|
|
55
|
+
if (confirmation?.getAttribute('Recipient') !== recipient)
|
|
56
|
+
return null;
|
|
57
|
+
if (expectedRequestId && confirmation.getAttribute('InResponseTo') !== expectedRequestId)
|
|
58
|
+
return null;
|
|
59
|
+
const confirmationExpiry = Date.parse(confirmation.getAttribute('NotOnOrAfter') ?? '');
|
|
60
|
+
if (!Number.isFinite(confirmationExpiry) || confirmationExpiry <= Date.now())
|
|
61
|
+
return null;
|
|
62
|
+
const rawDoc = new DOMParser().parseFromString(xml, 'text/xml');
|
|
63
|
+
const response = rawDoc.documentElement;
|
|
64
|
+
if (response?.localName === 'Response') {
|
|
65
|
+
if (response.getAttribute('Destination') !== recipient)
|
|
66
|
+
return null;
|
|
67
|
+
if (expectedRequestId && response.getAttribute('InResponseTo') !== expectedRequestId)
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
const conditions = xpath.select("//*[local-name()='Conditions']", asDomNode(verifiedAssertion))[0];
|
|
71
|
+
const expiry = Math.min(confirmationExpiry, Date.parse(conditions?.getAttribute('NotOnOrAfter') ?? ''));
|
|
72
|
+
for (const [id, expiresAt] of consumed)
|
|
73
|
+
if (expiresAt <= Date.now())
|
|
74
|
+
consumed.delete(id);
|
|
75
|
+
if (consumed.has(assertionId) || consumed.size >= 10_000)
|
|
76
|
+
return null;
|
|
77
|
+
if (config.consumeAssertion && config.consumeAssertion(assertionId, new Date(expiry)) !== true)
|
|
78
|
+
return null;
|
|
79
|
+
consumed.set(assertionId, expiry);
|
|
43
80
|
const nameId = readElementText(verifiedAssertion, 'NameID') ?? '';
|
|
44
81
|
const attributes = extractAttributes(verifiedAssertion);
|
|
45
82
|
const userIdValues = attributes[mapping.userId] ?? [];
|
|
@@ -76,7 +113,7 @@ export function createSamlAdapter(config) {
|
|
|
76
113
|
}
|
|
77
114
|
return parseAssertion(xml);
|
|
78
115
|
},
|
|
79
|
-
processSamlResponse(samlResponseB64) {
|
|
116
|
+
processSamlResponse(samlResponseB64, expectedRequestId) {
|
|
80
117
|
let xml;
|
|
81
118
|
try {
|
|
82
119
|
xml = Buffer.from(samlResponseB64, 'base64').toString('utf-8');
|
|
@@ -84,7 +121,7 @@ export function createSamlAdapter(config) {
|
|
|
84
121
|
catch {
|
|
85
122
|
return null;
|
|
86
123
|
}
|
|
87
|
-
return parseAssertion(xml);
|
|
124
|
+
return parseAssertion(xml, expectedRequestId);
|
|
88
125
|
},
|
|
89
126
|
};
|
|
90
127
|
}
|
|
@@ -124,14 +161,14 @@ function validateConditions(assertionDoc, audience) {
|
|
|
124
161
|
const notBefore = conditions.getAttribute('NotBefore');
|
|
125
162
|
if (notBefore) {
|
|
126
163
|
const notBeforeMs = new Date(notBefore).getTime();
|
|
127
|
-
if (Date.now() < notBeforeMs
|
|
164
|
+
if (!Number.isFinite(notBeforeMs) || Date.now() < notBeforeMs)
|
|
128
165
|
return false;
|
|
129
166
|
}
|
|
130
167
|
const notOnOrAfter = conditions.getAttribute('NotOnOrAfter');
|
|
131
168
|
if (!notOnOrAfter)
|
|
132
169
|
return false;
|
|
133
170
|
const notOnOrAfterMs = new Date(notOnOrAfter).getTime();
|
|
134
|
-
if (Date.now() >= notOnOrAfterMs
|
|
171
|
+
if (!Number.isFinite(notOnOrAfterMs) || Date.now() >= notOnOrAfterMs)
|
|
135
172
|
return false;
|
|
136
173
|
const audienceNodes = xpath.select("//*[local-name()='Audience' and namespace-uri()='urn:oasis:names:tc:SAML:2.0:assertion']", asDomNode(assertionDoc));
|
|
137
174
|
if (audienceNodes.length === 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saml-adapter.js","sourceRoot":"","sources":["../../src/auth/saml-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,GAGV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"saml-adapter.js","sourceRoot":"","sources":["../../src/auth/saml-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/create.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/create.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKzC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAqBD,wEAAwE;AACxE,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,GACrB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CA6NrB;AAoTD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA4D5D"}
|
|
@@ -1,10 +1,30 @@
|
|
|
1
1
|
// ── plumbus create <app-name> ──
|
|
2
2
|
// Interactive project scaffolding
|
|
3
|
+
import { z } from 'zod';
|
|
4
|
+
import { createErrorService } from '../../errors/index.js';
|
|
5
|
+
import { assertScaffoldName } from '../scaffold-validation.js';
|
|
3
6
|
import { execSync } from 'node:child_process';
|
|
4
7
|
import * as path from 'node:path';
|
|
5
8
|
import { error, exists, info, success, toKebabCase, warn, writeFile } from '../utils.js';
|
|
9
|
+
function validateCreateInputs(appName, options) {
|
|
10
|
+
assertScaffoldName(appName);
|
|
11
|
+
const identifier = z.string().regex(/^[A-Za-z][A-Za-z0-9_-]*$/);
|
|
12
|
+
if (!z
|
|
13
|
+
.object({
|
|
14
|
+
database: identifier.optional(),
|
|
15
|
+
auth: identifier.optional(),
|
|
16
|
+
ai: identifier.optional(),
|
|
17
|
+
})
|
|
18
|
+
.safeParse(options).success ||
|
|
19
|
+
(options.compliance != null &&
|
|
20
|
+
!z.array(identifier).safeParse(options.compliance.split(',').map((value) => value.trim()))
|
|
21
|
+
.success)) {
|
|
22
|
+
throw createErrorService().validation('Invalid scaffold provider or compliance identifier');
|
|
23
|
+
}
|
|
24
|
+
}
|
|
6
25
|
/** Generate the repository directory structure for a new Plumbus app */
|
|
7
26
|
export function generateProjectStructure(appName, options) {
|
|
27
|
+
validateCreateInputs(appName, options);
|
|
8
28
|
if (options.monorepo) {
|
|
9
29
|
return generateMonorepoStructure(appName, options);
|
|
10
30
|
}
|
|
@@ -382,6 +402,7 @@ export function registerCreateCommand(program) {
|
|
|
382
402
|
.option('--git', 'Initialize a git repository')
|
|
383
403
|
.option('--skip-install', 'Skip dependency installation')
|
|
384
404
|
.action(async (appName, opts) => {
|
|
405
|
+
validateCreateInputs(appName, opts);
|
|
385
406
|
const targetDir = path.resolve(process.cwd(), toKebabCase(appName));
|
|
386
407
|
if (exists(targetDir)) {
|
|
387
408
|
error(`Directory "${toKebabCase(appName)}" already exists`);
|