tabletcommand-logger 3.2.6 → 4.0.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/.cspell/project-words.txt +28 -0
- package/CLAUDE.md +150 -0
- package/README.md +111 -1
- package/build/index.js +15 -3
- package/build/index.js.map +1 -1
- package/build/logger-types.js +3 -0
- package/build/logger-types.js.map +1 -0
- package/build/middleware/logger.js +94 -33
- package/build/middleware/logger.js.map +1 -1
- package/build/middleware/status-logger.js +4 -9
- package/build/middleware/status-logger.js.map +1 -1
- package/build/otel.js +54 -0
- package/build/otel.js.map +1 -0
- package/build/pino-logger.js +97 -0
- package/build/pino-logger.js.map +1 -0
- package/build/redaction.js +351 -0
- package/build/redaction.js.map +1 -0
- package/build/test/logger-factory.js +207 -0
- package/build/test/logger-factory.js.map +1 -0
- package/build/test/middleware-logger.js +535 -2
- package/build/test/middleware-logger.js.map +1 -1
- package/build/test/middleware-status-logger.js +58 -0
- package/build/test/middleware-status-logger.js.map +1 -0
- package/build/test/otel-mixin.js +139 -0
- package/build/test/otel-mixin.js.map +1 -0
- package/build/test/redaction.js +293 -0
- package/build/test/redaction.js.map +1 -0
- package/build/test/signature.js +111 -0
- package/build/test/signature.js.map +1 -0
- package/build/winston-logger.js +18 -47
- package/build/winston-logger.js.map +1 -1
- package/definitions/index.d.ts +6 -2
- package/definitions/index.d.ts.map +1 -1
- package/definitions/logger-types.d.ts +38 -0
- package/definitions/logger-types.d.ts.map +1 -0
- package/definitions/middleware/logger.d.ts +4 -3
- package/definitions/middleware/logger.d.ts.map +1 -1
- package/definitions/middleware/status-logger.d.ts +4 -4
- package/definitions/middleware/status-logger.d.ts.map +1 -1
- package/definitions/otel.d.ts +8 -0
- package/definitions/otel.d.ts.map +1 -0
- package/definitions/pino-logger.d.ts +6 -0
- package/definitions/pino-logger.d.ts.map +1 -0
- package/definitions/redaction.d.ts +25 -0
- package/definitions/redaction.d.ts.map +1 -0
- package/definitions/test/logger-factory.d.ts +2 -0
- package/definitions/test/logger-factory.d.ts.map +1 -0
- package/definitions/test/middleware-status-logger.d.ts +2 -0
- package/definitions/test/middleware-status-logger.d.ts.map +1 -0
- package/definitions/test/otel-mixin.d.ts +2 -0
- package/definitions/test/otel-mixin.d.ts.map +1 -0
- package/definitions/test/redaction.d.ts +2 -0
- package/definitions/test/redaction.d.ts.map +1 -0
- package/definitions/test/signature.d.ts +2 -0
- package/definitions/test/signature.d.ts.map +1 -0
- package/definitions/winston-logger.d.ts +2 -13
- package/definitions/winston-logger.d.ts.map +1 -1
- package/eslint.config.mjs +1 -0
- package/package.json +17 -5
- package/src/index.ts +7 -3
- package/src/logger-types.ts +50 -0
- package/src/middleware/logger.ts +105 -37
- package/src/middleware/status-logger.ts +6 -15
- package/src/otel.ts +57 -0
- package/src/pino-logger.ts +110 -0
- package/src/redaction.ts +368 -0
- package/src/test/logger-factory.ts +216 -0
- package/src/test/middleware-logger.ts +582 -2
- package/src/test/middleware-status-logger.ts +61 -0
- package/src/test/otel-mixin.ts +119 -0
- package/src/test/redaction.ts +409 -0
- package/src/test/signature.ts +126 -0
- package/src/winston-logger.ts +2 -72
- package/tabletcommand-logger-4.0.0.tgz +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"middleware-status-logger.js","sourceRoot":"","sources":["../../src/test/middleware-status-logger.ts"],"names":[],"mappings":";;;;;AAAA,+BAA8B;AAC9B,6CAA2C;AAC3C,yCAA8D;AAG9D,gFAAuD;AAEvD,IAAA,oBAAQ,EAAC,0BAA0B,EAAE;IACnC,IAAA,oBAAO,EAAC,aAAa,EAAE,GAAG,EAAE;QAC1B,4CAA4C;QAC5C,MAAM,MAAM,GAAG,eAAe,CAAC;QAE/B,SAAS,OAAO,CAAC,GAAqB;YACpC,IAAI,IAAI,GAA4B,EAAE,CAAC;YACvC,MAAM,MAAM,GAAG;gBACb,IAAI,EAAE,CAAC,GAA4B,EAAE,EAAE;oBACrC,IAAI,GAAG,GAAG,CAAC;gBACb,CAAC;aACyB,CAAC;YAC7B,MAAM,GAAG,GAAG,IAAI,0BAAY,EAAyB,CAAC;YACtD,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;YACrB,GAAG,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC;YAErB,IAAA,uBAAY,EAAC,MAAM,CAAC,CAAC,GAAc,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YAC3D,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;QACd,CAAC;QAED,uFAAuF;QACvF,IAAA,cAAE,EAAC,iEAAiE,EAAE;YACpE,MAAM,IAAI,GAAG,OAAO,CAAC;gBACnB,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,qCAAqC,MAAM,MAAM;gBAC9D,IAAI,EAAE,mBAAmB;gBACzB,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,EAAE;gBAC1C,OAAO,EAAE,EAAE,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,EAAE;aAC1E,CAAC,CAAC;YAEH,MAAM,GAAG,GAAG,IAAI,CAAC,GAA8B,CAAC;YAChD,aAAM,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,EAAE,+CAA+C,CAAC,CAAC;YAC/E,aAAM,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;YACpE,aAAM,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE;gBAC5B,YAAY,EAAE,qBAAqB;gBACnC,eAAe,EAAE,SAAS;aAC3B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAA,cAAE,EAAC,mEAAmE,EAAE;YACtE,MAAM,KAAK,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC;YAC1C,OAAO,CAAC;gBACN,MAAM,EAAE,MAAM;gBACd,WAAW,EAAE,qCAAqC,MAAM,EAAE;gBAC1D,IAAI,EAAE,mBAAmB;gBACzB,KAAK;gBACL,OAAO,EAAE,EAAE;aACZ,CAAC,CAAC;YAEH,aAAM,CAAC,SAAS,CAAC,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
+
};
|
|
38
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
|
+
const chai_1 = require("chai");
|
|
40
|
+
const node_test_1 = require("node:test");
|
|
41
|
+
const node_stream_1 = require("node:stream");
|
|
42
|
+
const node_module_1 = __importDefault(require("node:module"));
|
|
43
|
+
const otel = __importStar(require("@opentelemetry/api"));
|
|
44
|
+
const pino_logger_1 = __importDefault(require("../pino-logger"));
|
|
45
|
+
const otel_1 = require("../otel");
|
|
46
|
+
(0, node_test_1.describe)("OpenTelemetry Mixin", () => {
|
|
47
|
+
function createCaptureStream(lines) {
|
|
48
|
+
return new node_stream_1.Writable({
|
|
49
|
+
write(chunk, _encoding, callback) {
|
|
50
|
+
try {
|
|
51
|
+
lines.push(JSON.parse(chunk.toString()));
|
|
52
|
+
}
|
|
53
|
+
catch {
|
|
54
|
+
// ignore
|
|
55
|
+
}
|
|
56
|
+
callback();
|
|
57
|
+
},
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
(0, node_test_1.it)("does not inject trace fields when no span is active", () => {
|
|
61
|
+
const lines = [];
|
|
62
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
63
|
+
log === null || log === void 0 ? void 0 : log.info("plain message without active span");
|
|
64
|
+
chai_1.assert.equal(lines.length, 1);
|
|
65
|
+
chai_1.assert.isUndefined(lines[0].trace_id);
|
|
66
|
+
chai_1.assert.isUndefined(lines[0].span_id);
|
|
67
|
+
chai_1.assert.equal(lines[0].msg, "plain message without active span");
|
|
68
|
+
});
|
|
69
|
+
(0, node_test_1.it)("injects trace_id and span_id when an active span is present", () => {
|
|
70
|
+
const lines = [];
|
|
71
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
72
|
+
const origGetActiveSpan = otel.trace.getActiveSpan;
|
|
73
|
+
// Mock an active span
|
|
74
|
+
otel.trace.getActiveSpan = () => ({
|
|
75
|
+
spanContext: () => ({
|
|
76
|
+
traceId: "4bf92f3577b34da6a3ce929d0e0e4736",
|
|
77
|
+
spanId: "00f067aa0ba902b7",
|
|
78
|
+
traceFlags: 1,
|
|
79
|
+
}),
|
|
80
|
+
});
|
|
81
|
+
try {
|
|
82
|
+
log === null || log === void 0 ? void 0 : log.info({ detail: "test" }, "message with active trace span");
|
|
83
|
+
chai_1.assert.equal(lines.length, 1);
|
|
84
|
+
chai_1.assert.equal(lines[0].trace_id, "4bf92f3577b34da6a3ce929d0e0e4736");
|
|
85
|
+
chai_1.assert.equal(lines[0].span_id, "00f067aa0ba902b7");
|
|
86
|
+
chai_1.assert.equal(lines[0].trace_flags, "1");
|
|
87
|
+
chai_1.assert.equal(lines[0].detail, "test");
|
|
88
|
+
}
|
|
89
|
+
finally {
|
|
90
|
+
otel.trace.getActiveSpan = origGetActiveSpan;
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
(0, node_test_1.it)("does not inject all-zero trace IDs when an inactive or NonRecordingSpan is returned", () => {
|
|
94
|
+
const lines = [];
|
|
95
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
96
|
+
const origGetActiveSpan = otel.trace.getActiveSpan;
|
|
97
|
+
// Mock NonRecordingSpan with invalid all-zero IDs
|
|
98
|
+
otel.trace.getActiveSpan = () => ({
|
|
99
|
+
spanContext: () => ({
|
|
100
|
+
traceId: "00000000000000000000000000000000",
|
|
101
|
+
spanId: "0000000000000000",
|
|
102
|
+
traceFlags: 0,
|
|
103
|
+
}),
|
|
104
|
+
});
|
|
105
|
+
try {
|
|
106
|
+
log === null || log === void 0 ? void 0 : log.info({ detail: "test" }, "message with invalid/zero span");
|
|
107
|
+
chai_1.assert.equal(lines.length, 1);
|
|
108
|
+
chai_1.assert.isUndefined(lines[0].trace_id);
|
|
109
|
+
chai_1.assert.isUndefined(lines[0].span_id);
|
|
110
|
+
chai_1.assert.isUndefined(lines[0].trace_flags);
|
|
111
|
+
chai_1.assert.equal(lines[0].detail, "test");
|
|
112
|
+
}
|
|
113
|
+
finally {
|
|
114
|
+
otel.trace.getActiveSpan = origGetActiveSpan;
|
|
115
|
+
}
|
|
116
|
+
});
|
|
117
|
+
(0, node_test_1.it)("gracefully returns empty object when @opentelemetry/api cannot be resolved", () => {
|
|
118
|
+
const mod = node_module_1.default;
|
|
119
|
+
const origResolve = mod._resolveFilename;
|
|
120
|
+
mod._resolveFilename = function (request, ...args) {
|
|
121
|
+
if (request === "@opentelemetry/api") {
|
|
122
|
+
const err = new Error("Cannot find module @opentelemetry/api");
|
|
123
|
+
err.code = "MODULE_NOT_FOUND";
|
|
124
|
+
throw err;
|
|
125
|
+
}
|
|
126
|
+
return origResolve.call(this, request, ...args);
|
|
127
|
+
};
|
|
128
|
+
try {
|
|
129
|
+
(0, otel_1.resetOtelForTesting)();
|
|
130
|
+
const ctx = (0, otel_1.getOtelTraceContext)();
|
|
131
|
+
chai_1.assert.deepEqual(ctx, {});
|
|
132
|
+
}
|
|
133
|
+
finally {
|
|
134
|
+
mod._resolveFilename = origResolve;
|
|
135
|
+
(0, otel_1.resetOtelForTesting)();
|
|
136
|
+
}
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
//# sourceMappingURL=otel-mixin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"otel-mixin.js","sourceRoot":"","sources":["../../src/test/otel-mixin.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,293 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const chai_1 = require("chai");
|
|
7
|
+
const node_test_1 = require("node:test");
|
|
8
|
+
const node_stream_1 = require("node:stream");
|
|
9
|
+
const pino_logger_1 = __importDefault(require("../pino-logger"));
|
|
10
|
+
const redaction_1 = require("../redaction");
|
|
11
|
+
(0, node_test_1.describe)("Native Redaction Engine", () => {
|
|
12
|
+
function createCaptureStream(lines) {
|
|
13
|
+
return new node_stream_1.Writable({
|
|
14
|
+
write(chunk, _encoding, callback) {
|
|
15
|
+
try {
|
|
16
|
+
const str = chunk.toString();
|
|
17
|
+
lines.push(JSON.parse(str));
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
// ignore
|
|
21
|
+
}
|
|
22
|
+
callback();
|
|
23
|
+
},
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
(0, node_test_1.it)("redacts apikey to first 7 characters", () => {
|
|
27
|
+
const lines = [];
|
|
28
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
29
|
+
log === null || log === void 0 ? void 0 : log.info({ apikey: "abcdef1234567" }, "api call");
|
|
30
|
+
chai_1.assert.equal(lines.length, 1);
|
|
31
|
+
chai_1.assert.equal(lines[0].apikey, "abcdef1");
|
|
32
|
+
});
|
|
33
|
+
(0, node_test_1.it)("redacts camelCase apiKey and personnelApiKey to first 7 characters", () => {
|
|
34
|
+
const lines = [];
|
|
35
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
36
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
37
|
+
apiKey: "abcdef1234567",
|
|
38
|
+
personnelApiKey: "abcdef1234567",
|
|
39
|
+
}, "multi keys");
|
|
40
|
+
chai_1.assert.equal(lines.length, 1);
|
|
41
|
+
chai_1.assert.equal(lines[0].apiKey, "abcdef1");
|
|
42
|
+
chai_1.assert.equal(lines[0].personnelApiKey, "abcdef1");
|
|
43
|
+
});
|
|
44
|
+
(0, node_test_1.it)("completely masks password and secret fields", () => {
|
|
45
|
+
const lines = [];
|
|
46
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
47
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
48
|
+
password: "super-secret-password-123",
|
|
49
|
+
secret: "top-secret-val",
|
|
50
|
+
}, "credentials test");
|
|
51
|
+
chai_1.assert.equal(lines.length, 1);
|
|
52
|
+
chai_1.assert.equal(lines[0].password, "<redacted>");
|
|
53
|
+
chai_1.assert.equal(lines[0].secret, "<redacted>");
|
|
54
|
+
});
|
|
55
|
+
(0, node_test_1.it)("redacts nested headers with authorization and cookie", () => {
|
|
56
|
+
const lines = [];
|
|
57
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
58
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
59
|
+
headers: {
|
|
60
|
+
authorization: "Bearer abcdef1234567",
|
|
61
|
+
cookie: "session=abcdef1234567; saml=xyz987654321",
|
|
62
|
+
},
|
|
63
|
+
}, "headers log");
|
|
64
|
+
chai_1.assert.equal(lines.length, 1);
|
|
65
|
+
const headers = lines[0].headers;
|
|
66
|
+
chai_1.assert.equal(headers.authorization, "Bearer abcdef1");
|
|
67
|
+
chai_1.assert.equal(headers.cookie, "session=<redacted>; saml=<redacted>");
|
|
68
|
+
});
|
|
69
|
+
(0, node_test_1.it)("redacts only the first pair value in set-cookie and preserves attributes", () => {
|
|
70
|
+
const raw = "session=SECRET12345; Path=/; Domain=.tabletcommand.com; Max-Age=3600; HttpOnly; Secure; SameSite=None";
|
|
71
|
+
const redactedVal = (0, redaction_1.redactSetCookie)(raw);
|
|
72
|
+
chai_1.assert.equal(redactedVal, "session=<redacted>; Path=/; Domain=.tabletcommand.com; Max-Age=3600; HttpOnly; Secure; SameSite=None");
|
|
73
|
+
// Also verify via pinoCensor in logger
|
|
74
|
+
const lines = [];
|
|
75
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
76
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
77
|
+
res: {
|
|
78
|
+
headers: {
|
|
79
|
+
"set-cookie": raw,
|
|
80
|
+
},
|
|
81
|
+
},
|
|
82
|
+
}, "res set-cookie test");
|
|
83
|
+
chai_1.assert.equal(lines.length, 1);
|
|
84
|
+
const res = lines[0].res;
|
|
85
|
+
chai_1.assert.equal(res.headers["set-cookie"], "session=<redacted>; Path=/; Domain=.tabletcommand.com; Max-Age=3600; HttpOnly; Secure; SameSite=None");
|
|
86
|
+
});
|
|
87
|
+
(0, node_test_1.it)("redacts apikey within nested objects", () => {
|
|
88
|
+
const lines = [];
|
|
89
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
90
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
91
|
+
payload: {
|
|
92
|
+
account: {
|
|
93
|
+
apikey: "abcdef1234567",
|
|
94
|
+
},
|
|
95
|
+
},
|
|
96
|
+
}, "nested object");
|
|
97
|
+
chai_1.assert.equal(lines.length, 1);
|
|
98
|
+
const payload = lines[0].payload;
|
|
99
|
+
chai_1.assert.equal(payload.account.apikey, "abcdef1");
|
|
100
|
+
});
|
|
101
|
+
function nest(levels, leaf) {
|
|
102
|
+
let value = leaf;
|
|
103
|
+
for (let i = 0; i < levels; i++) {
|
|
104
|
+
value = { [`l${i}`]: value };
|
|
105
|
+
}
|
|
106
|
+
return value;
|
|
107
|
+
}
|
|
108
|
+
function leafAt(line, levels) {
|
|
109
|
+
let value = line;
|
|
110
|
+
for (let i = levels - 1; i >= 0; i--) {
|
|
111
|
+
value = value[`l${i}`];
|
|
112
|
+
}
|
|
113
|
+
return value;
|
|
114
|
+
}
|
|
115
|
+
(0, node_test_1.it)(`redacts a secret ${redaction_1.MAX_REDACT_DEPTH} levels deep`, () => {
|
|
116
|
+
chai_1.assert.equal(redaction_1.MAX_REDACT_DEPTH, 10);
|
|
117
|
+
const lines = [];
|
|
118
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
119
|
+
log === null || log === void 0 ? void 0 : log.info(nest(redaction_1.MAX_REDACT_DEPTH, { password: "super-secret-password-123" }), "depth test");
|
|
120
|
+
chai_1.assert.equal(leafAt(lines[0], redaction_1.MAX_REDACT_DEPTH).password, "<redacted>");
|
|
121
|
+
});
|
|
122
|
+
(0, node_test_1.it)("leaves a secret deeper than MAX_REDACT_DEPTH as the documented ceiling", () => {
|
|
123
|
+
const lines = [];
|
|
124
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
125
|
+
log === null || log === void 0 ? void 0 : log.info(nest(redaction_1.MAX_REDACT_DEPTH + 1, { password: "super-secret-password-123" }), "depth test");
|
|
126
|
+
chai_1.assert.equal(leafAt(lines[0], redaction_1.MAX_REDACT_DEPTH + 1).password, "super-secret-password-123");
|
|
127
|
+
});
|
|
128
|
+
(0, node_test_1.it)("matches key names without case, dashes or underscores", () => {
|
|
129
|
+
const lines = [];
|
|
130
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
131
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
132
|
+
Password: "hunter2hunter2",
|
|
133
|
+
APIKEY: "abcdef1234567",
|
|
134
|
+
"X-API-Key": "abcdef1234567",
|
|
135
|
+
access_token: "abcdef1234567",
|
|
136
|
+
"AUTH-TOKEN": "abcdef1234567",
|
|
137
|
+
}, "case test");
|
|
138
|
+
const line = lines[0];
|
|
139
|
+
chai_1.assert.equal(line.Password, "<redacted>");
|
|
140
|
+
chai_1.assert.equal(line.APIKEY, "abcdef1");
|
|
141
|
+
chai_1.assert.equal(line["X-API-Key"], "abcdef1");
|
|
142
|
+
chai_1.assert.equal(line.access_token, "abcdef1");
|
|
143
|
+
chai_1.assert.equal(line["AUTH-TOKEN"], "abcdef1");
|
|
144
|
+
});
|
|
145
|
+
(0, node_test_1.it)("cuts the credential names found in massive-tyrion to 7 characters", () => {
|
|
146
|
+
const names = [
|
|
147
|
+
"authToken", "accessToken", "refreshToken", "refresh_token", "idToken", "id_token",
|
|
148
|
+
"sessionToken", "superAdminSessionToken", "deviceToken", "zonehavenToken", "faToken",
|
|
149
|
+
"videoGatewayToken", "x-tc-auth-token", "apiToken", "mark43ApiToken", "authTokenPlainText",
|
|
150
|
+
"departmentApiKey", "agencyApiKey", "watchDutyApiKey", "arcgisApiKey", "freshdeskApiKey",
|
|
151
|
+
"googleApiKey", "webApiKey", "apiKeyReadOnly", "apiKeyManagement", "personnelApiKey",
|
|
152
|
+
"partnerKey", "x-partner-key", "cadKey", "vendorKey", "licenseKey", "licenseCode", "mark43Key",
|
|
153
|
+
"authKey", "accessCode", "joinCode", "jwt", "authHeader", "sessionCookie", "signupKey",
|
|
154
|
+
];
|
|
155
|
+
const lines = [];
|
|
156
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
157
|
+
log === null || log === void 0 ? void 0 : log.info({ body: Object.fromEntries(names.map((name) => [name, "abcdef1234567"])) }, "names");
|
|
158
|
+
const body = lines[0].body;
|
|
159
|
+
for (const name of names) {
|
|
160
|
+
chai_1.assert.equal(body[name], "abcdef1", name);
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
(0, node_test_1.it)("masks secret material and personal data completely", () => {
|
|
164
|
+
const names = [
|
|
165
|
+
"authSecret", "authSecretPlainText", "secretPlainText", "authKeySecret", "keySecret",
|
|
166
|
+
"clientSecret", "client_secret", "webhookSecret", "jwtSecret", "droneVideoJwtSecret",
|
|
167
|
+
"decryptedSecret", "onetimesecret", "secretAccessKey", "credential", "credentials",
|
|
168
|
+
"privateKey", "sshPrivateKey", "jwtSigningKey", "mailgunSigningKey", "encryptionKey",
|
|
169
|
+
"esriEncryptionKey", "esriEncryptionPassword", "initialPassword", "confirmPassword",
|
|
170
|
+
"pass", "pwd", "auth_pass", "salt", "ssn", "dateOfBirth", "licenseNumber", "doorCode",
|
|
171
|
+
];
|
|
172
|
+
const lines = [];
|
|
173
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
174
|
+
log === null || log === void 0 ? void 0 : log.info({ body: Object.fromEntries(names.map((name) => [name, "abcdef1234567"])) }, "names");
|
|
175
|
+
const body = lines[0].body;
|
|
176
|
+
for (const name of names) {
|
|
177
|
+
chai_1.assert.equal(body[name], "<redacted>", name);
|
|
178
|
+
}
|
|
179
|
+
});
|
|
180
|
+
(0, node_test_1.it)("keeps flags, settings and pagination cursors readable", () => {
|
|
181
|
+
const lines = [];
|
|
182
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
183
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
184
|
+
hasAuthSecret: true,
|
|
185
|
+
minPasswordLength: 8,
|
|
186
|
+
useSSHKey: false,
|
|
187
|
+
tokenTTLSeconds: 3600,
|
|
188
|
+
nextPageToken: "cursor-abcdef1234567",
|
|
189
|
+
paginationToken: "cursor-abcdef1234567",
|
|
190
|
+
cacheKey: "dept:1234567890",
|
|
191
|
+
}, "flags");
|
|
192
|
+
const line = lines[0];
|
|
193
|
+
chai_1.assert.equal(line.hasAuthSecret, true);
|
|
194
|
+
chai_1.assert.equal(line.minPasswordLength, 8);
|
|
195
|
+
chai_1.assert.equal(line.useSSHKey, false);
|
|
196
|
+
chai_1.assert.equal(line.tokenTTLSeconds, 3600);
|
|
197
|
+
chai_1.assert.equal(line.nextPageToken, "cursor-abcdef1234567");
|
|
198
|
+
chai_1.assert.equal(line.paginationToken, "cursor-abcdef1234567");
|
|
199
|
+
chai_1.assert.equal(line.cacheKey, "dept:1234567890");
|
|
200
|
+
});
|
|
201
|
+
(0, node_test_1.it)("redacts secrets inside a whole auth object and in arrays", () => {
|
|
202
|
+
const lines = [];
|
|
203
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
204
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
205
|
+
auth: { username: "alice", password: "hunter2hunter2", sshPrivateKey: "-----BEGIN KEY-----" },
|
|
206
|
+
users: [{ name: "a", authToken: "abcdef1234567" }, { name: "b", pass: "hash", salt: "salt" }],
|
|
207
|
+
}, "auth");
|
|
208
|
+
const auth = lines[0].auth;
|
|
209
|
+
chai_1.assert.deepEqual(auth, { username: "alice", password: "<redacted>", sshPrivateKey: "<redacted>" });
|
|
210
|
+
const users = lines[0].users;
|
|
211
|
+
chai_1.assert.deepEqual(users, [
|
|
212
|
+
{ name: "a", authToken: "abcdef1" },
|
|
213
|
+
{ name: "b", pass: "<redacted>", salt: "<redacted>" },
|
|
214
|
+
]);
|
|
215
|
+
});
|
|
216
|
+
(0, node_test_1.it)("redacts what a toJSON object such as a Mongoose document writes", () => {
|
|
217
|
+
const lines = [];
|
|
218
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
219
|
+
class Doc {
|
|
220
|
+
toJSON() {
|
|
221
|
+
return { email: "a@b.c", pass: "hash", token: "abcdef1234567" };
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
log === null || log === void 0 ? void 0 : log.info({ user: new Doc() }, "doc");
|
|
225
|
+
chai_1.assert.deepEqual(lines[0].user, { email: "a@b.c", pass: "<redacted>", token: "abcdef1" });
|
|
226
|
+
});
|
|
227
|
+
(0, node_test_1.it)("redacts child bindings and serialized errors", () => {
|
|
228
|
+
const lines = [];
|
|
229
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
230
|
+
const err = Object.assign(new Error("request failed"), {
|
|
231
|
+
config: { headers: { Authorization: "Bearer abcdef1234567", "x-api-key": "abcdef1234567" } },
|
|
232
|
+
});
|
|
233
|
+
log === null || log === void 0 ? void 0 : log.child({ partnerKey: "abcdef1234567" }).error(err, "failed");
|
|
234
|
+
const line = lines[0];
|
|
235
|
+
chai_1.assert.equal(line.partnerKey, "abcdef1");
|
|
236
|
+
const config = line.err.config;
|
|
237
|
+
chai_1.assert.equal(config.headers.Authorization, "Bearer abcdef1");
|
|
238
|
+
chai_1.assert.equal(config.headers["x-api-key"], "abcdef1");
|
|
239
|
+
chai_1.assert.equal(line.err.message, "request failed");
|
|
240
|
+
});
|
|
241
|
+
(0, node_test_1.it)("leaves the caller's object unchanged", () => {
|
|
242
|
+
const lines = [];
|
|
243
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
244
|
+
const payload = { user: { name: "alice", password: "hunter2hunter2" } };
|
|
245
|
+
log === null || log === void 0 ? void 0 : log.info(payload, "payload");
|
|
246
|
+
chai_1.assert.equal(payload.user.password, "hunter2hunter2");
|
|
247
|
+
chai_1.assert.equal(lines[0].user.password, "<redacted>");
|
|
248
|
+
});
|
|
249
|
+
(0, node_test_1.it)("redacts TitleCase Authorization, Cookie, and Set-Cookie headers", () => {
|
|
250
|
+
const lines = [];
|
|
251
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
252
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
253
|
+
headers: {
|
|
254
|
+
Authorization: "Bearer abcdef1234567",
|
|
255
|
+
Cookie: "session=abcdef1234567; saml=xyz987654321",
|
|
256
|
+
},
|
|
257
|
+
}, "TitleCase headers");
|
|
258
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
259
|
+
res: {
|
|
260
|
+
headers: {
|
|
261
|
+
"Set-Cookie": "session=SECRET12345; Path=/; Domain=.tabletcommand.com; HttpOnly; Secure",
|
|
262
|
+
},
|
|
263
|
+
},
|
|
264
|
+
}, "TitleCase Set-Cookie");
|
|
265
|
+
chai_1.assert.equal(lines.length, 2);
|
|
266
|
+
const headers = lines[0].headers;
|
|
267
|
+
chai_1.assert.equal(headers.Authorization, "Bearer abcdef1");
|
|
268
|
+
chai_1.assert.equal(headers.Cookie, "session=<redacted>; saml=<redacted>");
|
|
269
|
+
const res = lines[1].res;
|
|
270
|
+
chai_1.assert.equal(res.headers["Set-Cookie"], "session=<redacted>; Path=/; Domain=.tabletcommand.com; HttpOnly; Secure");
|
|
271
|
+
});
|
|
272
|
+
(0, node_test_1.it)("redacts nested TitleCase Authorization in outgoing HTTP/Axios config payloads", () => {
|
|
273
|
+
const lines = [];
|
|
274
|
+
const log = (0, pino_logger_1.default)({ name: "test", logToConsole: true }, createCaptureStream(lines));
|
|
275
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
276
|
+
err: {
|
|
277
|
+
config: {
|
|
278
|
+
headers: {
|
|
279
|
+
Authorization: "Bearer token12345678",
|
|
280
|
+
},
|
|
281
|
+
},
|
|
282
|
+
},
|
|
283
|
+
}, "axios error");
|
|
284
|
+
log === null || log === void 0 ? void 0 : log.info({
|
|
285
|
+
Authorization: "Bearer token99887766",
|
|
286
|
+
}, "root Authorization");
|
|
287
|
+
chai_1.assert.equal(lines.length, 2);
|
|
288
|
+
const err = lines[0].err;
|
|
289
|
+
chai_1.assert.equal(err.config.headers.Authorization, "Bearer token12");
|
|
290
|
+
chai_1.assert.equal(lines[1].Authorization, "Bearer token99");
|
|
291
|
+
});
|
|
292
|
+
});
|
|
293
|
+
//# sourceMappingURL=redaction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redaction.js","sourceRoot":"","sources":["../../src/test/redaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const chai_1 = require("chai");
|
|
7
|
+
const node_test_1 = require("node:test");
|
|
8
|
+
const node_path_1 = __importDefault(require("node:path"));
|
|
9
|
+
const typescript_1 = __importDefault(require("typescript"));
|
|
10
|
+
(0, node_test_1.describe)("Strict TypeScript Signatures", () => {
|
|
11
|
+
function getCompileDiagnostics(sourceText) {
|
|
12
|
+
const options = {
|
|
13
|
+
target: typescript_1.default.ScriptTarget.ES2022,
|
|
14
|
+
moduleResolution: typescript_1.default.ModuleResolutionKind.Node10,
|
|
15
|
+
strict: true,
|
|
16
|
+
noEmit: true,
|
|
17
|
+
};
|
|
18
|
+
const defaultHost = typescript_1.default.createCompilerHost(options);
|
|
19
|
+
const testFileName = node_path_1.default.resolve(process.cwd(), "test-signature-check.ts");
|
|
20
|
+
const customHost = {
|
|
21
|
+
...defaultHost,
|
|
22
|
+
getSourceFile: (fileName, languageVersion) => {
|
|
23
|
+
if (fileName === testFileName) {
|
|
24
|
+
return typescript_1.default.createSourceFile(fileName, sourceText, languageVersion);
|
|
25
|
+
}
|
|
26
|
+
return defaultHost.getSourceFile(fileName, languageVersion);
|
|
27
|
+
},
|
|
28
|
+
fileExists: (fileName) => fileName === testFileName || defaultHost.fileExists(fileName),
|
|
29
|
+
readFile: (fileName) => (fileName === testFileName ? sourceText : defaultHost.readFile(fileName)),
|
|
30
|
+
};
|
|
31
|
+
const program = typescript_1.default.createProgram([testFileName], options, customHost);
|
|
32
|
+
const sourceFile = program.getSourceFile(testFileName);
|
|
33
|
+
if (!sourceFile) {
|
|
34
|
+
return ["Source file not found"];
|
|
35
|
+
}
|
|
36
|
+
const diags = program.getSemanticDiagnostics(sourceFile);
|
|
37
|
+
return diags.map((d) => typescript_1.default.flattenDiagnosticMessageText(d.messageText, "\n"));
|
|
38
|
+
}
|
|
39
|
+
(0, node_test_1.it)("compiles standard Pino signatures without errors", () => {
|
|
40
|
+
const validSnippet = `
|
|
41
|
+
import { StrictLogger } from "./src/logger-types";
|
|
42
|
+
declare const log: StrictLogger;
|
|
43
|
+
|
|
44
|
+
// Pino convention 1: string message only
|
|
45
|
+
log.info("hello world");
|
|
46
|
+
log.info("user %s count %d", "john", 42);
|
|
47
|
+
|
|
48
|
+
// Pino convention 2: object first, optional message
|
|
49
|
+
log.info({ userId: "user-123" }, "user login");
|
|
50
|
+
log.info({ userId: "user-123" });
|
|
51
|
+
|
|
52
|
+
// Errors
|
|
53
|
+
log.error(new Error("network failure"), "failed to reach remote");
|
|
54
|
+
log.error(new Error("network failure"));
|
|
55
|
+
log.warn({ warning: true }, "alert message");
|
|
56
|
+
log.debug({ debugData: 123 });
|
|
57
|
+
`;
|
|
58
|
+
const diags = getCompileDiagnostics(validSnippet);
|
|
59
|
+
chai_1.assert.deepEqual(diags, [], "Expected valid Pino signatures to compile cleanly with 0 diagnostics");
|
|
60
|
+
});
|
|
61
|
+
(0, node_test_1.it)("fails compilation when legacy Winston inverted call (msg, obj) is used", () => {
|
|
62
|
+
const invalidSnippet = `
|
|
63
|
+
import { StrictLogger } from "./src/logger-types";
|
|
64
|
+
declare const log: StrictLogger;
|
|
65
|
+
|
|
66
|
+
// Legacy Winston call: string first followed by object
|
|
67
|
+
log.info("user login", { userId: "user-123" });
|
|
68
|
+
`;
|
|
69
|
+
const diags = getCompileDiagnostics(invalidSnippet);
|
|
70
|
+
chai_1.assert.isAbove(diags.length, 0, "Expected compilation to fail for inverted call");
|
|
71
|
+
chai_1.assert.match(diags.join("\n"), /not assignable to parameter of type 'LogArgument'/, "Expected error to indicate the object argument is not a LogArgument");
|
|
72
|
+
});
|
|
73
|
+
(0, node_test_1.it)("fails compilation when legacy inverted error call (msg, Error) is used", () => {
|
|
74
|
+
const invalidSnippet = `
|
|
75
|
+
import { StrictLogger } from "./src/logger-types";
|
|
76
|
+
declare const log: StrictLogger;
|
|
77
|
+
|
|
78
|
+
// Legacy inverted call: message first, Error object second
|
|
79
|
+
log.error("something failed", new Error("disk full"));
|
|
80
|
+
`;
|
|
81
|
+
const diags = getCompileDiagnostics(invalidSnippet);
|
|
82
|
+
chai_1.assert.isAbove(diags.length, 0, "Expected compilation to fail for inverted error call");
|
|
83
|
+
chai_1.assert.match(diags.join("\n"), /not assignable to parameter of type 'LogArgument'/, "Expected error to indicate the Error argument is not a LogArgument");
|
|
84
|
+
});
|
|
85
|
+
(0, node_test_1.it)("accepts a caught unknown error first on error, warn and fatal", () => {
|
|
86
|
+
const snippet = `
|
|
87
|
+
import { StrictLogger } from "./src/logger-types";
|
|
88
|
+
declare const log: StrictLogger;
|
|
89
|
+
|
|
90
|
+
try {
|
|
91
|
+
JSON.parse("{");
|
|
92
|
+
} catch (err) {
|
|
93
|
+
log.error(err, "parse failed");
|
|
94
|
+
log.warn(err, "parse failed for %s", "input");
|
|
95
|
+
log.fatal(err);
|
|
96
|
+
}
|
|
97
|
+
`;
|
|
98
|
+
chai_1.assert.deepEqual(getCompileDiagnostics(snippet), []);
|
|
99
|
+
});
|
|
100
|
+
(0, node_test_1.it)("still rejects the inverted call when the second argument is unknown", () => {
|
|
101
|
+
const snippet = `
|
|
102
|
+
import { StrictLogger } from "./src/logger-types";
|
|
103
|
+
declare const log: StrictLogger;
|
|
104
|
+
declare const err: unknown;
|
|
105
|
+
|
|
106
|
+
log.error("something failed", err);
|
|
107
|
+
`;
|
|
108
|
+
chai_1.assert.isAbove(getCompileDiagnostics(snippet).length, 0);
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
//# sourceMappingURL=signature.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signature.js","sourceRoot":"","sources":["../../src/test/signature.ts"],"names":[],"mappings":"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"}
|