tabletcommand-logger 3.2.5 → 3.2.7
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/build/index.js +5 -1
- package/build/index.js.map +1 -1
- package/build/middleware/logger.js +132 -16
- package/build/middleware/logger.js.map +1 -1
- package/build/middleware/status-logger.js +5 -10
- package/build/middleware/status-logger.js.map +1 -1
- package/build/test/middleware-logger.js +259 -8
- package/build/test/middleware-logger.js.map +1 -1
- package/build/test/middleware-metrics.js +12 -12
- package/build/test/middleware-metrics.js.map +1 -1
- package/build/test/middleware-status-logger.js +58 -0
- package/build/test/middleware-status-logger.js.map +1 -0
- package/definitions/index.d.ts +1 -0
- package/definitions/index.d.ts.map +1 -1
- package/definitions/middleware/logger.d.ts +3 -0
- package/definitions/middleware/logger.d.ts.map +1 -1
- package/definitions/middleware/status-logger.d.ts +2 -2
- package/definitions/middleware/status-logger.d.ts.map +1 -1
- package/definitions/test/middleware-logger.d.ts +1 -1
- package/definitions/test/middleware-logger.d.ts.map +1 -1
- package/definitions/test/middleware-metrics.d.ts +1 -1
- package/definitions/test/middleware-metrics.d.ts.map +1 -1
- package/definitions/test/middleware-status-logger.d.ts +2 -0
- package/definitions/test/middleware-status-logger.d.ts.map +1 -0
- package/definitions/types/express.aug.d.ts.map +1 -1
- package/eslint.config.mjs +25 -8
- package/gulpfile.js +6 -2
- package/package.json +5 -9
- package/src/index.ts +1 -0
- package/src/middleware/logger.ts +146 -15
- package/src/middleware/status-logger.ts +5 -12
- package/src/test/middleware-logger.ts +264 -3
- package/src/test/middleware-metrics.ts +2 -1
- package/src/test/middleware-status-logger.ts +61 -0
- package/src/tsconfig.json +4 -1
- package/src/types/express.aug.ts +0 -1
|
@@ -33,35 +33,35 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
33
33
|
};
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
-
require("mocha");
|
|
37
36
|
const chai_1 = require("chai");
|
|
37
|
+
const node_test_1 = require("node:test");
|
|
38
38
|
const metrics_1 = __importStar(require("../middleware/metrics"));
|
|
39
39
|
const metrics = (0, metrics_1.default)();
|
|
40
|
-
describe("Metrics Middleware", function () {
|
|
41
|
-
|
|
42
|
-
it("removes uuid from end of paths", function () {
|
|
40
|
+
(0, node_test_1.describe)("Metrics Middleware", function () {
|
|
41
|
+
(0, node_test_1.describe)("Default Filter", () => {
|
|
42
|
+
(0, node_test_1.it)("removes uuid from end of paths", function () {
|
|
43
43
|
const path = "api.user.daafe605-feac-add0-ad0e-89023d48deab";
|
|
44
44
|
const cleanPath = metrics.defaultFilter(path);
|
|
45
45
|
chai_1.assert.equal(cleanPath, "api.user");
|
|
46
46
|
});
|
|
47
|
-
it("removes uuid from middle of paths", function () {
|
|
47
|
+
(0, node_test_1.it)("removes uuid from middle of paths", function () {
|
|
48
48
|
const path = "api.user.daafe605-feac-add0-ad0e-89023d48deab.info";
|
|
49
49
|
const cleanPath = metrics.defaultFilter(path);
|
|
50
50
|
chai_1.assert.equal(cleanPath, "api.user.info");
|
|
51
51
|
});
|
|
52
|
-
it("removes mongo id from middle of paths", function () {
|
|
52
|
+
(0, node_test_1.it)("removes mongo id from middle of paths", function () {
|
|
53
53
|
const path = "api.online.515a41a3e0387575cc939002.status";
|
|
54
54
|
const cleanPath = metrics.defaultFilter(path);
|
|
55
55
|
chai_1.assert.equal(cleanPath, "api.online.status");
|
|
56
56
|
});
|
|
57
|
-
it("skips paths without uuid", function () {
|
|
57
|
+
(0, node_test_1.it)("skips paths without uuid", function () {
|
|
58
58
|
const path = "api.user.profile";
|
|
59
59
|
const cleanPath = metrics.defaultFilter(path);
|
|
60
60
|
chai_1.assert.equal(cleanPath, "api.user.profile");
|
|
61
61
|
});
|
|
62
62
|
});
|
|
63
|
-
|
|
64
|
-
it("Parses URL without a set base hostname", () => {
|
|
63
|
+
(0, node_test_1.describe)("setStatsDKey", () => {
|
|
64
|
+
(0, node_test_1.it)("Parses URL without a set base hostname", () => {
|
|
65
65
|
const sampleUrl = "/api/v2/cad-vehicle-status?apikey=some123key";
|
|
66
66
|
const req = {
|
|
67
67
|
method: "POST",
|
|
@@ -75,8 +75,8 @@ describe("Metrics Middleware", function () {
|
|
|
75
75
|
});
|
|
76
76
|
});
|
|
77
77
|
});
|
|
78
|
-
describe("cleanUpParams", () => {
|
|
79
|
-
it("cleans up params", () => {
|
|
78
|
+
(0, node_test_1.describe)("cleanUpParams", () => {
|
|
79
|
+
(0, node_test_1.it)("cleans up params", () => {
|
|
80
80
|
const req = {
|
|
81
81
|
statsdKey: "api.a1.admin.department.abcd",
|
|
82
82
|
params: {
|
|
@@ -87,7 +87,7 @@ describe("cleanUpParams", () => {
|
|
|
87
87
|
(0, metrics_1.cleanUpParams)(req);
|
|
88
88
|
chai_1.assert.strictEqual(req.statsdKey, "api.a1.x123.department.departmentid"); // cspell: words departmentid
|
|
89
89
|
});
|
|
90
|
-
it("cleans up params when values are undefined", () => {
|
|
90
|
+
(0, node_test_1.it)("cleans up params when values are undefined", () => {
|
|
91
91
|
const req = {
|
|
92
92
|
statsdKey: "api.a1.admin.department",
|
|
93
93
|
params: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA
|
|
1
|
+
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,58 @@
|
|
|
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_events_1 = require("node:events");
|
|
8
|
+
const node_test_1 = require("node:test");
|
|
9
|
+
const status_logger_1 = __importDefault(require("../middleware/status-logger"));
|
|
10
|
+
(0, node_test_1.describe)("Status Logger Middleware", function () {
|
|
11
|
+
(0, node_test_1.describe)("Request Log", () => {
|
|
12
|
+
// Sample values only. Every one is made up.
|
|
13
|
+
const sample = "abcdef1234567";
|
|
14
|
+
function logLine(req) {
|
|
15
|
+
let line = {};
|
|
16
|
+
const logger = {
|
|
17
|
+
info: (msg) => {
|
|
18
|
+
line = msg;
|
|
19
|
+
},
|
|
20
|
+
};
|
|
21
|
+
const res = new node_events_1.EventEmitter();
|
|
22
|
+
res.statusCode = 200;
|
|
23
|
+
res.json = () => res;
|
|
24
|
+
(0, status_logger_1.default)(logger)(req, res, () => undefined);
|
|
25
|
+
res.emit("finish");
|
|
26
|
+
return line;
|
|
27
|
+
}
|
|
28
|
+
// server-status authenticates POST /api/v2/personnel by a key it accepts in the query.
|
|
29
|
+
(0, node_test_1.it)("cuts the credentials out of the url, the query, and the headers", function () {
|
|
30
|
+
const line = logLine({
|
|
31
|
+
method: "POST",
|
|
32
|
+
originalUrl: `/api/v2/personnel?personnelApiKey=${sample}&v=4`,
|
|
33
|
+
path: "/api/v2/personnel",
|
|
34
|
+
query: { personnelApiKey: sample, v: "4" },
|
|
35
|
+
headers: { "user-agent": "TCMobile 3.0.3 b216", personnelapikey: sample },
|
|
36
|
+
});
|
|
37
|
+
const req = line.req;
|
|
38
|
+
chai_1.assert.equal(req.originalUrl, "/api/v2/personnel?personnelApiKey=abcdef1&v=4");
|
|
39
|
+
chai_1.assert.deepEqual(req.query, { personnelApiKey: "abcdef1", v: "4" });
|
|
40
|
+
chai_1.assert.deepEqual(req.headers, {
|
|
41
|
+
"user-agent": "TCMobile 3.0.3 b216",
|
|
42
|
+
personnelapikey: "abcdef1",
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
(0, node_test_1.it)("leaves the request query alone for the handlers that run after it", function () {
|
|
46
|
+
const query = { personnelApiKey: sample };
|
|
47
|
+
logLine({
|
|
48
|
+
method: "POST",
|
|
49
|
+
originalUrl: `/api/v2/personnel?personnelApiKey=${sample}`,
|
|
50
|
+
path: "/api/v2/personnel",
|
|
51
|
+
query,
|
|
52
|
+
headers: {},
|
|
53
|
+
});
|
|
54
|
+
chai_1.assert.deepEqual(query, { personnelApiKey: sample });
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
});
|
|
58
|
+
//# sourceMappingURL=middleware-status-logger.js.map
|
|
@@ -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;aACmB,CAAC;YACvB,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"}
|
package/definitions/index.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import _loggerMiddleware from "./middleware/logger";
|
|
|
3
3
|
import _metricsMiddleware, { cleanUpParams } from "./middleware/metrics";
|
|
4
4
|
import _statusLogger from "./middleware/status-logger";
|
|
5
5
|
export { LoggerConfig } from "./winston-logger";
|
|
6
|
+
export { redactHeaders, redactOriginalURL, redactQuery } from "./middleware/logger";
|
|
6
7
|
export declare const logger: typeof _logger;
|
|
7
8
|
export declare const loggerMiddleware: typeof _loggerMiddleware;
|
|
8
9
|
export declare const metricsCleanUpParams: typeof cleanUpParams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,EAAE,EAAE,aAAa,EAAG,MAAM,sBAAsB,CAAC;AAC1E,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,kBAAkB,EAAE,EAAE,aAAa,EAAG,MAAM,sBAAsB,CAAC;AAC1E,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEpF,eAAO,MAAM,MAAM,gBAAU,CAAC;AAC9B,eAAO,MAAM,gBAAgB,0BAAoB,CAAC;AAClD,eAAO,MAAM,oBAAoB,sBAAgB,CAAC;AAClD,eAAO,MAAM,iBAAiB,2BAAqB,CAAC;AACpD,eAAO,MAAM,YAAY,sBAAgB,CAAC;;;;;;;;AAE1C,wBAME"}
|
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { Logger } from "winston";
|
|
2
2
|
import { NextFunction, Request, Response } from "express";
|
|
3
|
+
import { Query } from "express-serve-static-core";
|
|
4
|
+
export declare function redactHeaders(headers: Request["headers"]): Request["headers"];
|
|
5
|
+
export declare function redactQuery(query: Query): Query;
|
|
3
6
|
export declare function redactOriginalURL(maybeURL?: string): string;
|
|
4
7
|
export default function loggerMiddleware(logger?: Logger): (req: Request, res: Response, next: NextFunction) => void;
|
|
5
8
|
//# sourceMappingURL=logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AA6FlD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC,SAAS,CAAC,CAU7E;AAYD,wBAAgB,WAAW,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAS/C;AAaD,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAc3D;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,IAClB,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UA4BpF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Logger } from "winston";
|
|
2
2
|
import { NextFunction, Request, Response } from "express";
|
|
3
|
-
import {
|
|
3
|
+
import { redactQuery } from "./logger";
|
|
4
|
+
export { redactQuery };
|
|
4
5
|
export declare function shouldIgnore(req: Request, res: Response): boolean;
|
|
5
6
|
export declare function requestDuration(endTime: Date, startTime?: Date): number;
|
|
6
|
-
export declare function redactQuery(q: Query): import("qs").ParsedQs;
|
|
7
7
|
export default function statusLogger(logger?: Logger): (req: Request, res: Response, next: NextFunction) => void;
|
|
8
8
|
export type StatusLoggerModule = ReturnType<typeof statusLogger>;
|
|
9
9
|
//# sourceMappingURL=status-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"status-logger.d.ts","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EACL,YAAY,EACZ,OAAO,EACP,QAAQ,EACT,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAoC,WAAW,EAAE,MAAM,UAAU,CAAC;AAEzE,OAAO,EAAE,WAAW,EAAE,CAAC;AAIvB,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAkBjE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,IAAI,GAAG,MAAM,CAMvE;AAED,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,IACpB,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UAgE9E;AAED,MAAM,MAAM,kBAAkB,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=middleware-logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-logger.d.ts","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware-logger.d.ts","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":""}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
export {};
|
|
2
2
|
//# sourceMappingURL=middleware-metrics.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.d.ts","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"middleware-metrics.d.ts","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"middleware-status-logger.d.ts","sourceRoot":"","sources":["../../src/test/middleware-status-logger.ts"],"names":[],"mappings":""}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.aug.d.ts","sourceRoot":"","sources":["../../src/types/express.aug.ts"],"names":[],"mappings":"AACA,OAAO,EAAG,CAAC;AAEX,OAAO,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"express.aug.d.ts","sourceRoot":"","sources":["../../src/types/express.aug.ts"],"names":[],"mappings":"AACA,OAAO,EAAG,CAAC;AAEX,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,OAAO,CAAC;QAChB,UAAU,OAAO;YACf,SAAS,EAAE,MAAM,CAAC;YAClB,UAAU,CAAC,EAAE,IAAI,CAAC;SACnB;QAED,UAAU,QAAQ;YAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;YACnB,SAAS,CAAC,EAAE,OAAO,CAAC;YACpB,YAAY,EAAE,MAAM,CAAC;SACtB;KACF;CACF"}
|
package/eslint.config.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { defineConfig } from "eslint/config";
|
|
2
|
+
import promise from "eslint-plugin-promise";
|
|
2
3
|
import security from "eslint-plugin-security";
|
|
3
|
-
import typescriptEslint from "@typescript-eslint/eslint-plugin";
|
|
4
4
|
import globals from "globals";
|
|
5
5
|
import tsParser from "@typescript-eslint/parser";
|
|
6
6
|
import path from "node:path";
|
|
@@ -19,19 +19,20 @@ const compat = new FlatCompat({
|
|
|
19
19
|
|
|
20
20
|
export default defineConfig([
|
|
21
21
|
...neostandard({
|
|
22
|
+
env: [
|
|
23
|
+
"node",
|
|
24
|
+
],
|
|
22
25
|
ts: true,
|
|
23
26
|
}),
|
|
24
27
|
plugins.n.configs["flat/recommended"],
|
|
25
28
|
{
|
|
26
29
|
extends: compat.extends(
|
|
27
30
|
"eslint:recommended",
|
|
28
|
-
"plugin:@typescript-eslint/recommended",
|
|
29
|
-
"plugin:@typescript-eslint/recommended-requiring-type-checking",
|
|
30
31
|
),
|
|
31
32
|
|
|
32
33
|
plugins: {
|
|
34
|
+
promise,
|
|
33
35
|
security,
|
|
34
|
-
"@typescript-eslint": typescriptEslint,
|
|
35
36
|
},
|
|
36
37
|
|
|
37
38
|
languageOptions: {
|
|
@@ -41,7 +42,7 @@ export default defineConfig([
|
|
|
41
42
|
},
|
|
42
43
|
|
|
43
44
|
parser: tsParser,
|
|
44
|
-
ecmaVersion:
|
|
45
|
+
ecmaVersion: 2019,
|
|
45
46
|
sourceType: "commonjs",
|
|
46
47
|
|
|
47
48
|
parserOptions: {
|
|
@@ -49,16 +50,26 @@ export default defineConfig([
|
|
|
49
50
|
},
|
|
50
51
|
},
|
|
51
52
|
|
|
53
|
+
settings: {
|
|
54
|
+
node: {
|
|
55
|
+
version: ">=24.15.0",
|
|
56
|
+
}
|
|
57
|
+
},
|
|
58
|
+
|
|
52
59
|
rules: {
|
|
53
60
|
quotes: [2, "double"],
|
|
54
61
|
semi: [2, "always"],
|
|
62
|
+
"@typescript-eslint/await-thenable": [1],
|
|
63
|
+
"@typescript-eslint/no-floating-promises": [1],
|
|
64
|
+
"@typescript-eslint/no-for-in-array": [1],
|
|
65
|
+
|
|
55
66
|
"space-before-function-paren": [0],
|
|
56
67
|
"@typescript-eslint/explicit-module-boundary-types": 0,
|
|
57
68
|
"@typescript-eslint/no-empty-interface": 0,
|
|
58
69
|
"@typescript-eslint/require-await": 0,
|
|
59
70
|
"@typescript-eslint/restrict-template-expressions": 0,
|
|
60
71
|
|
|
61
|
-
"@typescript-eslint/no-misused-promises": ["
|
|
72
|
+
"@typescript-eslint/no-misused-promises": ["warn", {
|
|
62
73
|
checksVoidReturn: false,
|
|
63
74
|
}],
|
|
64
75
|
//
|
|
@@ -69,10 +80,16 @@ export default defineConfig([
|
|
|
69
80
|
"camelcase": [0],
|
|
70
81
|
"n/no-process-exit": [0],
|
|
71
82
|
"n/no-unpublished-import": ["error", {
|
|
72
|
-
"allowModules": ["chai"
|
|
83
|
+
"allowModules": ["chai"]
|
|
73
84
|
}],
|
|
74
85
|
// this is a workaround for import of .ts files
|
|
75
86
|
"n/no-missing-import": [0],
|
|
76
87
|
},
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
files: ["src/test/**"],
|
|
91
|
+
rules: {
|
|
92
|
+
"@typescript-eslint/no-floating-promises": [0],
|
|
93
|
+
},
|
|
77
94
|
}
|
|
78
|
-
]);
|
|
95
|
+
]);
|
package/gulpfile.js
CHANGED
|
@@ -17,10 +17,14 @@ gulp.task("ts",
|
|
|
17
17
|
exec.task("tsc -p src")
|
|
18
18
|
));
|
|
19
19
|
|
|
20
|
+
gulp.task("spell", exec.task("cspell --no-progress"));
|
|
21
|
+
|
|
22
|
+
gulp.task("type-coverage", exec.task("type-coverage --detail"));
|
|
23
|
+
|
|
20
24
|
gulp.task("lint", exec.task("eslint src"));
|
|
21
25
|
|
|
22
|
-
gulp.task("test", exec.task("
|
|
26
|
+
gulp.task("test", exec.task("tsx --test --test-concurrency=1 --test-reporter=spec src/test/*.ts"));
|
|
23
27
|
|
|
24
28
|
gulp.task("build", gulp.series("ts"));
|
|
25
29
|
|
|
26
|
-
gulp.task("default", gulp.series("ts", "lint", "test"));
|
|
30
|
+
gulp.task("default", gulp.series("type-coverage", "spell", "ts", "lint", "test"));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "tabletcommand-logger",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.7",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -32,11 +32,10 @@
|
|
|
32
32
|
"@types/express": "^4.17.25",
|
|
33
33
|
"@types/express-serve-static-core": "^4.19.8",
|
|
34
34
|
"@types/lodash": "^4.17.24",
|
|
35
|
-
"@types/
|
|
36
|
-
"@types/node": "^24.12.3",
|
|
35
|
+
"@types/node": "^24.12.4",
|
|
37
36
|
"@types/serve-static": "^2.2.0",
|
|
38
|
-
"@typescript-eslint/eslint-plugin": "^8.59.
|
|
39
|
-
"@typescript-eslint/parser": "^8.59.
|
|
37
|
+
"@typescript-eslint/eslint-plugin": "^8.59.3",
|
|
38
|
+
"@typescript-eslint/parser": "^8.59.3",
|
|
40
39
|
"chai": "^6.2.2",
|
|
41
40
|
"cspell": "^10.0.0",
|
|
42
41
|
"del": "^8.0.1",
|
|
@@ -46,11 +45,8 @@
|
|
|
46
45
|
"globals": "^17.6.0",
|
|
47
46
|
"gulp": "^5.0.1",
|
|
48
47
|
"gulp-execa": "^8.0.1",
|
|
49
|
-
"mocha": "^11.7.5",
|
|
50
48
|
"neostandard": "^0.13.0",
|
|
51
|
-
"
|
|
52
|
-
"ts-node": "^10.9.2",
|
|
53
|
-
"tsconfig-paths": "^4.2.0",
|
|
49
|
+
"tsx": "^4.21.0",
|
|
54
50
|
"type-coverage": "^2.29.7",
|
|
55
51
|
"typescript": "~5.9.3"
|
|
56
52
|
}
|
package/src/index.ts
CHANGED
|
@@ -4,6 +4,7 @@ import _metricsMiddleware, { cleanUpParams, } from "./middleware/metrics";
|
|
|
4
4
|
import _statusLogger from "./middleware/status-logger";
|
|
5
5
|
|
|
6
6
|
export { LoggerConfig } from "./winston-logger";
|
|
7
|
+
export { redactHeaders, redactOriginalURL, redactQuery } from "./middleware/logger";
|
|
7
8
|
|
|
8
9
|
export const logger = _logger;
|
|
9
10
|
export const loggerMiddleware = _loggerMiddleware;
|
package/src/middleware/logger.ts
CHANGED
|
@@ -5,26 +5,157 @@ import {
|
|
|
5
5
|
Request,
|
|
6
6
|
Response,
|
|
7
7
|
} from "express";
|
|
8
|
+
import { Query } from "express-serve-static-core";
|
|
8
9
|
|
|
10
|
+
// Each of these authenticates a request on its own, so a log line that keeps the whole
|
|
11
|
+
// value is a live credential. The header stays, cut to a 7-character prefix: enough to
|
|
12
|
+
// tell two keys apart, not enough to replay one. Node lowercases incoming header names.
|
|
13
|
+
const keyHeaders = [
|
|
14
|
+
"authorization",
|
|
15
|
+
"apikey",
|
|
16
|
+
"personnelapikey",
|
|
17
|
+
"x-tc-auth-token",
|
|
18
|
+
];
|
|
19
|
+
|
|
20
|
+
// tabletcommand-session reads each of these from the query string when the header is
|
|
21
|
+
// absent, and accepts either spelling. signupKey only ever arrives in the query.
|
|
22
|
+
const keyParams = [
|
|
23
|
+
"apikey",
|
|
24
|
+
"personnelapikey",
|
|
25
|
+
"signupkey",
|
|
26
|
+
];
|
|
27
|
+
|
|
28
|
+
// A route can wrap a key name in a longer parameter name, such as deviceApiKey, so match
|
|
29
|
+
// the name loosely. Cutting a parameter that holds no credential costs nothing.
|
|
30
|
+
function isKeyParam(name: string): boolean {
|
|
31
|
+
const lower = decodeName(name).toLowerCase();
|
|
32
|
+
return keyParams.some((keyParam) => lower.includes(keyParam));
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
// Express decodes the name before tabletcommand-session reads it, so api%6Bey
|
|
36
|
+
// authenticates as apikey and has to be matched the same way. decodeURIComponent throws
|
|
37
|
+
// on a malformed escape, and this runs in a res "finish" listener where a throw ends the
|
|
38
|
+
// process.
|
|
39
|
+
function decodeName(name: string): string {
|
|
40
|
+
try {
|
|
41
|
+
return decodeURIComponent(name.replace(/\+/g, " "));
|
|
42
|
+
} catch {
|
|
43
|
+
return name;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
const redacted = "<redacted>";
|
|
48
|
+
|
|
49
|
+
function keepPrefix(value: string): string {
|
|
50
|
+
return value.substring(0, 7);
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// Every scheme this service accepts is a short word, such as Bearer or Basic.
|
|
54
|
+
const schemePattern = /^[A-Za-z]{1,20}$/;
|
|
55
|
+
|
|
56
|
+
// A scheme fills the whole prefix on its own, so keep it and take the prefix from the
|
|
57
|
+
// credential behind it. A first word that is not a scheme is part of the credential, so
|
|
58
|
+
// cut the value whole rather than keep that word.
|
|
59
|
+
function redactAuthorization(value: string): string {
|
|
60
|
+
const [scheme, ...rest] = value.split(" ");
|
|
61
|
+
if (rest.length === 0 || !schemePattern.test(scheme)) {
|
|
62
|
+
return keepPrefix(value);
|
|
63
|
+
}
|
|
64
|
+
return `${scheme} ${keepPrefix(rest.join(" "))}`;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
// Cookie names answer "did the caller send a session at all", so they stay and the values go.
|
|
68
|
+
function redactCookie(value: string): string {
|
|
69
|
+
return value
|
|
70
|
+
.split(";")
|
|
71
|
+
.map((pair) => pair.split("=")[0].trim())
|
|
72
|
+
.filter((name) => name !== "")
|
|
73
|
+
.map((name) => `${name}=${redacted}`)
|
|
74
|
+
.join("; ");
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
function redactorFor(name: string): (value: string) => string {
|
|
78
|
+
if (name === "cookie") {
|
|
79
|
+
return redactCookie;
|
|
80
|
+
}
|
|
81
|
+
if (name === "authorization") {
|
|
82
|
+
return redactAuthorization;
|
|
83
|
+
}
|
|
84
|
+
return keepPrefix;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// Node only gives a string or an array of strings, so anything else means other
|
|
88
|
+
// middleware wrote to req.headers. Drop it rather than throw: this runs in a res
|
|
89
|
+
// "finish" listener, where an exception ends the process.
|
|
90
|
+
function redactHeaderValue(name: string, value: unknown): string | string[] {
|
|
91
|
+
const redact = redactorFor(name);
|
|
92
|
+
if (_.isArray(value)) {
|
|
93
|
+
return value.map((entry: unknown) => _.isString(entry) ? redact(entry) : redacted);
|
|
94
|
+
}
|
|
95
|
+
if (!_.isString(value)) {
|
|
96
|
+
return redacted;
|
|
97
|
+
}
|
|
98
|
+
return redact(value);
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
export function redactHeaders(headers: Request["headers"]): Request["headers"] {
|
|
102
|
+
const clean = { ...headers };
|
|
103
|
+
for (const [name, value] of Object.entries(clean)) {
|
|
104
|
+
const lower = name.toLowerCase();
|
|
105
|
+
if (_.isUndefined(value) || (lower !== "cookie" && !keyHeaders.includes(lower))) {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
clean[name] = redactHeaderValue(lower, value);
|
|
109
|
+
}
|
|
110
|
+
return clean;
|
|
111
|
+
}
|
|
112
|
+
|
|
113
|
+
function redactQueryValue(value: Query[string]): Query[string] {
|
|
114
|
+
if (_.isString(value)) {
|
|
115
|
+
return keepPrefix(value);
|
|
116
|
+
}
|
|
117
|
+
if (_.isArray(value)) {
|
|
118
|
+
return value.map((entry: unknown) => _.isString(entry) ? keepPrefix(entry) : redacted);
|
|
119
|
+
}
|
|
120
|
+
return redacted;
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
export function redactQuery(query: Query): Query {
|
|
124
|
+
const clean: Query = { ...query };
|
|
125
|
+
for (const [name, value] of Object.entries(clean)) {
|
|
126
|
+
if (_.isUndefined(value) || !isKeyParam(name)) {
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
clean[name] = redactQueryValue(value);
|
|
130
|
+
}
|
|
131
|
+
return clean;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
function redactParamPair(pair: string): string {
|
|
135
|
+
const split = pair.indexOf("=");
|
|
136
|
+
if (split < 0 || !isKeyParam(pair.substring(0, split))) {
|
|
137
|
+
return pair;
|
|
138
|
+
}
|
|
139
|
+
return pair.substring(0, split + 1) + keepPrefix(pair.substring(split + 1));
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
// req.originalUrl is relative, so this splits the string rather than parsing a URL. A
|
|
143
|
+
// regex over the whole string backtracks for as long as the url, and the url comes from
|
|
144
|
+
// the caller. Splitting on "?" as well as "&" reaches a nested url in a parameter value.
|
|
9
145
|
export function redactOriginalURL(maybeURL?: string): string {
|
|
10
|
-
if (!maybeURL) {
|
|
146
|
+
if (!_.isString(maybeURL) || maybeURL === "") {
|
|
11
147
|
return "";
|
|
12
148
|
}
|
|
13
149
|
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const prevApiKey = href.searchParams.get("apikey");
|
|
18
|
-
if (prevApiKey && _.isString(prevApiKey)) {
|
|
19
|
-
href.searchParams.set("apikey", prevApiKey.substring(0, 7));
|
|
20
|
-
return href.toString();
|
|
21
|
-
}
|
|
22
|
-
} catch {
|
|
23
|
-
//
|
|
150
|
+
const queryStart = maybeURL.indexOf("?");
|
|
151
|
+
if (queryStart < 0) {
|
|
152
|
+
return maybeURL;
|
|
24
153
|
}
|
|
25
154
|
|
|
26
|
-
|
|
27
|
-
|
|
155
|
+
const path = maybeURL.substring(0, queryStart + 1);
|
|
156
|
+
const parts = maybeURL.substring(queryStart + 1).split(/([?&])/);
|
|
157
|
+
|
|
158
|
+
return path + parts.map((part, index) => index % 2 === 0 ? redactParamPair(part) : part).join("");
|
|
28
159
|
}
|
|
29
160
|
|
|
30
161
|
export default function loggerMiddleware(logger?: Logger) {
|
|
@@ -47,9 +178,9 @@ export default function loggerMiddleware(logger?: Logger) {
|
|
|
47
178
|
// Added as compatibility
|
|
48
179
|
req: {
|
|
49
180
|
body: req.body as unknown,
|
|
50
|
-
headers: req.headers,
|
|
181
|
+
headers: redactHeaders(req.headers),
|
|
51
182
|
method: req.method,
|
|
52
|
-
originalUrl: req.originalUrl
|
|
183
|
+
originalUrl: redactOriginalURL(req.originalUrl)
|
|
53
184
|
},
|
|
54
185
|
status: res.statusCode ? res.statusCode : 0
|
|
55
186
|
});
|
|
@@ -5,10 +5,11 @@ import {
|
|
|
5
5
|
Request,
|
|
6
6
|
Response,
|
|
7
7
|
} from "express";
|
|
8
|
-
import { Query } from "express-serve-static-core";
|
|
9
8
|
import _ from "lodash";
|
|
10
9
|
|
|
11
|
-
import { redactOriginalURL } from "./logger";
|
|
10
|
+
import { redactHeaders, redactOriginalURL, redactQuery } from "./logger";
|
|
11
|
+
|
|
12
|
+
export { redactQuery };
|
|
12
13
|
|
|
13
14
|
const allowedMethods = ["POST"];
|
|
14
15
|
|
|
@@ -40,14 +41,6 @@ export function requestDuration(endTime: Date, startTime?: Date): number {
|
|
|
40
41
|
return endTime.valueOf() - startTime.valueOf();
|
|
41
42
|
}
|
|
42
43
|
|
|
43
|
-
export function redactQuery(q: Query) {
|
|
44
|
-
if (_.isString(q.apikey)) {
|
|
45
|
-
q.apikey = q.apikey.substring(0, 7);
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
return q;
|
|
49
|
-
}
|
|
50
|
-
|
|
51
44
|
export default function statusLogger(logger?: Logger) {
|
|
52
45
|
return function requestLogger(req: Request, res: Response, next: NextFunction) {
|
|
53
46
|
if (!_.isObject(req._startTime)) {
|
|
@@ -86,13 +79,13 @@ export default function statusLogger(logger?: Logger) {
|
|
|
86
79
|
const cleanReq = _.pick(req, [
|
|
87
80
|
"body",
|
|
88
81
|
"departmentLog",
|
|
89
|
-
"headers",
|
|
90
82
|
"httpVersion",
|
|
91
83
|
"method",
|
|
92
84
|
"originalUrl",
|
|
93
85
|
"path",
|
|
94
86
|
"query",
|
|
95
|
-
])
|
|
87
|
+
]) as Partial<Request>;
|
|
88
|
+
cleanReq.headers = redactHeaders(req.headers);
|
|
96
89
|
cleanReq.originalUrl = redactOriginalURL(req.originalUrl);
|
|
97
90
|
cleanReq.query = redactQuery(req.query);
|
|
98
91
|
|