@pipeline-builder/api-core 4.1.3 → 4.1.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/lib/errors/app-errors.d.ts +0 -4
- package/lib/errors/app-errors.js +1 -8
- package/lib/helpers/restore-helpers.d.ts +3 -3
- package/lib/helpers/restore-helpers.js +4 -4
- package/lib/helpers/sse-helpers.d.ts +8 -1
- package/lib/helpers/sse-helpers.js +11 -3
- package/lib/middleware/auth.d.ts +174 -43
- package/lib/middleware/auth.js +384 -179
- package/lib/middleware/index.d.ts +1 -0
- package/lib/middleware/index.js +2 -1
- package/lib/middleware/route-table.d.ts +104 -0
- package/lib/middleware/route-table.js +230 -0
- package/lib/middleware/step-up.d.ts +48 -16
- package/lib/middleware/step-up.js +74 -36
- package/lib/services/api-key-exchange.d.ts +25 -0
- package/lib/services/api-key-exchange.js +219 -0
- package/lib/services/cache-service.d.ts +11 -26
- package/lib/services/cache-service.js +20 -74
- package/lib/services/compliance-event-subscriber.d.ts +5 -4
- package/lib/services/compliance-event-subscriber.js +8 -6
- package/lib/services/durable-event-bus.d.ts +22 -39
- package/lib/services/durable-event-bus.js +95 -43
- package/lib/services/env-redis.d.ts +27 -0
- package/lib/services/env-redis.js +63 -1
- package/lib/services/http-client.d.ts +10 -15
- package/lib/services/http-client.js +32 -27
- package/lib/services/index.d.ts +3 -0
- package/lib/services/index.js +4 -1
- package/lib/services/jwks-cache.d.ts +102 -0
- package/lib/services/jwks-cache.js +222 -0
- package/lib/services/quota.js +12 -4
- package/lib/services/remote-audit-client.d.ts +1 -1
- package/lib/services/remote-audit-client.js +32 -1
- package/lib/services/scheduler.d.ts +2 -3
- package/lib/services/scheduler.js +2 -2
- package/lib/services/service-boot.d.ts +4 -2
- package/lib/services/service-boot.js +7 -3
- package/lib/services/service-keys.d.ts +83 -0
- package/lib/services/service-keys.js +354 -0
- package/lib/services/sse-ticket-store.d.ts +55 -22
- package/lib/services/sse-ticket-store.js +122 -79
- package/lib/services/token-revocation.js +30 -18
- package/lib/testing/route-coverage.d.ts +64 -0
- package/lib/testing/route-coverage.js +183 -0
- package/lib/testing/service-tokens.d.ts +66 -0
- package/lib/testing/service-tokens.js +137 -0
- package/lib/testing/tier-mock.d.ts +2 -2
- package/lib/testing/tier-mock.js +3 -3
- package/lib/testing/user-tokens.d.ts +75 -0
- package/lib/testing/user-tokens.js +115 -0
- package/lib/types/catalog-metadata.d.ts +0 -2
- package/lib/types/catalog-metadata.js +1 -3
- package/lib/types/common.d.ts +103 -4
- package/lib/types/common.js +11 -1
- package/lib/types/error-codes.d.ts +15 -0
- package/lib/types/error-codes.js +22 -1
- package/lib/types/permissions.d.ts +35 -1
- package/lib/types/permissions.js +72 -2
- package/lib/utils/api-key.d.ts +34 -0
- package/lib/utils/api-key.js +75 -0
- package/lib/utils/env.d.ts +0 -2
- package/lib/utils/env.js +1 -6
- package/lib/utils/index.d.ts +4 -0
- package/lib/utils/index.js +5 -1
- package/lib/utils/jwk.d.ts +98 -0
- package/lib/utils/jwk.js +139 -0
- package/lib/utils/logger.d.ts +30 -1
- package/lib/utils/logger.js +74 -27
- package/lib/utils/secret-encryption.d.ts +7 -2
- package/lib/utils/secret-encryption.js +47 -4
- package/lib/utils/secret-rotation.d.ts +17 -0
- package/lib/utils/secret-rotation.js +54 -0
- package/lib/utils/sensitive-patterns.d.ts +49 -0
- package/lib/utils/sensitive-patterns.js +149 -0
- package/lib/validation/common-schemas.js +5 -4
- package/package.json +20 -1
package/lib/utils/jwk.js
ADDED
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
// Copyright 2026 Pipeline Builder Contributors
|
|
2
|
+
// SPDX-License-Identifier: Apache-2.0
|
|
3
|
+
/**
|
|
4
|
+
* JWK primitives for the ASYMMETRIC user-token chain.
|
|
5
|
+
*
|
|
6
|
+
* Every token that speaks for a PERSON (access, refresh, step-up, and the
|
|
7
|
+
* short-lived token an opaque access key is exchanged for) is signed by
|
|
8
|
+
* **platform alone**, with ES256 and a `kid`, and verified by everyone else
|
|
9
|
+
* against the public keys platform publishes at `/.well-known/jwks.json`. No
|
|
10
|
+
* service holds a key that can mint a user token any more.
|
|
11
|
+
*
|
|
12
|
+
* Only Node's `crypto` is used — `createPublicKey`/`export` already speak JWK,
|
|
13
|
+
* so nothing here needs a JOSE library.
|
|
14
|
+
*
|
|
15
|
+
* Internal SERVICE tokens (`principalType: 'service'`) are ES256 too, signed by
|
|
16
|
+
* the CALLING service with its own key (#14, `services/service-keys.ts`). Both
|
|
17
|
+
* chains therefore share these primitives, and a bearer token is routed by which
|
|
18
|
+
* key set owns its `kid` rather than by its algorithm — see `middleware/auth.ts`.
|
|
19
|
+
*/
|
|
20
|
+
import crypto, {} from 'crypto';
|
|
21
|
+
/** The ONLY algorithm a user token may be signed with. */
|
|
22
|
+
export const USER_TOKEN_ALGORITHM = 'ES256';
|
|
23
|
+
/** The curve ES256 pins (`ECDSA_NIST_P256` / `prime256v1` / `ECC_NIST_P256` in KMS terms). */
|
|
24
|
+
export const USER_TOKEN_CURVE = 'P-256';
|
|
25
|
+
/** Path the public key set is served from (platform mounts it; nginx proxies it). */
|
|
26
|
+
export const JWKS_PATH = '/.well-known/jwks.json';
|
|
27
|
+
/**
|
|
28
|
+
* Decode a JWT's header WITHOUT verifying anything. Returns `null` for anything
|
|
29
|
+
* that is not a three-part token with a JSON object header — the caller then
|
|
30
|
+
* rejects, so this never widens what is accepted.
|
|
31
|
+
*/
|
|
32
|
+
export function decodeJwtHeader(token) {
|
|
33
|
+
const parts = token.split('.');
|
|
34
|
+
if (parts.length !== 3 || !parts[0])
|
|
35
|
+
return null;
|
|
36
|
+
try {
|
|
37
|
+
const header = JSON.parse(Buffer.from(parts[0], 'base64url').toString('utf-8'));
|
|
38
|
+
if (!header || typeof header !== 'object' || Array.isArray(header))
|
|
39
|
+
return null;
|
|
40
|
+
return header;
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
/**
|
|
47
|
+
* The RFC 7638 thumbprint of an EC public key, base64url-encoded — used as the
|
|
48
|
+
* `kid` everywhere.
|
|
49
|
+
*
|
|
50
|
+
* Deriving the id FROM the key (rather than naming keys by hand, or by their KMS
|
|
51
|
+
* ARN) means the same key always publishes under the same `kid` whatever signer
|
|
52
|
+
* holds it, a rotated-in key can never collide with the one it replaces, and no
|
|
53
|
+
* AWS account id ever reaches a token or the public JWKS.
|
|
54
|
+
*
|
|
55
|
+
* The hashed form is the canonical JSON of exactly `crv`, `kty`, `x`, `y`, in
|
|
56
|
+
* lexicographic order and with no whitespace — the spec's required members for
|
|
57
|
+
* an EC key.
|
|
58
|
+
*/
|
|
59
|
+
export function jwkThumbprint(jwk) {
|
|
60
|
+
const canonical = JSON.stringify({ crv: jwk.crv, kty: jwk.kty, x: jwk.x, y: jwk.y });
|
|
61
|
+
return crypto.createHash('sha256').update(canonical).digest('base64url');
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Project an EC P-256 public key onto the published JWK shape, with its
|
|
65
|
+
* thumbprint as `kid`. Throws when the key is not a P-256 EC key — a signer
|
|
66
|
+
* configured with the wrong key type must fail at boot, not mint tokens nobody
|
|
67
|
+
* can verify.
|
|
68
|
+
*/
|
|
69
|
+
export function publicJwkFrom(key) {
|
|
70
|
+
const exported = key.export({ format: 'jwk' });
|
|
71
|
+
if (exported.kty !== 'EC' || exported.crv !== USER_TOKEN_CURVE || !exported.x || !exported.y) {
|
|
72
|
+
throw new Error(`Token signing key must be an EC ${USER_TOKEN_CURVE} public key (got ${exported.kty ?? 'unknown'}/${exported.crv ?? 'unknown'})`);
|
|
73
|
+
}
|
|
74
|
+
const base = { kty: 'EC', crv: USER_TOKEN_CURVE, x: exported.x, y: exported.y };
|
|
75
|
+
return { ...base, kid: jwkThumbprint(base), use: 'sig', alg: 'ES256' };
|
|
76
|
+
}
|
|
77
|
+
/**
|
|
78
|
+
* Turn a published JWK back into a verification key. Throws for anything that is
|
|
79
|
+
* not an ES256-usable P-256 key, so a JWKS document with a surprise entry
|
|
80
|
+
* (a future RSA key, a `use: 'enc'` key) can never be pressed into verifying a
|
|
81
|
+
* user token.
|
|
82
|
+
*/
|
|
83
|
+
export function publicKeyFromJwk(jwk) {
|
|
84
|
+
if (jwk.kty !== 'EC' || jwk.crv !== USER_TOKEN_CURVE) {
|
|
85
|
+
throw new Error(`Unsupported JWKS entry: ${jwk.kty}/${jwk.crv}`);
|
|
86
|
+
}
|
|
87
|
+
if (jwk.use !== undefined && jwk.use !== 'sig')
|
|
88
|
+
throw new Error('JWKS entry is not a signing key');
|
|
89
|
+
if (jwk.alg !== undefined && jwk.alg !== USER_TOKEN_ALGORITHM)
|
|
90
|
+
throw new Error(`JWKS entry algorithm is not ${USER_TOKEN_ALGORITHM}`);
|
|
91
|
+
return crypto.createPublicKey({ key: { kty: 'EC', crv: jwk.crv, x: jwk.x, y: jwk.y }, format: 'jwk' });
|
|
92
|
+
}
|
|
93
|
+
/** True when `value` is shaped like the JWKS document (keys array of objects). */
|
|
94
|
+
export function isJwksDocument(value) {
|
|
95
|
+
return !!value
|
|
96
|
+
&& typeof value === 'object'
|
|
97
|
+
&& Array.isArray(value.keys)
|
|
98
|
+
&& value.keys.every((k) => !!k && typeof k === 'object');
|
|
99
|
+
}
|
|
100
|
+
/**
|
|
101
|
+
* Convert an ECDSA signature from ASN.1 DER (what AWS KMS returns) to the raw
|
|
102
|
+
* fixed-width `r || s` JOSE form a JWT carries.
|
|
103
|
+
*
|
|
104
|
+
* DER is `SEQUENCE { INTEGER r, INTEGER s }` with both integers minimally
|
|
105
|
+
* encoded and sign-padded; JOSE wants each coordinate left-zero-padded to
|
|
106
|
+
* exactly the curve size (32 bytes for P-256). Getting this wrong produces
|
|
107
|
+
* tokens that verify nowhere, so it is strict: any structural surprise throws.
|
|
108
|
+
*/
|
|
109
|
+
export function derToJoseSignature(der, coordinateBytes = 32) {
|
|
110
|
+
if (der[0] !== 0x30)
|
|
111
|
+
throw new Error('Malformed DER signature: expected SEQUENCE');
|
|
112
|
+
// Length byte(s): short form (<0x80) or long form (0x81 for a 1-byte length).
|
|
113
|
+
let offset = 1;
|
|
114
|
+
if (der[offset] === 0x81)
|
|
115
|
+
offset += 2;
|
|
116
|
+
else if (der[offset] < 0x80)
|
|
117
|
+
offset += 1;
|
|
118
|
+
else
|
|
119
|
+
throw new Error('Malformed DER signature: unsupported length encoding');
|
|
120
|
+
const readInt = () => {
|
|
121
|
+
if (der[offset] !== 0x02)
|
|
122
|
+
throw new Error('Malformed DER signature: expected INTEGER');
|
|
123
|
+
const len = der[offset + 1];
|
|
124
|
+
const start = offset + 2;
|
|
125
|
+
offset = start + len;
|
|
126
|
+
let value = der.subarray(start, offset);
|
|
127
|
+
// Strip the sign-padding byte DER adds when the high bit is set…
|
|
128
|
+
while (value.length > coordinateBytes && value[0] === 0x00)
|
|
129
|
+
value = value.subarray(1);
|
|
130
|
+
if (value.length > coordinateBytes)
|
|
131
|
+
throw new Error('Malformed DER signature: coordinate too large');
|
|
132
|
+
// …then left-pad back out to the fixed curve width JOSE requires.
|
|
133
|
+
return Buffer.concat([Buffer.alloc(coordinateBytes - value.length), value]);
|
|
134
|
+
};
|
|
135
|
+
const r = readInt();
|
|
136
|
+
const s = readInt();
|
|
137
|
+
return Buffer.concat([r, s]);
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"jwk.js","sourceRoot":"","sources":["../../src/utils/jwk.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2026 Pipeline Builder Contributors\n// SPDX-License-Identifier: Apache-2.0\n\n/**\n * JWK primitives for the ASYMMETRIC user-token chain.\n *\n * Every token that speaks for a PERSON (access, refresh, step-up, and the\n * short-lived token an opaque access key is exchanged for) is signed by\n * **platform alone**, with ES256 and a `kid`, and verified by everyone else\n * against the public keys platform publishes at `/.well-known/jwks.json`. No\n * service holds a key that can mint a user token any more.\n *\n * Only Node's `crypto` is used — `createPublicKey`/`export` already speak JWK,\n * so nothing here needs a JOSE library.\n *\n * Internal SERVICE tokens (`principalType: 'service'`) are ES256 too, signed by\n * the CALLING service with its own key (#14, `services/service-keys.ts`). Both\n * chains therefore share these primitives, and a bearer token is routed by which\n * key set owns its `kid` rather than by its algorithm — see `middleware/auth.ts`.\n */\n\nimport crypto, { type KeyObject } from 'crypto';\n\n/** The ONLY algorithm a user token may be signed with. */\nexport const USER_TOKEN_ALGORITHM = 'ES256';\n\n/** The curve ES256 pins (`ECDSA_NIST_P256` / `prime256v1` / `ECC_NIST_P256` in KMS terms). */\nexport const USER_TOKEN_CURVE = 'P-256';\n\n/** Path the public key set is served from (platform mounts it; nginx proxies it). */\nexport const JWKS_PATH = '/.well-known/jwks.json';\n\n/** One published EC public key. */\nexport interface PublicJwk {\n  kty: 'EC';\n  crv: 'P-256';\n  /** base64url X coordinate. */\n  x: string;\n  /** base64url Y coordinate. */\n  y: string;\n  /** RFC 7638 thumbprint — stable for the key, so rotation is a `kid` change. */\n  kid: string;\n  use: 'sig';\n  alg: 'ES256';\n}\n\n/** The document served at {@link JWKS_PATH}. */\nexport interface JwksDocument {\n  keys: PublicJwk[];\n}\n\n/** The header fields a verifier needs before it can pick a key. */\nexport interface JwtHeader {\n  alg?: string;\n  kid?: string;\n  typ?: string;\n}\n\n/**\n * Decode a JWT's header WITHOUT verifying anything. Returns `null` for anything\n * that is not a three-part token with a JSON object header — the caller then\n * rejects, so this never widens what is accepted.\n */\nexport function decodeJwtHeader(token: string): JwtHeader | null {\n  const parts = token.split('.');\n  if (parts.length !== 3 || !parts[0]) return null;\n  try {\n    const header = JSON.parse(Buffer.from(parts[0], 'base64url').toString('utf-8')) as unknown;\n    if (!header || typeof header !== 'object' || Array.isArray(header)) return null;\n    return header as JwtHeader;\n  } catch {\n    return null;\n  }\n}\n\n/**\n * The RFC 7638 thumbprint of an EC public key, base64url-encoded — used as the\n * `kid` everywhere.\n *\n * Deriving the id FROM the key (rather than naming keys by hand, or by their KMS\n * ARN) means the same key always publishes under the same `kid` whatever signer\n * holds it, a rotated-in key can never collide with the one it replaces, and no\n * AWS account id ever reaches a token or the public JWKS.\n *\n * The hashed form is the canonical JSON of exactly `crv`, `kty`, `x`, `y`, in\n * lexicographic order and with no whitespace — the spec's required members for\n * an EC key.\n */\nexport function jwkThumbprint(jwk: { crv: string; kty: string; x: string; y: string }): string {\n  const canonical = JSON.stringify({ crv: jwk.crv, kty: jwk.kty, x: jwk.x, y: jwk.y });\n  return crypto.createHash('sha256').update(canonical).digest('base64url');\n}\n\n/**\n * Project an EC P-256 public key onto the published JWK shape, with its\n * thumbprint as `kid`. Throws when the key is not a P-256 EC key — a signer\n * configured with the wrong key type must fail at boot, not mint tokens nobody\n * can verify.\n */\nexport function publicJwkFrom(key: KeyObject): PublicJwk {\n  const exported = key.export({ format: 'jwk' }) as { kty?: string; crv?: string; x?: string; y?: string };\n  if (exported.kty !== 'EC' || exported.crv !== USER_TOKEN_CURVE || !exported.x || !exported.y) {\n    throw new Error(`Token signing key must be an EC ${USER_TOKEN_CURVE} public key (got ${exported.kty ?? 'unknown'}/${exported.crv ?? 'unknown'})`);\n  }\n  const base = { kty: 'EC' as const, crv: USER_TOKEN_CURVE as 'P-256', x: exported.x, y: exported.y };\n  return { ...base, kid: jwkThumbprint(base), use: 'sig', alg: 'ES256' };\n}\n\n/**\n * Turn a published JWK back into a verification key. Throws for anything that is\n * not an ES256-usable P-256 key, so a JWKS document with a surprise entry\n * (a future RSA key, a `use: 'enc'` key) can never be pressed into verifying a\n * user token.\n */\nexport function publicKeyFromJwk(jwk: PublicJwk): KeyObject {\n  if (jwk.kty !== 'EC' || jwk.crv !== USER_TOKEN_CURVE) {\n    throw new Error(`Unsupported JWKS entry: ${jwk.kty}/${jwk.crv}`);\n  }\n  if (jwk.use !== undefined && jwk.use !== 'sig') throw new Error('JWKS entry is not a signing key');\n  if (jwk.alg !== undefined && jwk.alg !== USER_TOKEN_ALGORITHM) throw new Error(`JWKS entry algorithm is not ${USER_TOKEN_ALGORITHM}`);\n  return crypto.createPublicKey({ key: { kty: 'EC', crv: jwk.crv, x: jwk.x, y: jwk.y }, format: 'jwk' });\n}\n\n/** True when `value` is shaped like the JWKS document (keys array of objects). */\nexport function isJwksDocument(value: unknown): value is JwksDocument {\n  return !!value\n    && typeof value === 'object'\n    && Array.isArray((value as { keys?: unknown }).keys)\n    && (value as { keys: unknown[] }).keys.every((k) => !!k && typeof k === 'object');\n}\n\n/**\n * Convert an ECDSA signature from ASN.1 DER (what AWS KMS returns) to the raw\n * fixed-width `r || s` JOSE form a JWT carries.\n *\n * DER is `SEQUENCE { INTEGER r, INTEGER s }` with both integers minimally\n * encoded and sign-padded; JOSE wants each coordinate left-zero-padded to\n * exactly the curve size (32 bytes for P-256). Getting this wrong produces\n * tokens that verify nowhere, so it is strict: any structural surprise throws.\n */\nexport function derToJoseSignature(der: Buffer, coordinateBytes = 32): Buffer {\n  if (der[0] !== 0x30) throw new Error('Malformed DER signature: expected SEQUENCE');\n  // Length byte(s): short form (<0x80) or long form (0x81 for a 1-byte length).\n  let offset = 1;\n  if (der[offset] === 0x81) offset += 2;\n  else if (der[offset] < 0x80) offset += 1;\n  else throw new Error('Malformed DER signature: unsupported length encoding');\n\n  const readInt = (): Buffer => {\n    if (der[offset] !== 0x02) throw new Error('Malformed DER signature: expected INTEGER');\n    const len = der[offset + 1];\n    const start = offset + 2;\n    offset = start + len;\n    let value = der.subarray(start, offset);\n    // Strip the sign-padding byte DER adds when the high bit is set…\n    while (value.length > coordinateBytes && value[0] === 0x00) value = value.subarray(1);\n    if (value.length > coordinateBytes) throw new Error('Malformed DER signature: coordinate too large');\n    // …then left-pad back out to the fixed curve width JOSE requires.\n    return Buffer.concat([Buffer.alloc(coordinateBytes - value.length), value]);\n  };\n\n  const r = readInt();\n  const s = readInt();\n  return Buffer.concat([r, s]);\n}\n"]}
|
package/lib/utils/logger.d.ts
CHANGED
|
@@ -1,4 +1,30 @@
|
|
|
1
1
|
import winston from 'winston';
|
|
2
|
+
/**
|
|
3
|
+
* Per-request identity stamped onto every log entry, so log lines can be
|
|
4
|
+
* attributed to the org that caused them.
|
|
5
|
+
*
|
|
6
|
+
* `orgId` is the tenancy key for the Logs surface: promtail routes each line to
|
|
7
|
+
* its org's Loki tenant from this field (see `docs/plans/frontend-logs.md`). A
|
|
8
|
+
* line written outside a request scope (startup, background worker, migration)
|
|
9
|
+
* has no org and lands in the sysadmin-only `_infra` tenant — fail-closed.
|
|
10
|
+
*/
|
|
11
|
+
export interface LogContext {
|
|
12
|
+
orgId?: string;
|
|
13
|
+
userId?: string;
|
|
14
|
+
}
|
|
15
|
+
type LogContextProvider = () => LogContext | undefined;
|
|
16
|
+
/**
|
|
17
|
+
* Register the source of per-entry {@link LogContext}.
|
|
18
|
+
*
|
|
19
|
+
* A registration hook rather than a direct import because the request scope
|
|
20
|
+
* lives in `pipeline-data`'s AsyncLocalStorage, and `pipeline-data` depends on
|
|
21
|
+
* this package — importing it here would invert the dependency. `api-server`'s
|
|
22
|
+
* tenant-context module owns the single call, which covers every service that
|
|
23
|
+
* mounts `withTenantContext` (platform included).
|
|
24
|
+
*
|
|
25
|
+
* Pass `undefined` to unregister (tests).
|
|
26
|
+
*/
|
|
27
|
+
export declare function setLogContextProvider(fn: LogContextProvider | undefined): void;
|
|
2
28
|
/**
|
|
3
29
|
* Redact sensitive values from an ARBITRARY payload using the same key-pattern
|
|
4
30
|
* rules the Winston `redactFormat` applies to log metadata. Use this for
|
|
@@ -30,7 +56,10 @@ export declare function redactSensitive(value: unknown): unknown;
|
|
|
30
56
|
* logger.error('Database error', { error: err.message });
|
|
31
57
|
* ```
|
|
32
58
|
*/
|
|
33
|
-
|
|
59
|
+
/** The logger `createLogger` returns. Exported so consumers can annotate exported
|
|
60
|
+
* loggers without depending on winston themselves. */
|
|
61
|
+
export type Logger = winston.Logger;
|
|
62
|
+
export declare function createLogger(serviceName: string): Logger;
|
|
34
63
|
/**
|
|
35
64
|
* Default logger instance (service name from SERVICE_NAME env var or 'api').
|
|
36
65
|
*/
|
package/lib/utils/logger.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
import winston from 'winston';
|
|
4
4
|
import { safeCreateRequire } from './safe-require.js';
|
|
5
|
+
import { SENSITIVE_KEY_PATTERN, REDACTED, maskLine } from './sensitive-patterns.js';
|
|
5
6
|
const { combine, timestamp, printf, colorize, errors, json } = winston.format;
|
|
6
7
|
// ESM has no global `require`; safeCreateRequire enables the synchronous,
|
|
7
8
|
// OPTIONAL lazy-load of @opentelemetry/api in getCurrentTraceId() below — a
|
|
@@ -48,14 +49,47 @@ const traceIdFormat = winston.format((info) => {
|
|
|
48
49
|
info.trace_id = traceId;
|
|
49
50
|
return info;
|
|
50
51
|
})();
|
|
52
|
+
let logContextProvider;
|
|
51
53
|
/**
|
|
52
|
-
*
|
|
53
|
-
*
|
|
54
|
-
*
|
|
55
|
-
*
|
|
54
|
+
* Register the source of per-entry {@link LogContext}.
|
|
55
|
+
*
|
|
56
|
+
* A registration hook rather than a direct import because the request scope
|
|
57
|
+
* lives in `pipeline-data`'s AsyncLocalStorage, and `pipeline-data` depends on
|
|
58
|
+
* this package — importing it here would invert the dependency. `api-server`'s
|
|
59
|
+
* tenant-context module owns the single call, which covers every service that
|
|
60
|
+
* mounts `withTenantContext` (platform included).
|
|
61
|
+
*
|
|
62
|
+
* Pass `undefined` to unregister (tests).
|
|
56
63
|
*/
|
|
57
|
-
|
|
58
|
-
|
|
64
|
+
export function setLogContextProvider(fn) {
|
|
65
|
+
logContextProvider = fn;
|
|
66
|
+
}
|
|
67
|
+
/** Winston format stamping the ambient {@link LogContext}. Never throws: a
|
|
68
|
+
* provider that blows up must not take down logging. An entry that already
|
|
69
|
+
* carries an explicit `orgId` (a call site logging about ANOTHER org) keeps it
|
|
70
|
+
* — the ambient value never overwrites a deliberate one. */
|
|
71
|
+
const logContextFormat = winston.format((info) => {
|
|
72
|
+
if (!logContextProvider)
|
|
73
|
+
return info;
|
|
74
|
+
let ctx;
|
|
75
|
+
try {
|
|
76
|
+
ctx = logContextProvider();
|
|
77
|
+
}
|
|
78
|
+
catch {
|
|
79
|
+
return info;
|
|
80
|
+
}
|
|
81
|
+
if (!ctx)
|
|
82
|
+
return info;
|
|
83
|
+
if (ctx.orgId && info.orgId === undefined)
|
|
84
|
+
info.orgId = ctx.orgId;
|
|
85
|
+
if (ctx.userId && info.userId === undefined)
|
|
86
|
+
info.userId = ctx.userId;
|
|
87
|
+
return info;
|
|
88
|
+
})();
|
|
89
|
+
// `SENSITIVE_KEY_PATTERN` (keys) and `maskLine` (secret-shaped values) both come
|
|
90
|
+
// from `sensitive-patterns.ts`, so the logger, platform's log-read path and the
|
|
91
|
+
// generated promtail `replace` stages mask the same things. See that module's
|
|
92
|
+
// header for why ingest-time masking is the authoritative layer.
|
|
59
93
|
function redactDeep(value, depth = 0) {
|
|
60
94
|
// Cap depth so a malicious / pathological circular object can't lock the logger.
|
|
61
95
|
// Degrade to a placeholder rather than the raw subtree: returning `value` here
|
|
@@ -96,7 +130,12 @@ export function redactSensitive(value) {
|
|
|
96
130
|
* (`Symbol.for('level')`, `Symbol.for('message')`, `Symbol.for('splat')`) survive
|
|
97
131
|
* — rebuilding a fresh object via `Object.entries`/spread silently strips them,
|
|
98
132
|
* which makes the Console transport drop every entry without warning. */
|
|
99
|
-
|
|
133
|
+
/** Keys the redactor must leave alone. `orgId`/`userId` are load-bearing: promtail
|
|
134
|
+
* routes a line to its Loki tenant by `orgId`, so redacting it would misfile the
|
|
135
|
+
* line into the sysadmin-only `_infra` tenant instead of the org's. Listed here
|
|
136
|
+
* (not merely "doesn't match the pattern today") so a future pattern edit can't
|
|
137
|
+
* silently break log tenancy. */
|
|
138
|
+
const PRESERVED_KEYS = new Set(['level', 'message', 'timestamp', 'service', 'trace_id', 'orgId', 'userId']);
|
|
100
139
|
const redactFormat = winston.format((info) => {
|
|
101
140
|
for (const key of Object.keys(info)) {
|
|
102
141
|
if (PRESERVED_KEYS.has(key))
|
|
@@ -111,26 +150,28 @@ const redactFormat = winston.format((info) => {
|
|
|
111
150
|
return info;
|
|
112
151
|
})();
|
|
113
152
|
/**
|
|
114
|
-
*
|
|
153
|
+
* Winston format that masks secret-shaped VALUES in the rendered message and in
|
|
154
|
+
* any string metadata.
|
|
115
155
|
*
|
|
116
|
-
*
|
|
117
|
-
*
|
|
118
|
-
*
|
|
119
|
-
*
|
|
120
|
-
*
|
|
121
|
-
*
|
|
122
|
-
* @param serviceName - Name of the service for log identification
|
|
123
|
-
* @returns Configured Winston logger instance
|
|
124
|
-
*
|
|
125
|
-
* @example
|
|
126
|
-
* ```typescript
|
|
127
|
-
* import { createLogger } from '@pipeline-builder/api-core';
|
|
128
|
-
*
|
|
129
|
-
* const logger = createLogger('get-plugin');
|
|
130
|
-
* logger.info('Server started', { port: 3000 });
|
|
131
|
-
* logger.error('Database error', { error: err.message });
|
|
132
|
-
* ```
|
|
156
|
+
* `redactFormat` above only masks values whose KEY looks sensitive. That misses
|
|
157
|
+
* a secret embedded in free text — `logger.info('POST /x?token=abc')` — which
|
|
158
|
+
* matters more than it looks: promtail's `output: { source: msg }` stage makes
|
|
159
|
+
* the message string the entire shipped log line, so an unmasked message is an
|
|
160
|
+
* unmasked log. Mutates in place to preserve winston's Symbol-keyed internals,
|
|
161
|
+
* exactly as `redactFormat` does.
|
|
133
162
|
*/
|
|
163
|
+
const maskFormat = winston.format((info) => {
|
|
164
|
+
if (typeof info.message === 'string')
|
|
165
|
+
info.message = maskLine(info.message);
|
|
166
|
+
for (const key of Object.keys(info)) {
|
|
167
|
+
if (key === 'message')
|
|
168
|
+
continue;
|
|
169
|
+
const value = info[key];
|
|
170
|
+
if (typeof value === 'string')
|
|
171
|
+
info[key] = maskLine(value);
|
|
172
|
+
}
|
|
173
|
+
return info;
|
|
174
|
+
})();
|
|
134
175
|
export function createLogger(serviceName) {
|
|
135
176
|
const logLevel = process.env.LOG_LEVEL || 'info';
|
|
136
177
|
const logFormat = process.env.LOG_FORMAT || 'json';
|
|
@@ -140,12 +181,18 @@ export function createLogger(serviceName) {
|
|
|
140
181
|
}
|
|
141
182
|
const useJson = logFormat !== 'text';
|
|
142
183
|
// Order matters: redact BEFORE serialization so masked keys never reach
|
|
143
|
-
// the output. trace_id
|
|
184
|
+
// the output. trace_id and the org/user context are stamped first so they
|
|
185
|
+
// survive redaction (both are in PRESERVED_KEYS), then `maskFormat` scrubs
|
|
186
|
+
// secret-shaped VALUES out of the rendered message — the key-based
|
|
187
|
+
// `redactFormat` only covers metadata keys, and after promtail's
|
|
188
|
+
// `output: source: msg` rewrite the shipped line IS the message string.
|
|
144
189
|
const baseFormats = [
|
|
145
190
|
errors({ stack: true }),
|
|
146
191
|
timestamp({ format: 'YYYY-MM-DDTHH:mm:ss.SSSZ' }),
|
|
147
192
|
traceIdFormat,
|
|
193
|
+
logContextFormat,
|
|
148
194
|
redactFormat,
|
|
195
|
+
maskFormat,
|
|
149
196
|
];
|
|
150
197
|
if (useJson) {
|
|
151
198
|
return winston.createLogger({
|
|
@@ -171,4 +218,4 @@ export function createLogger(serviceName) {
|
|
|
171
218
|
*/
|
|
172
219
|
export const logger = createLogger(process.env.SERVICE_NAME || 'api');
|
|
173
220
|
export default logger;
|
|
174
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2026 Pipeline Builder Contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport winston from 'winston';\nimport { safeCreateRequire } from './safe-require.js';\n\nconst { combine, timestamp, printf, colorize, errors, json } = winston.format;\n\n// ESM has no global `require`; safeCreateRequire enables the synchronous,\n// OPTIONAL lazy-load of @opentelemetry/api in getCurrentTraceId() below — a\n// winston format callback must stay synchronous, so a dynamic import() won't\n// work there. (CJS-bundle safe — see safe-require.ts.)\nconst require = safeCreateRequire(import.meta.url);\n\n/**\n * Custom log format for human-readable console output.\n */\nconst consoleFormat = printf(({ level, message, timestamp, service, ...meta }) => {\n  const serviceName = service ? `[${service}]` : '';\n  const metaStr = Object.keys(meta).length ? ` ${JSON.stringify(meta)}` : '';\n  return `${timestamp} ${level} ${serviceName} ${message}${metaStr}`;\n});\n\n/**\n * Lazy lookup of OpenTelemetry trace ID. Returns undefined when tracing\n * isn't initialized or @opentelemetry/api isn't installed — never throws.\n * Cheap: a single property read after the first successful lookup.\n */\nlet _otelApi: { trace?: { getActiveSpan(): { spanContext(): { traceId: string } } | undefined } } | null | undefined;\nfunction getCurrentTraceId(): string | undefined {\n  if (_otelApi === undefined) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-require-imports\n      _otelApi = require('@opentelemetry/api');\n    } catch {\n      _otelApi = null;\n    }\n  }\n  if (!_otelApi) return undefined;\n  try {\n    return _otelApi.trace?.getActiveSpan()?.spanContext().traceId;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Winston format that stamps `trace_id` on every entry when an OTel span is active. */\nconst traceIdFormat = winston.format((info) => {\n  const traceId = getCurrentTraceId();\n  if (traceId) info.trace_id = traceId;\n  return info;\n})();\n\n/**\n * Keys that should never appear in logs. Match is case-insensitive and\n * anchored substring — `Authorization`, `auth_header`, `MY_PASSWORD` all hit.\n * Add a new term here only if you've seen real-world leakage; over-redaction\n * makes incident debugging harder.\n */\nconst SENSITIVE_KEY_PATTERN = /password|secret|bearer|api[_-]?key|cookie|token|^auth(orization|_header)?$|stripe[_-]?(key|secret)|mongo(db)?[_-]?uri/i;\nconst REDACTED = '[REDACTED]';\n\nfunction redactDeep(value: unknown, depth = 0): unknown {\n  // Cap depth so a malicious / pathological circular object can't lock the logger.\n  // Degrade to a placeholder rather than the raw subtree: returning `value` here\n  // would log a secret-keyed field nested deeper than the cap in cleartext.\n  if (depth > 6) return '[TRUNCATED]';\n  if (value == null || typeof value !== 'object') return value;\n  if (Array.isArray(value)) return value.map((v) => redactDeep(v, depth + 1));\n  const out: Record<string, unknown> = {};\n  for (const [k, v] of Object.entries(value as Record<string, unknown>)) {\n    if (SENSITIVE_KEY_PATTERN.test(k)) {\n      out[k] = REDACTED;\n    } else {\n      out[k] = redactDeep(v, depth + 1);\n    }\n  }\n  return out;\n}\n\n/**\n * Redact sensitive values from an ARBITRARY payload using the same key-pattern\n * rules the Winston `redactFormat` applies to log metadata. Use this for\n * payloads that reach an output channel OUTSIDE the logger — e.g. an SSE frame\n * pushed straight to a client — so a `password`/`token`/`secret` field is\n * masked there too. A top-level sensitive key is masked; nested objects/arrays\n * are walked (depth-capped) exactly as in the logger. Returns a redacted COPY;\n * primitives pass through unchanged.\n */\nexport function redactSensitive(value: unknown): unknown {\n  if (value == null || typeof value !== 'object') return value;\n  return redactDeep(value);\n}\n\n/** Winston format that masks values for sensitive-looking keys (PII / secrets).\n * Mutates `info` in place so winston's internal Symbol-keyed properties\n * (`Symbol.for('level')`, `Symbol.for('message')`, `Symbol.for('splat')`) survive\n * — rebuilding a fresh object via `Object.entries`/spread silently strips them,\n * which makes the Console transport drop every entry without warning. */\nconst PRESERVED_KEYS = new Set(['level', 'message', 'timestamp', 'service', 'trace_id']);\nconst redactFormat = winston.format((info) => {\n  for (const key of Object.keys(info)) {\n    if (PRESERVED_KEYS.has(key)) continue;\n    if (SENSITIVE_KEY_PATTERN.test(key)) {\n      info[key] = REDACTED;\n    } else {\n      info[key] = redactDeep(info[key]);\n    }\n  }\n  return info;\n})();\n\n/**\n * Create a logger instance for a service.\n *\n * When LOG_FORMAT=json (default), outputs structured JSON for Loki ingestion:\n *   {\"level\":\"info\",\"message\":\"Server started\",\"service\":\"pipeline\",\"timestamp\":\"...\"}\n *\n * When LOG_FORMAT=text, outputs colorized human-readable format:\n *   2026-02-13T10:30:00.000Z info [pipeline] Server started\n *\n * @param serviceName - Name of the service for log identification\n * @returns Configured Winston logger instance\n *\n * @example\n * ```typescript\n * import { createLogger } from '@pipeline-builder/api-core';\n *\n * const logger = createLogger('get-plugin');\n * logger.info('Server started', { port: 3000 });\n * logger.error('Database error', { error: err.message });\n * ```\n */\nexport function createLogger(serviceName: string): winston.Logger {\n  const logLevel = process.env.LOG_LEVEL || 'info';\n  const logFormat = process.env.LOG_FORMAT || 'json';\n  if (logFormat !== 'json' && logFormat !== 'text') {\n    // eslint-disable-next-line no-console -- startup warning before logger is available\n    console.warn(`Invalid LOG_FORMAT=\"${logFormat}\", expected \"json\" or \"text\". Defaulting to \"json\".`);\n  }\n  const useJson = logFormat !== 'text';\n\n  // Order matters: redact BEFORE serialization so masked keys never reach\n  // the output. trace_id is stamped first so it survives redaction.\n  const baseFormats = [\n    errors({ stack: true }),\n    timestamp({ format: 'YYYY-MM-DDTHH:mm:ss.SSSZ' }),\n    traceIdFormat,\n    redactFormat,\n  ];\n\n  if (useJson) {\n    return winston.createLogger({\n      level: logLevel,\n      defaultMeta: { service: serviceName },\n      format: combine(...baseFormats, json()),\n      transports: [new winston.transports.Console()],\n    });\n  }\n\n  return winston.createLogger({\n    level: logLevel,\n    defaultMeta: { service: serviceName },\n    format: combine(...baseFormats),\n    transports: [\n      new winston.transports.Console({\n        format: combine(colorize(), consoleFormat),\n      }),\n    ],\n  });\n}\n\n/**\n * Default logger instance (service name from SERVICE_NAME env var or 'api').\n */\nexport const logger = createLogger(process.env.SERVICE_NAME || 'api');\n\nexport default logger;\n"]}
|
|
221
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/utils/logger.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2026 Pipeline Builder Contributors\n// SPDX-License-Identifier: Apache-2.0\n\nimport winston from 'winston';\nimport { safeCreateRequire } from './safe-require.js';\nimport { SENSITIVE_KEY_PATTERN, REDACTED, maskLine } from './sensitive-patterns.js';\n\nconst { combine, timestamp, printf, colorize, errors, json } = winston.format;\n\n// ESM has no global `require`; safeCreateRequire enables the synchronous,\n// OPTIONAL lazy-load of @opentelemetry/api in getCurrentTraceId() below — a\n// winston format callback must stay synchronous, so a dynamic import() won't\n// work there. (CJS-bundle safe — see safe-require.ts.)\nconst require = safeCreateRequire(import.meta.url);\n\n/**\n * Custom log format for human-readable console output.\n */\nconst consoleFormat = printf(({ level, message, timestamp, service, ...meta }) => {\n  const serviceName = service ? `[${service}]` : '';\n  const metaStr = Object.keys(meta).length ? ` ${JSON.stringify(meta)}` : '';\n  return `${timestamp} ${level} ${serviceName} ${message}${metaStr}`;\n});\n\n/**\n * Lazy lookup of OpenTelemetry trace ID. Returns undefined when tracing\n * isn't initialized or @opentelemetry/api isn't installed — never throws.\n * Cheap: a single property read after the first successful lookup.\n */\nlet _otelApi: { trace?: { getActiveSpan(): { spanContext(): { traceId: string } } | undefined } } | null | undefined;\nfunction getCurrentTraceId(): string | undefined {\n  if (_otelApi === undefined) {\n    try {\n      // eslint-disable-next-line @typescript-eslint/no-require-imports\n      _otelApi = require('@opentelemetry/api');\n    } catch {\n      _otelApi = null;\n    }\n  }\n  if (!_otelApi) return undefined;\n  try {\n    return _otelApi.trace?.getActiveSpan()?.spanContext().traceId;\n  } catch {\n    return undefined;\n  }\n}\n\n/** Winston format that stamps `trace_id` on every entry when an OTel span is active. */\nconst traceIdFormat = winston.format((info) => {\n  const traceId = getCurrentTraceId();\n  if (traceId) info.trace_id = traceId;\n  return info;\n})();\n\n/**\n * Per-request identity stamped onto every log entry, so log lines can be\n * attributed to the org that caused them.\n *\n * `orgId` is the tenancy key for the Logs surface: promtail routes each line to\n * its org's Loki tenant from this field (see `docs/plans/frontend-logs.md`). A\n * line written outside a request scope (startup, background worker, migration)\n * has no org and lands in the sysadmin-only `_infra` tenant — fail-closed.\n */\nexport interface LogContext {\n  orgId?: string;\n  userId?: string;\n}\n\ntype LogContextProvider = () => LogContext | undefined;\n\nlet logContextProvider: LogContextProvider | undefined;\n\n/**\n * Register the source of per-entry {@link LogContext}.\n *\n * A registration hook rather than a direct import because the request scope\n * lives in `pipeline-data`'s AsyncLocalStorage, and `pipeline-data` depends on\n * this package — importing it here would invert the dependency. `api-server`'s\n * tenant-context module owns the single call, which covers every service that\n * mounts `withTenantContext` (platform included).\n *\n * Pass `undefined` to unregister (tests).\n */\nexport function setLogContextProvider(fn: LogContextProvider | undefined): void {\n  logContextProvider = fn;\n}\n\n/** Winston format stamping the ambient {@link LogContext}. Never throws: a\n *  provider that blows up must not take down logging. An entry that already\n *  carries an explicit `orgId` (a call site logging about ANOTHER org) keeps it\n *  — the ambient value never overwrites a deliberate one. */\nconst logContextFormat = winston.format((info) => {\n  if (!logContextProvider) return info;\n  let ctx: LogContext | undefined;\n  try {\n    ctx = logContextProvider();\n  } catch {\n    return info;\n  }\n  if (!ctx) return info;\n  if (ctx.orgId && info.orgId === undefined) info.orgId = ctx.orgId;\n  if (ctx.userId && info.userId === undefined) info.userId = ctx.userId;\n  return info;\n})();\n\n// `SENSITIVE_KEY_PATTERN` (keys) and `maskLine` (secret-shaped values) both come\n// from `sensitive-patterns.ts`, so the logger, platform's log-read path and the\n// generated promtail `replace` stages mask the same things. See that module's\n// header for why ingest-time masking is the authoritative layer.\n\nfunction redactDeep(value: unknown, depth = 0): unknown {\n  // Cap depth so a malicious / pathological circular object can't lock the logger.\n  // Degrade to a placeholder rather than the raw subtree: returning `value` here\n  // would log a secret-keyed field nested deeper than the cap in cleartext.\n  if (depth > 6) return '[TRUNCATED]';\n  if (value == null || typeof value !== 'object') return value;\n  if (Array.isArray(value)) return value.map((v) => redactDeep(v, depth + 1));\n  const out: Record<string, unknown> = {};\n  for (const [k, v] of Object.entries(value as Record<string, unknown>)) {\n    if (SENSITIVE_KEY_PATTERN.test(k)) {\n      out[k] = REDACTED;\n    } else {\n      out[k] = redactDeep(v, depth + 1);\n    }\n  }\n  return out;\n}\n\n/**\n * Redact sensitive values from an ARBITRARY payload using the same key-pattern\n * rules the Winston `redactFormat` applies to log metadata. Use this for\n * payloads that reach an output channel OUTSIDE the logger — e.g. an SSE frame\n * pushed straight to a client — so a `password`/`token`/`secret` field is\n * masked there too. A top-level sensitive key is masked; nested objects/arrays\n * are walked (depth-capped) exactly as in the logger. Returns a redacted COPY;\n * primitives pass through unchanged.\n */\nexport function redactSensitive(value: unknown): unknown {\n  if (value == null || typeof value !== 'object') return value;\n  return redactDeep(value);\n}\n\n/** Winston format that masks values for sensitive-looking keys (PII / secrets).\n * Mutates `info` in place so winston's internal Symbol-keyed properties\n * (`Symbol.for('level')`, `Symbol.for('message')`, `Symbol.for('splat')`) survive\n * — rebuilding a fresh object via `Object.entries`/spread silently strips them,\n * which makes the Console transport drop every entry without warning. */\n/** Keys the redactor must leave alone. `orgId`/`userId` are load-bearing: promtail\n *  routes a line to its Loki tenant by `orgId`, so redacting it would misfile the\n *  line into the sysadmin-only `_infra` tenant instead of the org's. Listed here\n *  (not merely \"doesn't match the pattern today\") so a future pattern edit can't\n *  silently break log tenancy. */\nconst PRESERVED_KEYS = new Set(['level', 'message', 'timestamp', 'service', 'trace_id', 'orgId', 'userId']);\nconst redactFormat = winston.format((info) => {\n  for (const key of Object.keys(info)) {\n    if (PRESERVED_KEYS.has(key)) continue;\n    if (SENSITIVE_KEY_PATTERN.test(key)) {\n      info[key] = REDACTED;\n    } else {\n      info[key] = redactDeep(info[key]);\n    }\n  }\n  return info;\n})();\n\n/**\n * Winston format that masks secret-shaped VALUES in the rendered message and in\n * any string metadata.\n *\n * `redactFormat` above only masks values whose KEY looks sensitive. That misses\n * a secret embedded in free text — `logger.info('POST /x?token=abc')` — which\n * matters more than it looks: promtail's `output: { source: msg }` stage makes\n * the message string the entire shipped log line, so an unmasked message is an\n * unmasked log. Mutates in place to preserve winston's Symbol-keyed internals,\n * exactly as `redactFormat` does.\n */\nconst maskFormat = winston.format((info) => {\n  if (typeof info.message === 'string') info.message = maskLine(info.message);\n  for (const key of Object.keys(info)) {\n    if (key === 'message') continue;\n    const value = info[key];\n    if (typeof value === 'string') info[key] = maskLine(value);\n  }\n  return info;\n})();\n\n/**\n * Create a logger instance for a service.\n *\n * When LOG_FORMAT=json (default), outputs structured JSON for Loki ingestion:\n *   {\"level\":\"info\",\"message\":\"Server started\",\"service\":\"pipeline\",\"timestamp\":\"...\"}\n *\n * When LOG_FORMAT=text, outputs colorized human-readable format:\n *   2026-02-13T10:30:00.000Z info [pipeline] Server started\n *\n * @param serviceName - Name of the service for log identification\n * @returns Configured Winston logger instance\n *\n * @example\n * ```typescript\n * import { createLogger } from '@pipeline-builder/api-core';\n *\n * const logger = createLogger('get-plugin');\n * logger.info('Server started', { port: 3000 });\n * logger.error('Database error', { error: err.message });\n * ```\n */\n/** The logger `createLogger` returns. Exported so consumers can annotate exported\n *  loggers without depending on winston themselves. */\nexport type Logger = winston.Logger;\n\nexport function createLogger(serviceName: string): Logger {\n  const logLevel = process.env.LOG_LEVEL || 'info';\n  const logFormat = process.env.LOG_FORMAT || 'json';\n  if (logFormat !== 'json' && logFormat !== 'text') {\n    // eslint-disable-next-line no-console -- startup warning before logger is available\n    console.warn(`Invalid LOG_FORMAT=\"${logFormat}\", expected \"json\" or \"text\". Defaulting to \"json\".`);\n  }\n  const useJson = logFormat !== 'text';\n\n  // Order matters: redact BEFORE serialization so masked keys never reach\n  // the output. trace_id and the org/user context are stamped first so they\n  // survive redaction (both are in PRESERVED_KEYS), then `maskFormat` scrubs\n  // secret-shaped VALUES out of the rendered message — the key-based\n  // `redactFormat` only covers metadata keys, and after promtail's\n  // `output: source: msg` rewrite the shipped line IS the message string.\n  const baseFormats = [\n    errors({ stack: true }),\n    timestamp({ format: 'YYYY-MM-DDTHH:mm:ss.SSSZ' }),\n    traceIdFormat,\n    logContextFormat,\n    redactFormat,\n    maskFormat,\n  ];\n\n  if (useJson) {\n    return winston.createLogger({\n      level: logLevel,\n      defaultMeta: { service: serviceName },\n      format: combine(...baseFormats, json()),\n      transports: [new winston.transports.Console()],\n    });\n  }\n\n  return winston.createLogger({\n    level: logLevel,\n    defaultMeta: { service: serviceName },\n    format: combine(...baseFormats),\n    transports: [\n      new winston.transports.Console({\n        format: combine(colorize(), consoleFormat),\n      }),\n    ],\n  });\n}\n\n/**\n * Default logger instance (service name from SERVICE_NAME env var or 'api').\n */\nexport const logger = createLogger(process.env.SERVICE_NAME || 'api');\n\nexport default logger;\n"]}
|
|
@@ -67,7 +67,9 @@ export declare class KmsKeyProvider implements KeyProvider {
|
|
|
67
67
|
* one. Triggers lazy initialization on first access, same as the internal
|
|
68
68
|
* callers below. */
|
|
69
69
|
export declare function getDefaultKeyProvider(): KeyProvider;
|
|
70
|
-
/**
|
|
70
|
+
/** Read the rotation-fallback provider (null outside a master-key rotation). */
|
|
71
|
+
export declare function getPreviousKeyProvider(): KeyProvider | null;
|
|
72
|
+
/** Reset the cached default (and previous) provider for tests that mutate `process.env`. */
|
|
71
73
|
export declare function resetDefaultKeyProvider(): void;
|
|
72
74
|
/** Replace the default provider services that opt into KMS call this
|
|
73
75
|
* once at startup with a warmed-up `KmsKeyProvider`. */
|
|
@@ -181,8 +183,11 @@ export declare function encryptSecret(plaintext: string, orgId: string, provider
|
|
|
181
183
|
*
|
|
182
184
|
* Callers handle the throw masking the failure as `null` would hide
|
|
183
185
|
* silent corruption / wrong-org reads.
|
|
186
|
+
*
|
|
187
|
+
* `previous` (default: `SECRET_ENCRYPTION_KEY_PREVIOUS`, when set) is tried
|
|
188
|
+
* only after the primary key fails, and only for kid-less blobs.
|
|
184
189
|
*/
|
|
185
|
-
export declare function decryptSecret(blob: EncryptedBlob, orgId: string, provider?: KeyProvider): Promise<string>;
|
|
190
|
+
export declare function decryptSecret(blob: EncryptedBlob, orgId: string, provider?: KeyProvider, previous?: KeyProvider | null): Promise<string>;
|
|
186
191
|
/**
|
|
187
192
|
* Type guard handy for model layers that hold a column whose value may be
|
|
188
193
|
* either a clear-text string (legacy / unencrypted) OR an encrypted blob
|