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.
Files changed (36) hide show
  1. package/build/index.js +5 -1
  2. package/build/index.js.map +1 -1
  3. package/build/middleware/logger.js +132 -16
  4. package/build/middleware/logger.js.map +1 -1
  5. package/build/middleware/status-logger.js +5 -10
  6. package/build/middleware/status-logger.js.map +1 -1
  7. package/build/test/middleware-logger.js +259 -8
  8. package/build/test/middleware-logger.js.map +1 -1
  9. package/build/test/middleware-metrics.js +12 -12
  10. package/build/test/middleware-metrics.js.map +1 -1
  11. package/build/test/middleware-status-logger.js +58 -0
  12. package/build/test/middleware-status-logger.js.map +1 -0
  13. package/definitions/index.d.ts +1 -0
  14. package/definitions/index.d.ts.map +1 -1
  15. package/definitions/middleware/logger.d.ts +3 -0
  16. package/definitions/middleware/logger.d.ts.map +1 -1
  17. package/definitions/middleware/status-logger.d.ts +2 -2
  18. package/definitions/middleware/status-logger.d.ts.map +1 -1
  19. package/definitions/test/middleware-logger.d.ts +1 -1
  20. package/definitions/test/middleware-logger.d.ts.map +1 -1
  21. package/definitions/test/middleware-metrics.d.ts +1 -1
  22. package/definitions/test/middleware-metrics.d.ts.map +1 -1
  23. package/definitions/test/middleware-status-logger.d.ts +2 -0
  24. package/definitions/test/middleware-status-logger.d.ts.map +1 -0
  25. package/definitions/types/express.aug.d.ts.map +1 -1
  26. package/eslint.config.mjs +25 -8
  27. package/gulpfile.js +6 -2
  28. package/package.json +5 -9
  29. package/src/index.ts +1 -0
  30. package/src/middleware/logger.ts +146 -15
  31. package/src/middleware/status-logger.ts +5 -12
  32. package/src/test/middleware-logger.ts +264 -3
  33. package/src/test/middleware-metrics.ts +2 -1
  34. package/src/test/middleware-status-logger.ts +61 -0
  35. package/src/tsconfig.json +4 -1
  36. package/src/types/express.aug.ts +0 -1
package/build/index.js CHANGED
@@ -36,11 +36,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
36
36
  return (mod && mod.__esModule) ? mod : { "default": mod };
37
37
  };
38
38
  Object.defineProperty(exports, "__esModule", { value: true });
39
- exports.statusLogger = exports.metricsMiddleware = exports.metricsCleanUpParams = exports.loggerMiddleware = exports.logger = void 0;
39
+ exports.statusLogger = exports.metricsMiddleware = exports.metricsCleanUpParams = exports.loggerMiddleware = exports.logger = exports.redactQuery = exports.redactOriginalURL = exports.redactHeaders = void 0;
40
40
  const winston_logger_1 = __importDefault(require("./winston-logger"));
41
41
  const logger_1 = __importDefault(require("./middleware/logger"));
42
42
  const metrics_1 = __importStar(require("./middleware/metrics"));
43
43
  const status_logger_1 = __importDefault(require("./middleware/status-logger"));
44
+ var logger_2 = require("./middleware/logger");
45
+ Object.defineProperty(exports, "redactHeaders", { enumerable: true, get: function () { return logger_2.redactHeaders; } });
46
+ Object.defineProperty(exports, "redactOriginalURL", { enumerable: true, get: function () { return logger_2.redactOriginalURL; } });
47
+ Object.defineProperty(exports, "redactQuery", { enumerable: true, get: function () { return logger_2.redactQuery; } });
44
48
  exports.logger = winston_logger_1.default;
45
49
  exports.loggerMiddleware = logger_1.default;
