@ya-accelerators/web-backend-framework 0.0.142 → 0.0.144
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/@types/general.d.ts +0 -1
- package/dist/connector/google-auth/index.d.ts +13 -0
- package/dist/connector/google-auth/index.js +35 -16
- package/dist/connector/google-auth/index.js.map +1 -1
- package/dist/connector/index.d.ts +1 -0
- package/dist/connector/index.js +1 -0
- package/dist/connector/index.js.map +1 -1
- package/dist/connector/oidc/index.d.ts +11 -0
- package/dist/connector/oidc/index.js +13 -0
- package/dist/connector/oidc/index.js.map +1 -0
- package/dist/constants.d.ts +2 -0
- package/dist/constants.js +2 -0
- package/dist/constants.js.map +1 -1
- package/dist/context/audit/index.d.ts +3 -3
- package/dist/context/audit/index.js +4 -2
- package/dist/context/audit/index.js.map +1 -1
- package/dist/context/request/index.d.ts +0 -13
- package/dist/context/request/index.js +0 -41
- package/dist/context/request/index.js.map +1 -1
- package/dist/coordination/lock/index.js +6 -1
- package/dist/coordination/lock/index.js.map +1 -1
- package/dist/env.js +6 -5
- package/dist/env.js.map +1 -1
- package/dist/internal/jwks/index.d.ts +10 -0
- package/dist/internal/jwks/index.js +93 -0
- package/dist/internal/jwks/index.js.map +1 -0
- package/dist/internal/outbound-headers/index.d.ts +13 -0
- package/dist/internal/outbound-headers/index.js +42 -0
- package/dist/internal/outbound-headers/index.js.map +1 -0
- package/dist/logger/index.js +2 -2
- package/dist/logger/index.js.map +1 -1
- package/dist/repository/prisma/index.js +29 -51
- package/dist/repository/prisma/index.js.map +1 -1
- package/dist/repository/prisma/lifecycle.d.ts +1 -1
- package/dist/repository/prisma/lifecycle.js +4 -3
- package/dist/repository/prisma/lifecycle.js.map +1 -1
- package/dist/repository/redis/index.js +11 -1
- package/dist/repository/redis/index.js.map +1 -1
- package/dist/repository/s3/index.d.ts +0 -4
- package/dist/repository/s3/index.js +0 -1
- package/dist/repository/s3/index.js.map +1 -1
- package/dist/server/express/index.js +11 -23
- package/dist/server/express/index.js.map +1 -1
- package/dist/server/trpc/error/index.d.ts +11 -11
- package/dist/server/trpc/error/index.js +11 -42
- package/dist/server/trpc/error/index.js.map +1 -1
- package/dist/server/trpc/index.d.ts +7 -7
- package/dist/server/trpc/index.js +32 -9
- package/dist/server/trpc/index.js.map +1 -1
- package/dist/server/trpc/schema/index.d.ts +0 -4
- package/dist/server/trpc/schema/index.js +0 -12
- package/dist/server/trpc/schema/index.js.map +1 -1
- package/dist/server/uploads/index.js +16 -18
- package/dist/server/uploads/index.js.map +1 -1
- package/dist/util/index.d.ts +0 -4
- package/dist/util/index.js +91 -108
- package/dist/util/index.js.map +1 -1
- package/package.json +2 -2
package/@types/general.d.ts
CHANGED
|
@@ -24,6 +24,19 @@ export declare const googleIdTokenAuth: (wifConfigBase64: string, audience: stri
|
|
|
24
24
|
bearer: () => Promise<string>;
|
|
25
25
|
withAuth: <T>(fn: () => Promise<T>) => Promise<T>;
|
|
26
26
|
};
|
|
27
|
+
export declare const googleIdTokenVerify: ({ token, audience, issuer, jwksCacheKey, jwksCacheTtlSec, }: {
|
|
28
|
+
token: string;
|
|
29
|
+
audience: string | string[];
|
|
30
|
+
issuer: string | string[];
|
|
31
|
+
jwksCacheKey: string;
|
|
32
|
+
jwksCacheTtlSec: number;
|
|
33
|
+
}) => Promise<{
|
|
34
|
+
sub: string;
|
|
35
|
+
aud?: string | string[] | undefined;
|
|
36
|
+
email?: string | undefined;
|
|
37
|
+
email_verified?: boolean | undefined;
|
|
38
|
+
hd?: string | undefined;
|
|
39
|
+
}>;
|
|
27
40
|
export declare const googleImpersonatedAuth: (wifConfigBase64: string, { label, lifetime, targetScopes }: {
|
|
28
41
|
label: string;
|
|
29
42
|
lifetime: number;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
1
2
|
import { constants } from '../../constants.js';
|
|
2
3
|
import { runWithRequestHeaders } from '../../context/request/index.js';
|
|
3
4
|
import { awsSecurityCredentialsSupplier, impersonatedClient, parseWifConfig } from '../../internal/federation/index.js';
|
|
5
|
+
import { jwksVerify } from '../../internal/jwks/index.js';
|
|
4
6
|
import { logger } from '../../logger/index.js';
|
|
5
7
|
export const googleCloudAuth = (wifConfigBase64) => {
|
|
6
8
|
let client;
|
|
@@ -49,27 +51,26 @@ export const googleIdTokenAuth = (wifConfigBase64, audience, forHost) => {
|
|
|
49
51
|
}
|
|
50
52
|
let cached;
|
|
51
53
|
let inflight;
|
|
52
|
-
const fetchIdToken = async () => {
|
|
53
|
-
const { impersonated } = await impersonatedClient({
|
|
54
|
-
wifConfigBase64,
|
|
55
|
-
label: 'googleIdTokenAuth',
|
|
56
|
-
lifetime: constants.ID_TOKEN_TTL_SEC,
|
|
57
|
-
targetScopes: ['https://www.googleapis.com/auth/cloud-platform'],
|
|
58
|
-
});
|
|
59
|
-
return {
|
|
60
|
-
token: await impersonated.fetchIdToken(audience, { includeEmail: true }).catch((e) => {
|
|
61
|
-
logger.error('google-auth', { op: 'id-token', error: e });
|
|
62
|
-
throw e;
|
|
63
|
-
}),
|
|
64
|
-
expiresAt: (Math.floor(Date.now() / 1000) + constants.ID_TOKEN_TTL_SEC) * 1000,
|
|
65
|
-
};
|
|
66
|
-
};
|
|
67
54
|
const bearer = async () => {
|
|
68
55
|
if (cached !== undefined && Date.now() <= cached.expiresAt - constants.REFRESH_SKEW_MS) {
|
|
69
56
|
return `Bearer ${cached.token}`;
|
|
70
57
|
}
|
|
71
58
|
if (inflight === undefined) {
|
|
72
|
-
inflight =
|
|
59
|
+
inflight = (async () => {
|
|
60
|
+
const { impersonated } = await impersonatedClient({
|
|
61
|
+
wifConfigBase64,
|
|
62
|
+
label: 'googleIdTokenAuth',
|
|
63
|
+
lifetime: constants.ID_TOKEN_TTL_SEC,
|
|
64
|
+
targetScopes: ['https://www.googleapis.com/auth/cloud-platform'],
|
|
65
|
+
});
|
|
66
|
+
return {
|
|
67
|
+
token: await impersonated.fetchIdToken(audience, { includeEmail: true }).catch((e) => {
|
|
68
|
+
logger.error('google-auth', { op: 'id-token', error: e });
|
|
69
|
+
throw e;
|
|
70
|
+
}),
|
|
71
|
+
expiresAt: (Math.floor(Date.now() / 1000) + constants.ID_TOKEN_TTL_SEC) * 1000,
|
|
72
|
+
};
|
|
73
|
+
})().finally(() => {
|
|
73
74
|
inflight = undefined;
|
|
74
75
|
});
|
|
75
76
|
}
|
|
@@ -81,6 +82,24 @@ export const googleIdTokenAuth = (wifConfigBase64, audience, forHost) => {
|
|
|
81
82
|
withAuth: async (fn) => runWithRequestHeaders({ authorization: await bearer() }, fn, { forHost }),
|
|
82
83
|
};
|
|
83
84
|
};
|
|
85
|
+
export const googleIdTokenVerify = async ({ token, audience, issuer, jwksCacheKey, jwksCacheTtlSec, }) => z
|
|
86
|
+
.object({
|
|
87
|
+
sub: z.string(),
|
|
88
|
+
aud: z.union([z.string(), z.array(z.string())]).optional(),
|
|
89
|
+
email: z.string().optional(),
|
|
90
|
+
email_verified: z.boolean().optional(),
|
|
91
|
+
hd: z.string().optional(),
|
|
92
|
+
})
|
|
93
|
+
.parse(await jwksVerify({
|
|
94
|
+
token,
|
|
95
|
+
audience,
|
|
96
|
+
issuer,
|
|
97
|
+
jwksUri: 'https://www.googleapis.com/oauth2/v3/certs',
|
|
98
|
+
jwksCacheKey,
|
|
99
|
+
jwksCacheTtlSec,
|
|
100
|
+
tag: 'google-auth',
|
|
101
|
+
label: 'googleIdTokenVerify',
|
|
102
|
+
}));
|
|
84
103
|
export const googleImpersonatedAuth = (wifConfigBase64, { label, lifetime, targetScopes }) => ({
|
|
85
104
|
accessToken: async () => {
|
|
86
105
|
const { impersonated, serviceAccountEmail } = await impersonatedClient({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/google-auth/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/google-auth/index.ts"],"names":[],"mappings":"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"}
|
package/dist/connector/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connector/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,+BAA+B,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/connector/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAA;AACtC,cAAc,+BAA+B,CAAA;AAC7C,cAAc,iBAAiB,CAAA"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
export declare const oidcIdTokenVerify: ({ token, audience, issuer, jwksUri, jwksCacheKey, jwksCacheTtlSec, }: {
|
|
2
|
+
token: string;
|
|
3
|
+
audience: string | string[];
|
|
4
|
+
issuer: string | string[];
|
|
5
|
+
jwksUri: string;
|
|
6
|
+
jwksCacheKey: string;
|
|
7
|
+
jwksCacheTtlSec: number;
|
|
8
|
+
}) => Promise<{
|
|
9
|
+
[x: string]: unknown;
|
|
10
|
+
sub: string;
|
|
11
|
+
}>;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { jwksVerify } from '../../internal/jwks/index.js';
|
|
3
|
+
export const oidcIdTokenVerify = async ({ token, audience, issuer, jwksUri, jwksCacheKey, jwksCacheTtlSec, }) => z.looseObject({ sub: z.string() }).parse(await jwksVerify({
|
|
4
|
+
token,
|
|
5
|
+
audience,
|
|
6
|
+
issuer,
|
|
7
|
+
jwksUri,
|
|
8
|
+
jwksCacheKey,
|
|
9
|
+
jwksCacheTtlSec,
|
|
10
|
+
tag: 'oidc',
|
|
11
|
+
label: 'oidcIdTokenVerify',
|
|
12
|
+
}));
|
|
13
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/oidc/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAA;AAEzD,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,KAAK,EACL,QAAQ,EACR,MAAM,EACN,OAAO,EACP,YAAY,EACZ,eAAe,GAQhB,EAAE,EAAE,CACH,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CACtC,MAAM,UAAU,CAAC;IACf,KAAK;IACL,QAAQ;IACR,MAAM;IACN,OAAO;IACP,YAAY;IACZ,eAAe;IACf,GAAG,EAAE,MAAM;IACX,KAAK,EAAE,mBAAmB;CAC3B,CAAC,CACH,CAAA"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -5,6 +5,8 @@ export declare const constants: {
|
|
|
5
5
|
OAUTH_DEV_REDIRECTOR_URL: string;
|
|
6
6
|
ID_TOKEN_TTL_SEC: number;
|
|
7
7
|
REFRESH_SKEW_MS: number;
|
|
8
|
+
GOOGLE_ID_TOKEN_ISSUERS: string[];
|
|
9
|
+
JWKS_FETCH_TIMEOUT_MS: number;
|
|
8
10
|
REQUEST_ID_PATTERN: RegExp;
|
|
9
11
|
UPLOADS_PATH: string;
|
|
10
12
|
UPLOADS_PREFIX: string;
|
package/dist/constants.js
CHANGED
|
@@ -4,6 +4,8 @@ export const constants = {
|
|
|
4
4
|
OAUTH_DEV_REDIRECTOR_URL: 'https://jbilvarnjxcewv7spngtoaowia0krqmu.lambda-url.eu-north-1.on.aws/',
|
|
5
5
|
ID_TOKEN_TTL_SEC: 3600,
|
|
6
6
|
REFRESH_SKEW_MS: 5 * 60 * 1000,
|
|
7
|
+
GOOGLE_ID_TOKEN_ISSUERS: ['https://accounts.google.com', 'accounts.google.com'],
|
|
8
|
+
JWKS_FETCH_TIMEOUT_MS: 5000,
|
|
7
9
|
REQUEST_ID_PATTERN: /^[A-Za-z0-9._-]{1,128}$/,
|
|
8
10
|
UPLOADS_PATH: '/api/uploads',
|
|
9
11
|
UPLOADS_PREFIX: 'uploads/',
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAErE,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,wBAAwB,EAAE,wEAAwE;IAClG,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAC9B,kBAAkB,EAAE,yBAAyB;IAC7C,YAAY,EAAE,cAAc;IAC5B,cAAc,EAAE,UAAU;IAC1B,mBAAmB,EAAE,CAAC;IACtB,mBAAmB,EAAE,EAAE;IACvB,wBAAwB,EAAE,EAAE;IAC5B,eAAe,EAAE,EAAE;IACnB,sBAAsB,EAAE,EAAE;IAC1B,oBAAoB,EAAE,CAAC,GAAG,EAAE;IAC5B,0BAA0B,EAAE,GAAG;IAC/B,8BAA8B,EAAE,GAAG;IACnC,0BAA0B,EAAE,0BAA0B;IACtD,gBAAgB,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI;IACnC,wBAAwB,EAAE,EAAE;IAC5B,+BAA+B,EAAE,EAAE;IACnC,gCAAgC,EAAE,EAAE;IACpC,6BAA6B,EAAE,qBAAqB,CAAC,mBAAmB;IACxE,qBAAqB,EAAE,IAAI;IAE3B,2GAA2G;IAC3G,2GAA2G;IAC3G,iBAAiB;IACjB,wBAAwB,EAAE,KAAK;IAC/B,yGAAyG;IACzG,2GAA2G;IAC3G,2FAA2F;IAC3F,qBAAqB,EAAE,KAAK;IAC5B,oBAAoB,EAAE,KAAK;IAE3B,4GAA4G;IAC5G,+FAA+F;IAC/F,4GAA4G;IAC5G,+CAA+C;IAC/C,uBAAuB,EAAE;QACvB,YAAY;QACZ,WAAW;QACX,WAAW;QACX,cAAc;QACd,YAAY;QACZ,YAAY;KACJ;IAEV,GAAG,YAAY;CAChB,CAAA"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAA;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAErE,MAAM,CAAC,MAAM,SAAS,GAAG;IACvB,wBAAwB,EAAE,wEAAwE;IAClG,gBAAgB,EAAE,IAAI;IACtB,eAAe,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;IAC9B,uBAAuB,EAAE,CAAC,6BAA6B,EAAE,qBAAqB,CAAC;IAC/E,qBAAqB,EAAE,IAAI;IAC3B,kBAAkB,EAAE,yBAAyB;IAC7C,YAAY,EAAE,cAAc;IAC5B,cAAc,EAAE,UAAU;IAC1B,mBAAmB,EAAE,CAAC;IACtB,mBAAmB,EAAE,EAAE;IACvB,wBAAwB,EAAE,EAAE;IAC5B,eAAe,EAAE,EAAE;IACnB,sBAAsB,EAAE,EAAE;IAC1B,oBAAoB,EAAE,CAAC,GAAG,EAAE;IAC5B,0BAA0B,EAAE,GAAG;IAC/B,8BAA8B,EAAE,GAAG;IACnC,0BAA0B,EAAE,0BAA0B;IACtD,gBAAgB,EAAE,GAAG,GAAG,IAAI,GAAG,IAAI;IACnC,wBAAwB,EAAE,EAAE;IAC5B,+BAA+B,EAAE,EAAE;IACnC,gCAAgC,EAAE,EAAE;IACpC,6BAA6B,EAAE,qBAAqB,CAAC,mBAAmB;IACxE,qBAAqB,EAAE,IAAI;IAE3B,2GAA2G;IAC3G,2GAA2G;IAC3G,iBAAiB;IACjB,wBAAwB,EAAE,KAAK;IAC/B,yGAAyG;IACzG,2GAA2G;IAC3G,2FAA2F;IAC3F,qBAAqB,EAAE,KAAK;IAC5B,oBAAoB,EAAE,KAAK;IAE3B,4GAA4G;IAC5G,+FAA+F;IAC/F,4GAA4G;IAC5G,+CAA+C;IAC/C,uBAAuB,EAAE;QACvB,YAAY;QACZ,WAAW;QACX,WAAW;QACX,cAAc;QACd,YAAY;QACZ,YAAY;KACJ;IAEV,GAAG,YAAY;CAChB,CAAA"}
|
|
@@ -10,11 +10,11 @@ export declare const getCurrentAuditContext: () => AuditContext | undefined;
|
|
|
10
10
|
export declare const runWithAuditActorFor: <TReason extends string>() => <T>({ actorUserId, reason }: {
|
|
11
11
|
actorUserId?: string;
|
|
12
12
|
reason?: TReason;
|
|
13
|
-
}, fn: () =>
|
|
13
|
+
}, fn: () => PromiseLike<T>) => Promise<T>;
|
|
14
14
|
export declare const runWithAuditActor: <T>({ actorUserId, reason }: {
|
|
15
15
|
actorUserId?: string;
|
|
16
16
|
reason?: AuditOperationReason | undefined;
|
|
17
|
-
}, fn: () =>
|
|
17
|
+
}, fn: () => PromiseLike<T>) => Promise<T>;
|
|
18
18
|
export declare const runAsSystemAction: <T>({ reason }: {
|
|
19
19
|
reason?: string;
|
|
20
|
-
}, fn: () =>
|
|
20
|
+
}, fn: () => PromiseLike<T>) => Promise<T>;
|
|
@@ -6,11 +6,13 @@ export const runWithAuditActorFor = () => ({ actorUserId, reason }, fn) => {
|
|
|
6
6
|
actorUserId,
|
|
7
7
|
reason,
|
|
8
8
|
suppress: auditContextStorage.getStore()?.suppress ?? false,
|
|
9
|
-
},
|
|
9
|
+
},
|
|
10
|
+
// A PrismaPromise starts its query only when `.then` is called, so `fn`'s result is awaited inside the scope.
|
|
11
|
+
async () => await fn());
|
|
10
12
|
};
|
|
11
13
|
export const runWithAuditActor = runWithAuditActorFor();
|
|
12
14
|
export const runAsSystemAction = ({ reason }, fn) => auditContextStorage.run({
|
|
13
15
|
reason,
|
|
14
16
|
suppress: true,
|
|
15
|
-
}, fn);
|
|
17
|
+
}, async () => await fn());
|
|
16
18
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/context/audit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAyB/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,EAAgB,CAAA;AAExE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAA;AAE1E,MAAM,CAAC,MAAM,oBAAoB,GAC/B,GAA2B,EAAE,CAC7B,CAAI,EAAE,WAAW,EAAE,MAAM,EAA8C,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/context/audit/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAyB/C,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,iBAAiB,EAAgB,CAAA;AAExE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAA;AAE1E,MAAM,CAAC,MAAM,oBAAoB,GAC/B,GAA2B,EAAE,CAC7B,CAAI,EAAE,WAAW,EAAE,MAAM,EAA8C,EAAE,EAAwB,EAAE,EAAE;IACnG,OAAO,mBAAmB,CAAC,GAAG,CAC5B;QACE,WAAW;QACX,MAAM;QACN,QAAQ,EAAE,mBAAmB,CAAC,QAAQ,EAAE,EAAE,QAAQ,IAAI,KAAK;KAC5D;IACD,8GAA8G;IAC9G,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CACvB,CAAA;AACH,CAAC,CAAA;AAEH,MAAM,CAAC,MAAM,iBAAiB,GAAG,oBAAoB,EAAwB,CAAA;AAE7E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAI,EAAE,MAAM,EAAuB,EAAE,EAAwB,EAAE,EAAE,CAChG,mBAAmB,CAAC,GAAG,CACrB;IACE,MAAM;IACN,QAAQ,EAAE,IAAI;CACf,EACD,KAAK,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE,CACvB,CAAA"}
|
|
@@ -13,16 +13,3 @@ export declare const runWithRequestHeaders: <T>(headers: Record<string, string>,
|
|
|
13
13
|
forHost?: string;
|
|
14
14
|
}) => Promise<T>;
|
|
15
15
|
export declare const runWithRequestPath: <T>(path: string, fn: () => Promise<T> | T) => T | Promise<T>;
|
|
16
|
-
export declare const resolveOutboundHeaders: (store: {
|
|
17
|
-
headers: Record<string, string>;
|
|
18
|
-
forwardHeaderScopes?: {
|
|
19
|
-
headers: Record<string, string>;
|
|
20
|
-
forHost?: string;
|
|
21
|
-
}[];
|
|
22
|
-
nonForwardableHeaders?: ReadonlySet<string>;
|
|
23
|
-
}, options: {
|
|
24
|
-
allowList: ReadonlySet<string>;
|
|
25
|
-
targetHost?: string;
|
|
26
|
-
init?: RequestInit;
|
|
27
|
-
inputHeaders?: Headers;
|
|
28
|
-
}) => Headers;
|
|
@@ -26,45 +26,4 @@ export const runWithRequestPath = (path, fn) => {
|
|
|
26
26
|
path,
|
|
27
27
|
}, fn);
|
|
28
28
|
};
|
|
29
|
-
// `requestHost()` derives `targetHost` via `new URL(url).host`, which drops a port equal to the scheme
|
|
30
|
-
// default (`http:` 80 / `https:` 443) — so a caller who writes `forHost: 'api.internal:80'` (as the docs
|
|
31
|
-
// show) would never match the `'api.internal'` that an actual `http://api.internal:80/...` fetch produces.
|
|
32
|
-
// Strip the default ports from both sides before comparing so host-binding works for the common in-mesh
|
|
33
|
-
// case (the BFF listens on port 80).
|
|
34
|
-
const stripDefaultPort = (host) => host.replace(/:(?:80|443)$/, '');
|
|
35
|
-
// Compute the header set for a request-scoped outbound `fetch`. Precedence (highest wins):
|
|
36
|
-
// 1. the caller's own per-call headers — `init.headers`, then the input `Request`'s own headers
|
|
37
|
-
// (`fetch(new Request(url, { headers }))`; init wins over the Request per the fetch spec)
|
|
38
|
-
// 2. explicit `runWithRequestHeaders` scopes (inner overrides outer; a host-bound scope applies only
|
|
39
|
-
// when the target host matches — a forwarded credential must not follow a cross-origin redirect)
|
|
40
|
-
// 3. auto-forwarded inbound headers, restricted to `allowList` minus the app's `nonForwardableHeaders`
|
|
41
|
-
// Pure (no I/O / no ALS read) so the branch matrix is unit-testable; `server/express` supplies the store,
|
|
42
|
-
// the framework allow-list, the parsed target host, and the input `Request`'s headers.
|
|
43
|
-
export const resolveOutboundHeaders = (store, options) => {
|
|
44
|
-
// The caller's own headers = the input Request's headers, then overridden by init.headers. Passing a
|
|
45
|
-
// rebuilt `headers` in init to `fetch(Request, init)` otherwise drops the Request's own headers, so
|
|
46
|
-
// they must be carried here.
|
|
47
|
-
const callerHeaders = new Headers(options.inputHeaders ?? undefined);
|
|
48
|
-
for (const [key, value] of new Headers(options.init?.headers ?? {})) {
|
|
49
|
-
callerHeaders.set(key, value);
|
|
50
|
-
}
|
|
51
|
-
const headers = new Headers(callerHeaders);
|
|
52
|
-
for (const [key, value] of Object.entries(store.headers)) {
|
|
53
|
-
const lower = key.toLowerCase();
|
|
54
|
-
if (options.allowList.has(lower) && !store.nonForwardableHeaders?.has(lower) && !headers.has(key)) {
|
|
55
|
-
headers.set(key, value);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
for (const scope of store.forwardHeaderScopes ?? []) {
|
|
59
|
-
if (scope.forHost !== undefined && stripDefaultPort(scope.forHost) !== stripDefaultPort(options.targetHost ?? '')) {
|
|
60
|
-
continue;
|
|
61
|
-
}
|
|
62
|
-
for (const [key, value] of Object.entries(scope.headers)) {
|
|
63
|
-
if (!callerHeaders.has(key)) {
|
|
64
|
-
headers.set(key, value);
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}
|
|
68
|
-
return headers;
|
|
69
|
-
};
|
|
70
29
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/context/request/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,iBAAiB,EAKtD,CAAA;AAEJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAA;AAEjF,kGAAkG;AAClG,uGAAuG;AACvG,oGAAoG;AACpG,wCAAwC;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,OAA+B,EAC/B,EAAoB,EACpB,OAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,qBAAqB,CAAC,QAAQ,EAAE,CAAA;IAChD,OAAO,qBAAqB,CAAC,GAAG,CAC9B;QACE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;QAC/B,mBAAmB,EAAE;YACnB,GAAG,CAAC,OAAO,EAAE,mBAAmB,IAAI,EAAE,CAAC;YACvC,OAAO,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;SACnG;QACD,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACjH,GAAG,CAAC,OAAO,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;KAC/D,EACD,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAI,IAAY,EAAE,EAAwB,EAAE,EAAE;IAC9E,MAAM,OAAO,GAAG,qBAAqB,CAAC,QAAQ,EAAE,CAAA;IAChD,OAAO,qBAAqB,CAAC,GAAG,CAC9B;QACE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;QAC/B,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC3G,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACjH,IAAI;KACL,EACD,EAAE,CACH,CAAA;AACH,CAAC,CAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/context/request/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAE/C,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,iBAAiB,EAKtD,CAAA;AAEJ,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAG,EAAE,CAAC,qBAAqB,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAA;AAEjF,kGAAkG;AAClG,uGAAuG;AACvG,oGAAoG;AACpG,wCAAwC;AACxC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,OAA+B,EAC/B,EAAoB,EACpB,OAA8B,EAC9B,EAAE;IACF,MAAM,OAAO,GAAG,qBAAqB,CAAC,QAAQ,EAAE,CAAA;IAChD,OAAO,qBAAqB,CAAC,GAAG,CAC9B;QACE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;QAC/B,mBAAmB,EAAE;YACnB,GAAG,CAAC,OAAO,EAAE,mBAAmB,IAAI,EAAE,CAAC;YACvC,OAAO,EAAE,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;SACnG;QACD,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACjH,GAAG,CAAC,OAAO,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;KAC/D,EACD,EAAE,CACH,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAI,IAAY,EAAE,EAAwB,EAAE,EAAE;IAC9E,MAAM,OAAO,GAAG,qBAAqB,CAAC,QAAQ,EAAE,CAAA;IAChD,OAAO,qBAAqB,CAAC,GAAG,CAC9B;QACE,OAAO,EAAE,OAAO,EAAE,OAAO,IAAI,EAAE;QAC/B,GAAG,CAAC,OAAO,EAAE,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE,CAAC;QAC3G,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,qBAAqB,EAAE,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACjH,IAAI;KACL,EACD,EAAE,CACH,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -23,7 +23,12 @@ export const lock = {
|
|
|
23
23
|
release: async ({ key, token }) => {
|
|
24
24
|
await redis.invokeScript(RELEASE_SCRIPT, { keys: [key], args: [token] });
|
|
25
25
|
},
|
|
26
|
-
renew: async ({ key, token, ttlSec }) =>
|
|
26
|
+
renew: async ({ key, token, ttlSec }) => {
|
|
27
|
+
if (!Number.isInteger(ttlSec) || ttlSec <= 0) {
|
|
28
|
+
throw new Error(`lock: ttlSec must be a positive integer (got ${ttlSec})`);
|
|
29
|
+
}
|
|
30
|
+
return (await redis.invokeScript(RENEW_SCRIPT, { keys: [key], args: [token, `${ttlSec}`] })) === 1;
|
|
31
|
+
},
|
|
27
32
|
withLock: async ({ key, ttlSec, heartbeat, }, fn) => {
|
|
28
33
|
const token = await lock.acquire({ key, ttlSec });
|
|
29
34
|
if (token === null) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/coordination/lock/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAA;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAE1C,MAAM,cAAc,GAAG,IAAI,MAAM,CAAC;;;;;;CAMjC,CAAC,CAAA;AAEF,MAAM,YAAY,GAAG,IAAI,MAAM,CAAC;;;;;;CAM/B,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG;IAClB,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAmC,EAAE,EAAE;QAClE,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,CAAA;QAC/B,OAAO,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAA;IACvE,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAkC,EAAE,EAAE;QAChE,MAAM,KAAK,CAAC,YAAY,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1E,CAAC;IACD,KAAK,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAkD,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/coordination/lock/index.ts"],"names":[],"mappings":"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"}
|
package/dist/env.js
CHANGED
|
@@ -1,25 +1,26 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
import { constants } from './constants.js';
|
|
3
3
|
import { Util } from './util/index.js';
|
|
4
|
+
const PortSchema = z.string().regex(/^\d+$/).transform(Number).pipe(z.number().int().min(1).max(65535));
|
|
4
5
|
export const defaultEnv = Util.createEnvProxy(z.object({
|
|
5
6
|
AWS_REGION: z.enum(constants.PII_ALLOWED_AWS_REGIONS),
|
|
6
7
|
NODE_ENV: z.enum(['development', 'production']),
|
|
7
8
|
DEPLOY_ENV: z.enum(['dev', 'stg', 'prd']),
|
|
8
9
|
LOG_LEVEL: z.enum(['debug', 'info', 'warn', 'error']).optional(),
|
|
9
10
|
DATABASE_HOST: z.string().min(1),
|
|
10
|
-
DATABASE_PORT:
|
|
11
|
+
DATABASE_PORT: PortSchema,
|
|
11
12
|
DATABASE_RO_HOST: z.string().min(1),
|
|
12
|
-
DATABASE_RO_PORT:
|
|
13
|
+
DATABASE_RO_PORT: PortSchema,
|
|
13
14
|
DATABASE_USER: z.string().min(1),
|
|
14
15
|
DATABASE_PASSWORD: z.string().min(1),
|
|
15
16
|
DATABASE_NAME: z.string().min(1).optional(),
|
|
16
|
-
REDIS_CLUSTER: z.
|
|
17
|
+
REDIS_CLUSTER: z.enum(['true', 'false']).transform((value) => value === 'true'),
|
|
17
18
|
REDIS_HOST: z.string().min(1),
|
|
18
|
-
REDIS_PORT:
|
|
19
|
+
REDIS_PORT: PortSchema,
|
|
19
20
|
LOCAL_S3_ENDPOINT: z.url().optional(),
|
|
20
21
|
STORAGE_BUCKET: z.string().min(1),
|
|
21
22
|
SERVICE: z.string().min(1),
|
|
22
|
-
PORT:
|
|
23
|
+
PORT: PortSchema,
|
|
23
24
|
CORS_ORIGIN: z
|
|
24
25
|
.string()
|
|
25
26
|
.min(1)
|
package/dist/env.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,CAC3C,CAAC,CAAC,MAAM,CAAC;IACP,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC;IACrD,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC/C,UAAU,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;IACzC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE;IAChE,aAAa,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAChC,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"env.js","sourceRoot":"","sources":["../src/env.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export declare const jwksVerify: ({ token, audience, issuer, jwksUri, jwksCacheKey, jwksCacheTtlSec, tag, label, }: {
|
|
2
|
+
token: string;
|
|
3
|
+
audience: string | string[];
|
|
4
|
+
issuer: string | string[];
|
|
5
|
+
jwksUri: string;
|
|
6
|
+
jwksCacheKey: string;
|
|
7
|
+
jwksCacheTtlSec: number;
|
|
8
|
+
tag: string;
|
|
9
|
+
label: string;
|
|
10
|
+
}) => Promise<import("jose").JWTPayload>;
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
import { constants } from '../../constants.js';
|
|
3
|
+
import { logger } from '../../logger/index.js';
|
|
4
|
+
import { redis } from '../../repository/redis/index.js';
|
|
5
|
+
const JwkParametersSchema = z.object({
|
|
6
|
+
alg: z.string().optional(),
|
|
7
|
+
key_ops: z.array(z.string()).optional(),
|
|
8
|
+
ext: z.boolean().optional(),
|
|
9
|
+
use: z.string().optional(),
|
|
10
|
+
x5c: z.array(z.string()).optional(),
|
|
11
|
+
x5t: z.string().optional(),
|
|
12
|
+
'x5t#S256': z.string().optional(),
|
|
13
|
+
x5u: z.string().optional(),
|
|
14
|
+
kid: z.string().optional(),
|
|
15
|
+
});
|
|
16
|
+
const JwksResponseSchema = z.object({ keys: z.array(z.unknown()) }).transform(({ keys }) => ({
|
|
17
|
+
keys: keys.flatMap((key) => {
|
|
18
|
+
const result = z
|
|
19
|
+
.discriminatedUnion('kty', [
|
|
20
|
+
JwkParametersSchema.extend({ kty: z.literal('RSA'), e: z.string(), n: z.string() }),
|
|
21
|
+
JwkParametersSchema.extend({ kty: z.literal('EC'), crv: z.string(), x: z.string(), y: z.string() }),
|
|
22
|
+
JwkParametersSchema.extend({ kty: z.literal('OKP'), crv: z.string(), x: z.string() }),
|
|
23
|
+
JwkParametersSchema.extend({ kty: z.literal('AKP'), alg: z.string(), pub: z.string() }),
|
|
24
|
+
])
|
|
25
|
+
.safeParse(key);
|
|
26
|
+
return result.success ? [result.data] : [];
|
|
27
|
+
}),
|
|
28
|
+
total: keys.length,
|
|
29
|
+
}));
|
|
30
|
+
export const jwksVerify = async ({ token, audience, issuer, jwksUri, jwksCacheKey, jwksCacheTtlSec, tag, label, }) => {
|
|
31
|
+
if (!Number.isInteger(jwksCacheTtlSec) || jwksCacheTtlSec <= 0) {
|
|
32
|
+
throw new Error(`${label}: jwksCacheTtlSec must be a positive integer (got ${jwksCacheTtlSec})`);
|
|
33
|
+
}
|
|
34
|
+
const { createLocalJWKSet, errors, jwtVerify } = await import('jose');
|
|
35
|
+
const fetchJwks = async () => {
|
|
36
|
+
const res = await fetch(jwksUri, {
|
|
37
|
+
cache: 'no-store',
|
|
38
|
+
redirect: 'error',
|
|
39
|
+
signal: AbortSignal.timeout(constants.JWKS_FETCH_TIMEOUT_MS),
|
|
40
|
+
}).catch((e) => {
|
|
41
|
+
logger.error(tag, { op: 'jwks-fetch', stage: 'request' });
|
|
42
|
+
throw e;
|
|
43
|
+
});
|
|
44
|
+
if (!res.ok) {
|
|
45
|
+
logger.error(tag, { op: 'jwks-fetch', status: res.status });
|
|
46
|
+
throw new Error(`${label}: JWKS fetch failed (${res.status})`);
|
|
47
|
+
}
|
|
48
|
+
const parsed = JwksResponseSchema.safeParse(await res.json().catch((e) => {
|
|
49
|
+
logger.error(tag, { op: 'jwks-fetch', stage: 'body' });
|
|
50
|
+
throw e;
|
|
51
|
+
}));
|
|
52
|
+
if (!parsed.success) {
|
|
53
|
+
logger.error(tag, { op: 'jwks-fetch', stage: 'shape' });
|
|
54
|
+
throw parsed.error;
|
|
55
|
+
}
|
|
56
|
+
const { keys, total } = parsed.data;
|
|
57
|
+
if (keys.length !== total || keys.length === 0) {
|
|
58
|
+
logger.error(tag, { op: 'jwks-key-shape', total, kept: keys.length });
|
|
59
|
+
}
|
|
60
|
+
if (keys.length === 0) {
|
|
61
|
+
throw new Error(`${label}: JWKS carries no usable key`);
|
|
62
|
+
}
|
|
63
|
+
const jwks = { keys };
|
|
64
|
+
await redis.set(jwksCacheKey, JSON.stringify(jwks), jwksCacheTtlSec).catch(() => undefined);
|
|
65
|
+
return jwks;
|
|
66
|
+
};
|
|
67
|
+
const cached = await redis.get(jwksCacheKey).catch(() => undefined);
|
|
68
|
+
const cachedJwks = (() => {
|
|
69
|
+
try {
|
|
70
|
+
if (cached === undefined) {
|
|
71
|
+
return undefined;
|
|
72
|
+
}
|
|
73
|
+
const { keys } = JwksResponseSchema.parse(JSON.parse(cached));
|
|
74
|
+
return keys.length === 0 ? undefined : { keys };
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
return undefined;
|
|
78
|
+
}
|
|
79
|
+
})();
|
|
80
|
+
let jwks = cachedJwks ?? (await fetchJwks());
|
|
81
|
+
const verify = async () => (await jwtVerify(token, createLocalJWKSet(jwks), { issuer, audience })).payload;
|
|
82
|
+
try {
|
|
83
|
+
return await verify();
|
|
84
|
+
}
|
|
85
|
+
catch (e) {
|
|
86
|
+
if (e instanceof errors.JWKSNoMatchingKey && cachedJwks !== undefined) {
|
|
87
|
+
jwks = await fetchJwks();
|
|
88
|
+
return await verify();
|
|
89
|
+
}
|
|
90
|
+
throw e;
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/jwks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export declare const resolveOutboundHeaders: (store: {
|
|
2
|
+
headers: Record<string, string>;
|
|
3
|
+
forwardHeaderScopes?: {
|
|
4
|
+
headers: Record<string, string>;
|
|
5
|
+
forHost?: string;
|
|
6
|
+
}[];
|
|
7
|
+
nonForwardableHeaders?: ReadonlySet<string>;
|
|
8
|
+
}, options: {
|
|
9
|
+
allowList: ReadonlySet<string>;
|
|
10
|
+
targetHost?: string;
|
|
11
|
+
init?: RequestInit;
|
|
12
|
+
inputHeaders?: Headers;
|
|
13
|
+
}) => Headers;
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
// `server/express` derives `targetHost` via `URL.parse(url).host`, which drops a port equal to the scheme
|
|
2
|
+
// default (`http:` 80 / `https:` 443) — so a caller who writes `forHost: 'api.internal:80'` (as the docs
|
|
3
|
+
// show) would never match the `'api.internal'` that an actual `http://api.internal:80/...` fetch produces.
|
|
4
|
+
// Strip the default ports from both sides before comparing so host-binding works for the common in-mesh
|
|
5
|
+
// case (the BFF listens on port 80).
|
|
6
|
+
const stripDefaultPort = (host) => host.replace(/:(?:80|443)$/, '');
|
|
7
|
+
// Compute the header set for a request-scoped outbound `fetch`. Precedence (highest wins):
|
|
8
|
+
// 1. the caller's own per-call headers — `init.headers`, then the input `Request`'s own headers
|
|
9
|
+
// (`fetch(new Request(url, { headers }))`; init wins over the Request per the fetch spec)
|
|
10
|
+
// 2. explicit `runWithRequestHeaders` scopes (inner overrides outer; a host-bound scope applies only
|
|
11
|
+
// when the target host matches — a forwarded credential must not follow a cross-origin redirect)
|
|
12
|
+
// 3. auto-forwarded inbound headers, restricted to `allowList` minus the app's `nonForwardableHeaders`
|
|
13
|
+
// Pure (no I/O / no ALS read) so the branch matrix is unit-testable; `server/express` supplies the store,
|
|
14
|
+
// the framework allow-list, the parsed target host, and the input `Request`'s headers.
|
|
15
|
+
export const resolveOutboundHeaders = (store, options) => {
|
|
16
|
+
// The caller's own headers = the input Request's headers, then overridden by init.headers. Passing a
|
|
17
|
+
// rebuilt `headers` in init to `fetch(Request, init)` otherwise drops the Request's own headers, so
|
|
18
|
+
// they must be carried here.
|
|
19
|
+
const callerHeaders = new Headers(options.inputHeaders ?? undefined);
|
|
20
|
+
for (const [key, value] of new Headers(options.init?.headers ?? {})) {
|
|
21
|
+
callerHeaders.set(key, value);
|
|
22
|
+
}
|
|
23
|
+
const headers = new Headers(callerHeaders);
|
|
24
|
+
for (const [key, value] of Object.entries(store.headers)) {
|
|
25
|
+
const lower = key.toLowerCase();
|
|
26
|
+
if (options.allowList.has(lower) && !store.nonForwardableHeaders?.has(lower) && !headers.has(key)) {
|
|
27
|
+
headers.set(key, value);
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
for (const scope of store.forwardHeaderScopes ?? []) {
|
|
31
|
+
if (scope.forHost !== undefined && stripDefaultPort(scope.forHost) !== stripDefaultPort(options.targetHost ?? '')) {
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
for (const [key, value] of Object.entries(scope.headers)) {
|
|
35
|
+
if (!callerHeaders.has(key)) {
|
|
36
|
+
headers.set(key, value);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}
|
|
40
|
+
return headers;
|
|
41
|
+
};
|
|
42
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/internal/outbound-headers/index.ts"],"names":[],"mappings":"AAAA,0GAA0G;AAC1G,yGAAyG;AACzG,2GAA2G;AAC3G,wGAAwG;AACxG,qCAAqC;AACrC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAA;AAE3E,2FAA2F;AAC3F,kGAAkG;AAClG,+FAA+F;AAC/F,uGAAuG;AACvG,sGAAsG;AACtG,yGAAyG;AACzG,0GAA0G;AAC1G,uFAAuF;AACvF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,KAIC,EACD,OAA4G,EAC5G,EAAE;IACF,qGAAqG;IACrG,oGAAoG;IACpG,6BAA6B;IAC7B,MAAM,aAAa,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,IAAI,SAAS,CAAC,CAAA;IACpE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QACpE,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC/B,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,aAAa,CAAC,CAAA;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACzD,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAA;QAC/B,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YAClG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;QACzB,CAAC;IACH,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,mBAAmB,IAAI,EAAE,EAAE,CAAC;QACpD,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,gBAAgB,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,gBAAgB,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;YAClH,SAAQ;QACV,CAAC;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACzD,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;YACzB,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|
package/dist/logger/index.js
CHANGED
|
@@ -4,9 +4,9 @@ import { getCurrentRequestPath } from '../context/request/index.js';
|
|
|
4
4
|
import { defaultEnv } from '../env.js';
|
|
5
5
|
import { Util } from '../util/index.js';
|
|
6
6
|
const LEVEL_ORDER = { debug: 10, info: 20, warn: 30, error: 40 };
|
|
7
|
-
const DEFAULT_BY_DEPLOY_ENV = { dev: 'debug', stg: 'info', prd: 'warn' };
|
|
8
7
|
const emit = (level, tag, payload) => {
|
|
9
|
-
if (LEVEL_ORDER[level] <
|
|
8
|
+
if (LEVEL_ORDER[level] <
|
|
9
|
+
LEVEL_ORDER[defaultEnv.LOG_LEVEL ?? { dev: 'debug', stg: 'info', prd: 'warn' }[defaultEnv.DEPLOY_ENV]]) {
|
|
10
10
|
return;
|
|
11
11
|
}
|
|
12
12
|
try {
|
package/dist/logger/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAA;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAEvC,MAAM,WAAW,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/logger/index.ts"],"names":[],"mappings":"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"}
|