46
50
  exports.metricsCleanUpParams = metrics_1.cleanUpParams;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAuC;AACvC,iEAAoD;AACpD,gEAA0E;AAC1E,+EAAuD;AAI1C,QAAA,MAAM,GAAG,wBAAO,CAAC;AACjB,QAAA,gBAAgB,GAAG,gBAAiB,CAAC;AACrC,QAAA,oBAAoB,GAAG,uBAAa,CAAC;AACrC,QAAA,iBAAiB,GAAG,iBAAkB,CAAC;AACvC,QAAA,YAAY,GAAG,uBAAa,CAAC;AAE1C,kBAAe;IACb,MAAM,EAAN,cAAM;IACN,gBAAgB,EAAhB,wBAAgB;IAChB,iBAAiB,EAAjB,yBAAiB;IACjB,oBAAoB,EAApB,4BAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sEAAuC;AACvC,iEAAoD;AACpD,gEAA0E;AAC1E,+EAAuD;AAGvD,8CAAoF;AAA3E,uGAAA,aAAa,OAAA;AAAE,2GAAA,iBAAiB,OAAA;AAAE,qGAAA,WAAW,OAAA;AAEzC,QAAA,MAAM,GAAG,wBAAO,CAAC;AACjB,QAAA,gBAAgB,GAAG,gBAAiB,CAAC;AACrC,QAAA,oBAAoB,GAAG,uBAAa,CAAC;AACrC,QAAA,iBAAiB,GAAG,iBAAkB,CAAC;AACvC,QAAA,YAAY,GAAG,uBAAa,CAAC;AAE1C,kBAAe;IACb,MAAM,EAAN,cAAM;IACN,gBAAgB,EAAhB,wBAAgB;IAChB,iBAAiB,EAAjB,yBAAiB;IACjB,oBAAoB,EAApB,4BAAoB;IACpB,YAAY,EAAZ,oBAAY;CACb,CAAC"}
@@ -3,27 +3,143 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.redactHeaders = redactHeaders;
7
+ exports.redactQuery = redactQuery;
6
8
  exports.redactOriginalURL = redactOriginalURL;
7
9
  exports.default = loggerMiddleware;
8
10
  const lodash_1 = __importDefault(require("lodash"));
9
- function redactOriginalURL(maybeURL) {
10
- if (!maybeURL) {
11
- return "";
12
- }
11
+ // Each of these authenticates a request on its own, so a log line that keeps the whole
12
+ // value is a live credential. The header stays, cut to a 7-character prefix: enough to
13
+ // tell two keys apart, not enough to replay one. Node lowercases incoming header names.
14
+ const keyHeaders = [
15
+ "authorization",
16
+ "apikey",
17
+ "personnelapikey",
18
+ "x-tc-auth-token",
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
+ // A route can wrap a key name in a longer parameter name, such as deviceApiKey, so match
28
+ // the name loosely. Cutting a parameter that holds no credential costs nothing.
29
+ function isKeyParam(name) {
30
+ const lower = decodeName(name).toLowerCase();
31
+ return keyParams.some((keyParam) => lower.includes(keyParam));
32
+ }
33
+ // Express decodes the name before tabletcommand-session reads it, so api%6Bey
34
+ // authenticates as apikey and has to be matched the same way. decodeURIComponent throws
35
+ // on a malformed escape, and this runs in a res "finish" listener where a throw ends the
36
+ // process.
37
+ function decodeName(name) {
13
38
  try {
14
- // Attempt to keep first 7 chars of the api key
15
- const href = new URL(maybeURL);
16
- const prevApiKey = href.searchParams.get("apikey");
17
- if (prevApiKey && lodash_1.default.isString(prevApiKey)) {
18
- href.searchParams.set("apikey", prevApiKey.substring(0, 7));
19
- return href.toString();
39
+ return decodeURIComponent(name.replace(/\+/g, " "));
40
+ }
41
+ catch {
42
+ return name;
43
+ }
44
+ }
45
+ const redacted = "<redacted>";
46
+ function keepPrefix(value) {
47
+ return value.substring(0, 7);
48
+ }
49
+ // Every scheme this service accepts is a short word, such as Bearer or Basic.
50
+ const schemePattern = /^[A-Za-z]{1,20}$/;
51
+ // A scheme fills the whole prefix on its own, so keep it and take the prefix from the
52
+ // credential behind it. A first word that is not a scheme is part of the credential, so
53
+ // cut the value whole rather than keep that word.
54
+ function redactAuthorization(value) {
55
+ const [scheme, ...rest] = value.split(" ");
56
+ if (rest.length === 0 || !schemePattern.test(scheme)) {
57
+ return keepPrefix(value);
58
+ }
59
+ return `${scheme} ${keepPrefix(rest.join(" "))}`;
60
+ }
61
+ // Cookie names answer "did the caller send a session at all", so they stay and the values go.
62
+ function redactCookie(value) {
63
+ return value
64
+ .split(";")
65
+ .map((pair) => pair.split("=")[0].trim())
66
+ .filter((name) => name !== "")
67
+ .map((name) => `${name}=${redacted}`)
68
+ .join("; ");
69
+ }
70
+ function redactorFor(name) {
71
+ if (name === "cookie") {
72
+ return redactCookie;
73
+ }
74
+ if (name === "authorization") {
75
+ return redactAuthorization;
76
+ }
77
+ return keepPrefix;
78
+ }
79
+ // Node only gives a string or an array of strings, so anything else means other
80
+ // middleware wrote to req.headers. Drop it rather than throw: this runs in a res
81
+ // "finish" listener, where an exception ends the process.
82
+ function redactHeaderValue(name, value) {
83
+ const redact = redactorFor(name);
84
+ if (lodash_1.default.isArray(value)) {
85
+ return value.map((entry) => lodash_1.default.isString(entry) ? redact(entry) : redacted);
86
+ }
87
+ if (!lodash_1.default.isString(value)) {
88
+ return redacted;
89
+ }
90
+ return redact(value);
91
+ }
92
+ function redactHeaders(headers) {
93
+ const clean = { ...headers };
94
+ for (const [name, value] of Object.entries(clean)) {
95
+ const lower = name.toLowerCase();
96
+ if (lodash_1.default.isUndefined(value) || (lower !== "cookie" && !keyHeaders.includes(lower))) {
97
+ continue;
98
+ }
99
+ clean[name] = redactHeaderValue(lower, value);
100
+ }
101
+ return clean;
102
+ }
103
+ function redactQueryValue(value) {
104
+ if (lodash_1.default.isString(value)) {
105
+ return keepPrefix(value);
106
+ }
107
+ if (lodash_1.default.isArray(value)) {
108
+ return value.map((entry) => lodash_1.default.isString(entry) ? keepPrefix(entry) : redacted);
109
+ }
110
+ return redacted;
111
+ }
112
+ function redactQuery(query) {
113
+ const clean = { ...query };
114
+ for (const [name, value] of Object.entries(clean)) {
115
+ if (lodash_1.default.isUndefined(value) || !isKeyParam(name)) {
116
+ continue;
20
117
  }
118
+ clean[name] = redactQueryValue(value);
119
+ }
120
+ return clean;
121
+ }
122
+ function redactParamPair(pair) {
123
+ const split = pair.indexOf("=");
124
+ if (split < 0 || !isKeyParam(pair.substring(0, split))) {
125
+ return pair;
126
+ }
127
+ return pair.substring(0, split + 1) + keepPrefix(pair.substring(split + 1));
128
+ }
129
+ // req.originalUrl is relative, so this splits the string rather than parsing a URL. A
130
+ // regex over the whole string backtracks for as long as the url, and the url comes from
131
+ // the caller. Splitting on "?" as well as "&" reaches a nested url in a parameter value.
132
+ function redactOriginalURL(maybeURL) {
133
+ if (!lodash_1.default.isString(maybeURL) || maybeURL === "") {
134
+ return "";
21
135
  }
22
- catch (_a) {
23
- //
136
+ const queryStart = maybeURL.indexOf("?");
137
+ if (queryStart < 0) {
138
+ return maybeURL;
24
139
  }
25
- // Fallback
26
- return maybeURL.replace(/apikey=.*?(&|$)/, "apikey=xxx&");
140
+ const path = maybeURL.substring(0, queryStart + 1);
141
+ const parts = maybeURL.substring(queryStart + 1).split(/([?&])/);
142
+ return path + parts.map((part, index) => index % 2 === 0 ? redactParamPair(part) : part).join("");
27
143
  }
28
144
  function loggerMiddleware(logger) {
29
145
  return function accessLogMiddleware(req, res, next) {
@@ -45,9 +161,9 @@ function loggerMiddleware(logger) {
45
161
  // Added as compatibility
46
162
  req: {
47
163
  body: req.body,
48
- headers: req.headers,
164
+ headers: redactHeaders(req.headers),
49
165
  method: req.method,
50
- originalUrl: req.originalUrl
166
+ originalUrl: redactOriginalURL(req.originalUrl)
51
167
  },
52
168
  status: res.statusCode ? res.statusCode : 0
53
169
  });
@@ -1 +1 @@
1
- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;;;;AAQA,8CAmBC;AAED,mCA6BC;AA1DD,oDAAuB;AAQvB,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,+CAA+C;QAC/C,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACnD,IAAI,UAAU,IAAI,gBAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAC5D,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAAC,WAAM,CAAC;QACP,EAAE;IACJ,CAAC;IAED,WAAW;IACX,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAC5D,CAAC;AAED,SAAwB,gBAAgB,CAAC,MAAe;IACtD,OAAO,SAAS,mBAAmB,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QACjF,kFAAkF;QAClF,2DAA2D;QAC3D,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,gCAAgC;YAChC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO;YACT,CAAC;YACD,MAAM,CAAC,IAAI,CAAC;gBACV,aAAa,EAAE,GAAG,CAAC,EAAE;gBACrB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,WAAW,CAAC;gBACvC,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,WAAW,EAAE,GAAG,GAAG,CAAC,gBAAgB,IAAI,GAAG,CAAC,gBAAgB,EAAE;gBAC9D,SAAS,EAAE,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;gBACpC,yBAAyB;gBACzB,GAAG,EAAE;oBACH,IAAI,EAAE,GAAG,CAAC,IAAe;oBACzB,OAAO,EAAE,GAAG,CAAC,OAAO;oBACpB,MAAM,EAAE,GAAG,CAAC,MAAM;oBAClB,WAAW,EAAE,GAAG,CAAC,WAAW;iBAC7B;gBACD,MAAM,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;aAC5C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"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"}
@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.redactQuery = void 0;
6
7
  exports.shouldIgnore = shouldIgnore;
7
8
  exports.requestDuration = requestDuration;
8
- exports.redactQuery = redactQuery;
9
9
  exports.default = statusLogger;
10
10
  const lodash_1 = __importDefault(require("lodash"));
11
11
  const logger_1 = require("./logger");
12
+ Object.defineProperty(exports, "redactQuery", { enumerable: true, get: function () { return logger_1.redactQuery; } });
12
13
  const allowedMethods = ["POST"];
13
14
  function shouldIgnore(req, res) {
14
15
  var _a;
@@ -33,12 +34,6 @@ function requestDuration(endTime, startTime) {
33
34
  }
34
35
  return endTime.valueOf() - startTime.valueOf();
35
36
  }
36
- function redactQuery(q) {
37
- if (lodash_1.default.isString(q.apikey)) {
38
- q.apikey = q.apikey.substring(0, 7);
39
- }
40
- return q;
41
- }
42
37
  function statusLogger(logger) {
43
38
  return function requestLogger(req, res, next) {
44
39
  if (!lodash_1.default.isObject(req._startTime)) {
@@ -53,7 +48,7 @@ function statusLogger(logger) {
53
48
  try {
54
49
  res.bodyCopy = JSON.parse(body);
55
50
  }
56
- catch (_a) {
51
+ catch {
57
52
  res.bodyCopy = body;
58
53
  }
59
54
  }
@@ -73,15 +68,15 @@ function statusLogger(logger) {
73
68
  const cleanReq = lodash_1.default.pick(req, [
74
69
  "body",
75
70
  "departmentLog",
76
- "headers",
77
71
  "httpVersion",
78
72
  "method",
79
73
  "originalUrl",
80
74
  "path",
81
75
  "query",
82
76
  ]);
77
+ cleanReq.headers = (0, logger_1.redactHeaders)(req.headers);
83
78
  cleanReq.originalUrl = (0, logger_1.redactOriginalURL)(req.originalUrl);
84
- cleanReq.query = redactQuery(req.query);
79
+ cleanReq.query = (0, logger_1.redactQuery)(req.query);
85
80
  const cleanRes = lodash_1.default.pick(res, [
86
81
  "bodyCopy",
87
82
  "responseTime",
@@ -1 +1 @@
1
- {"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
@@ -1,29 +1,280 @@
1
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
+ })();
2
35
  Object.defineProperty(exports, "__esModule", { value: true });
3
- require("mocha");
4
36
  const chai_1 = require("chai");
5
- const logger_1 = require("../middleware/logger");
6
- describe("Logger Middleware", function () {
7
- context("Redact Original URL", () => {
37
+ const node_events_1 = require("node:events");
38
+ const node_test_1 = require("node:test");
39
+ const logger_1 = __importStar(require("../middleware/logger"));
40
+ // cspell:ignore tcmobile
41
+ (0, node_test_1.describe)("Logger Middleware", function () {
42
+ (0, node_test_1.describe)("Redact Headers", () => {
43
+ // Sample values only. Every one is made up.
44
+ const sample = "abcdef1234567";
45
+ const other = "1234567abcdef";
46
+ (0, node_test_1.it)("cuts every key header to 7 characters", function () {
47
+ const sut = (0, logger_1.redactHeaders)({
48
+ authorization: `Bearer ${sample}`,
49
+ apikey: sample,
50
+ personnelapikey: sample,
51
+ "x-tc-auth-token": sample,
52
+ });
53
+ chai_1.assert.deepEqual(sut, {
54
+ authorization: "Bearer abcdef1",
55
+ apikey: "abcdef1",
56
+ personnelapikey: "abcdef1",
57
+ "x-tc-auth-token": "abcdef1",
58
+ });
59
+ });
60
+ (0, node_test_1.it)("keeps the authorization scheme and cuts the credential behind it", function () {
61
+ const sut = (0, logger_1.redactHeaders)({ authorization: `Basic ${sample}` });
62
+ chai_1.assert.deepEqual(sut, { authorization: "Basic abcdef1" });
63
+ });
64
+ (0, node_test_1.it)("cuts an authorization header that carries no scheme", function () {
65
+ const sut = (0, logger_1.redactHeaders)({ authorization: sample });
66
+ chai_1.assert.deepEqual(sut, { authorization: "abcdef1" });
67
+ });
68
+ // The first word was kept whole as a scheme, which logged a credential that holds a
69
+ // space.
70
+ (0, node_test_1.it)("cuts an authorization credential that holds a space", function () {
71
+ const sut = (0, logger_1.redactHeaders)({ authorization: "abcdef1234567 7654321fedcba" });
72
+ chai_1.assert.deepEqual(sut, { authorization: "abcdef1" });
73
+ });
74
+ (0, node_test_1.it)("keeps the cookie names and drops the values", function () {
75
+ const sut = (0, logger_1.redactHeaders)({
76
+ cookie: `seneca-login=${sample}; saml=${other}`,
77
+ });
78
+ chai_1.assert.deepEqual(sut, {
79
+ cookie: "seneca-login=<redacted>; saml=<redacted>",
80
+ });
81
+ });
82
+ (0, node_test_1.it)("skips the empty segment of a cookie that ends in a semicolon", function () {
83
+ const sut = (0, logger_1.redactHeaders)({ cookie: "seneca-login=abc;" });
84
+ chai_1.assert.deepEqual(sut, { cookie: "seneca-login=<redacted>" });
85
+ });
86
+ (0, node_test_1.it)("returns an empty cookie unchanged", function () {
87
+ const sut = (0, logger_1.redactHeaders)({ cookie: "" });
88
+ chai_1.assert.deepEqual(sut, { cookie: "" });
89
+ });
90
+ (0, node_test_1.it)("matches the header name without case", function () {
91
+ const sut = (0, logger_1.redactHeaders)({
92
+ Cookie: `seneca-login=${sample}`,
93
+ ApiKey: sample,
94
+ });
95
+ chai_1.assert.deepEqual(sut, {
96
+ Cookie: "seneca-login=<redacted>",
97
+ ApiKey: "abcdef1",
98
+ });
99
+ });
100
+ (0, node_test_1.it)("redacts every value of a repeated header", function () {
101
+ const sut = (0, logger_1.redactHeaders)({ apikey: [sample, other] });
102
+ chai_1.assert.deepEqual(sut, { apikey: ["abcdef1", "1234567"] });
103
+ });
104
+ (0, node_test_1.it)("leaves the headers that identify the client", function () {
105
+ const sut = (0, logger_1.redactHeaders)({
106
+ "user-agent": "TCMobile 3.0.3 b216",
107
+ "x-tc-bundle-identifier": "com.tabletcommand.tcmobile",
108
+ });
109
+ chai_1.assert.deepEqual(sut, {
110
+ "user-agent": "TCMobile 3.0.3 b216",
111
+ "x-tc-bundle-identifier": "com.tabletcommand.tcmobile",
112
+ });
113
+ });
114
+ // This runs in a res "finish" listener, where a throw ends the process.
115
+ (0, node_test_1.it)("drops a value that is not a string instead of throwing", function () {
116
+ const sut = (0, logger_1.redactHeaders)({
117
+ apikey: 12345,
118
+ cookie: { name: "seneca-login" },
119
+ authorization: null,
120
+ personnelapikey: [sample, 12345],
121
+ });
122
+ chai_1.assert.deepEqual(sut, {
123
+ apikey: "<redacted>",
124
+ cookie: "<redacted>",
125
+ authorization: "<redacted>",
126
+ personnelapikey: ["abcdef1", "<redacted>"],
127
+ });
128
+ });
129
+ (0, node_test_1.it)("leaves the request headers alone", function () {
130
+ const headers = { apikey: sample, cookie: `seneca-login=${sample}` };
131
+ (0, logger_1.redactHeaders)(headers);
132
+ chai_1.assert.deepEqual(headers, { apikey: sample, cookie: `seneca-login=${sample}` });
133
+ });
134
+ });
135
+ (0, node_test_1.describe)("Redact Query", () => {
136
+ const sample = "abcdef1234567";
137
+ (0, node_test_1.it)("cuts every key parameter to 7 characters", function () {
138
+ const sut = (0, logger_1.redactQuery)({
139
+ apikey: sample,
140
+ personnelApiKey: sample,
141
+ signupKey: sample,
142
+ });
143
+ chai_1.assert.deepEqual(sut, {
144
+ apikey: "abcdef1",
145
+ personnelApiKey: "abcdef1",
146
+ signupKey: "abcdef1",
147
+ });
148
+ });
149
+ (0, node_test_1.it)("leaves the parameters that are not credentials", function () {
150
+ const sut = (0, logger_1.redactQuery)({ v: "4", shared: "1" });
151
+ chai_1.assert.deepEqual(sut, { v: "4", shared: "1" });
152
+ });
153
+ (0, node_test_1.it)("cuts a parameter that wraps a key name", function () {
154
+ const sut = (0, logger_1.redactQuery)({ deviceApiKey: sample, apikeyHash: sample });
155
+ chai_1.assert.deepEqual(sut, { deviceApiKey: "abcdef1", apikeyHash: "abcdef1" });
156
+ });
157
+ (0, node_test_1.it)("does not throw on a malformed escape in a parameter name", function () {
158
+ const sut = (0, logger_1.redactQuery)({ "%ZZ": "4" });
159
+ chai_1.assert.deepEqual(sut, { "%ZZ": "4" });
160
+ });
161
+ (0, node_test_1.it)("cuts every value of a repeated parameter", function () {
162
+ const sut = (0, logger_1.redactQuery)({ apikey: [sample, "7654321fedcba"] });
163
+ chai_1.assert.deepEqual(sut, { apikey: ["abcdef1", "7654321"] });
164
+ });
165
+ (0, node_test_1.it)("drops a value that is not a string", function () {
166
+ const sut = (0, logger_1.redactQuery)({ apikey: { nested: sample } });
167
+ chai_1.assert.deepEqual(sut, { apikey: "<redacted>" });
168
+ });
169
+ // redactQuery used to write the short key back onto req.query, which every handler
170
+ // after the logger reads.
171
+ (0, node_test_1.it)("leaves the request query alone", function () {
172
+ const query = { apikey: sample };
173
+ (0, logger_1.redactQuery)(query);
174
+ chai_1.assert.deepEqual(query, { apikey: sample });
175
+ });
176
+ });
177
+ (0, node_test_1.describe)("Redact Original URL", () => {
8
178
  const url = "http://local:3442/incident?";
9
- it("apikey is last", function () {
179
+ (0, node_test_1.it)("apikey is last", function () {
10
180
  const prevApiKey = "apikey=abcdef1234567";
11
181
  const expApiKey = "apikey=abcdef1";
12
182
  const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
13
183
  chai_1.assert.equal(redacted, url + expApiKey);
14
184
  });
15
- it("apikey is middle of url", function () {
185
+ (0, node_test_1.it)("apikey is middle of url", function () {
16
186
  const prevApiKey = "apikey=abcdef1234567&k=1";
17
187
  const expApiKey = "apikey=abcdef1&k=1";
18
188
  const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
19
189
  chai_1.assert.equal(redacted, url + expApiKey);
20
190
  });
21
- it("apikey is short", function () {
191
+ (0, node_test_1.it)("apikey is short", function () {
22
192
  const prevApiKey = "apikey=1&";
23
- const expApiKey = "apikey=1";
193
+ const expApiKey = "apikey=1&";
24
194
  const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
25
195
  chai_1.assert.equal(redacted, url + expApiKey);
26
196
  });
197
+ // req.originalUrl is what both loggers pass in, and it is always relative.
198
+ (0, node_test_1.it)("cuts the apikey of a relative url", function () {
199
+ const redacted = (0, logger_1.redactOriginalURL)("/api/v1/incident?apikey=abcdef1234567");
200
+ chai_1.assert.equal(redacted, "/api/v1/incident?apikey=abcdef1");
201
+ });
202
+ (0, node_test_1.it)("cuts every key parameter, in either spelling", function () {
203
+ const redacted = (0, logger_1.redactOriginalURL)("/api/v2/personnel?personnelApiKey=abcdef1234567&signupkey=1234567abcdef&v=4");
204
+ chai_1.assert.equal(redacted, "/api/v2/personnel?personnelApiKey=abcdef1&signupkey=1234567&v=4");
205
+ });
206
+ (0, node_test_1.it)("cuts more than one key in the same url", function () {
207
+ const redacted = (0, logger_1.redactOriginalURL)("/api/v2/personnel?apikey=abcdef1234567&personnelApiKey=1234567abcdef");
208
+ chai_1.assert.equal(redacted, "/api/v2/personnel?apikey=abcdef1&personnelApiKey=1234567");
209
+ });
210
+ (0, node_test_1.it)("cuts a parameter that wraps a key name", function () {
211
+ const redacted = (0, logger_1.redactOriginalURL)("/api/v1/incident?departmentApikey=abcdef1234567&apikeyHash=abcdef1234567");
212
+ chai_1.assert.equal(redacted, "/api/v1/incident?departmentApikey=abcdef1&apikeyHash=abcdef1");
213
+ });
214
+ (0, node_test_1.it)("leaves a parameter whose value holds a key name", function () {
215
+ const redacted = (0, logger_1.redactOriginalURL)("/api/v1/incident?sort=apikey&v=4");
216
+ chai_1.assert.equal(redacted, "/api/v1/incident?sort=apikey&v=4");
217
+ });
218
+ // Express decodes the name, so api%6Bey reaches tabletcommand-session as apikey.
219
+ (0, node_test_1.it)("cuts a key parameter whose name is encoded", function () {
220
+ const redacted = (0, logger_1.redactOriginalURL)("/api/v1/incident?api%6Bey=abcdef1234567");
221
+ chai_1.assert.equal(redacted, "/api/v1/incident?api%6Bey=abcdef1");
222
+ });
223
+ (0, node_test_1.it)("cuts the key of a url nested in a parameter value", function () {
224
+ const redacted = (0, logger_1.redactOriginalURL)("/login?next=/api/v1/incident?apikey=abcdef1234567");
225
+ chai_1.assert.equal(redacted, "/login?next=/api/v1/incident?apikey=abcdef1");
226
+ });
227
+ (0, node_test_1.it)("leaves a url that carries no query", function () {
228
+ chai_1.assert.equal((0, logger_1.redactOriginalURL)("/api/v1/incident"), "/api/v1/incident");
229
+ });
230
+ (0, node_test_1.it)("leaves a parameter that carries no value", function () {
231
+ chai_1.assert.equal((0, logger_1.redactOriginalURL)("/api/v1/incident?apikey&v=4"), "/api/v1/incident?apikey&v=4");
232
+ });
233
+ // decodeURIComponent throws on a malformed escape, and this runs where a throw ends
234
+ // the process.
235
+ (0, node_test_1.it)("does not throw on a malformed escape in a parameter name", function () {
236
+ chai_1.assert.equal((0, logger_1.redactOriginalURL)("/api/v1/incident?%ZZ=1&apikey=abcdef1234567"), "/api/v1/incident?%ZZ=1&apikey=abcdef1");
237
+ });
238
+ // A regex over the whole url backtracked for as long as the url.
239
+ (0, node_test_1.it)("redacts a long url without backtracking", function () {
240
+ const start = process.hrtime.bigint();
241
+ (0, logger_1.redactOriginalURL)("/x?" + "apikey".repeat(20000));
242
+ const elapsedMs = Number(process.hrtime.bigint() - start) / 1e6;
243
+ chai_1.assert.isBelow(elapsedMs, 100);
244
+ });
245
+ (0, node_test_1.it)("returns an empty string for a missing url", function () {
246
+ chai_1.assert.equal((0, logger_1.redactOriginalURL)(), "");
247
+ chai_1.assert.equal((0, logger_1.redactOriginalURL)(""), "");
248
+ });
249
+ });
250
+ (0, node_test_1.describe)("Access Log", () => {
251
+ function logLine(req) {
252
+ let line = {};
253
+ const logger = {
254
+ info: (msg) => {
255
+ line = msg;
256
+ },
257
+ };
258
+ const res = new node_events_1.EventEmitter();
259
+ res.statusCode = 200;
260
+ (0, logger_1.default)(logger)(req, res, () => undefined);
261
+ res.emit("finish");
262
+ return line;
263
+ }
264
+ (0, node_test_1.it)("redacts both copies of the url", function () {
265
+ const line = logLine({
266
+ method: "GET",
267
+ originalUrl: "/api/v1/incident?apikey=abcdef1234567",
268
+ headers: { apikey: "abcdef1234567" },
269
+ });
270
+ chai_1.assert.equal(line.url, "/api/v1/incident?apikey=abcdef1");
271
+ chai_1.assert.deepEqual(line.req, {
272
+ body: undefined,
273
+ headers: { apikey: "abcdef1" },
274
+ method: "GET",
275
+ originalUrl: "/api/v1/incident?apikey=abcdef1",
276
+ });
277
+ });
27
278
  });
28
279
  });
29
280
  //# sourceMappingURL=middleware-logger.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"middleware-logger.js","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":";;AAAA,iBAAe;AACf,+BAA8B;AAC9B,iDAAyD;AAEzD,QAAQ,CAAC,mBAAmB,EAAE;IAC5B,OAAO,CAAC,qBAAqB,EAAE,GAAG,EAAE;QAClC,MAAM,GAAG,GAAG,6BAA6B,CAAC;QAC1C,EAAE,CAAC,gBAAgB,EAAE;YACnB,MAAM,UAAU,GAAG,sBAAsB,CAAC;YAC1C,MAAM,SAAS,GAAG,gBAAgB,CAAC;YACnC,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,GAAG,GAAG,UAAU,CAAC,CAAC;YACrD,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yBAAyB,EAAE;YAC5B,MAAM,UAAU,GAAG,0BAA0B,CAAC;YAC9C,MAAM,SAAS,GAAG,oBAAoB,CAAC;YACvC,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,GAAG,GAAG,UAAU,CAAC,CAAC;YACrD,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iBAAiB,EAAE;YACpB,MAAM,UAAU,GAAG,WAAW,CAAC;YAC/B,MAAM,SAAS,GAAG,UAAU,CAAC;YAC7B,MAAM,QAAQ,GAAG,IAAA,0BAAiB,EAAC,GAAG,GAAG,UAAU,CAAC,CAAC;YACrD,aAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,GAAG,SAAS,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"middleware-logger.js","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":"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"}