tabletcommand-logger 3.2.0 → 3.2.2
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/.buildkite/pipeline.yml +5 -0
- package/.cspell/project-words.txt +65 -0
- package/build/middleware/logger.js +17 -0
- package/build/middleware/logger.js.map +1 -1
- package/build/middleware/status-logger.js +1 -1
- package/build/middleware/status-logger.js.map +1 -1
- package/build/test/middleware-logger.js +29 -0
- package/build/test/middleware-logger.js.map +1 -0
- package/build/test/middleware-metrics.js +1 -0
- package/build/test/middleware-metrics.js.map +1 -1
- package/cspell.json +27 -12
- package/definitions/middleware/logger.d.ts.map +1 -1
- package/definitions/test/middleware-logger.d.ts +2 -0
- package/definitions/test/middleware-logger.d.ts.map +1 -0
- package/definitions/test/middleware-metrics.d.ts +1 -1
- package/definitions/test/middleware-metrics.d.ts.map +1 -1
- package/definitions/types/express.aug.d.ts.map +1 -1
- package/eslint.config.mjs +61 -0
- package/gulpfile.js +7 -23
- package/package.json +23 -24
- package/src/middleware/logger.ts +14 -0
- package/src/middleware/status-logger.ts +1 -1
- package/src/test/middleware-logger.ts +29 -0
- package/src/test/middleware-metrics.ts +1 -0
- package/src/types/express.aug.ts +0 -1
- package/test.sh +32 -0
- package/.eslintrc.js +0 -36
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
accesslog
|
|
2
|
+
agencyapi
|
|
3
|
+
agencypersonnelapi
|
|
4
|
+
apikey
|
|
5
|
+
backend
|
|
6
|
+
bamse
|
|
7
|
+
Bernardino
|
|
8
|
+
Botelho
|
|
9
|
+
calfire
|
|
10
|
+
CALNU
|
|
11
|
+
Clarington
|
|
12
|
+
CLSD
|
|
13
|
+
CONFIRE
|
|
14
|
+
crisys
|
|
15
|
+
DDTHH
|
|
16
|
+
devops
|
|
17
|
+
DISP
|
|
18
|
+
dmon
|
|
19
|
+
Enroute
|
|
20
|
+
expireat
|
|
21
|
+
FBLK
|
|
22
|
+
FCZU
|
|
23
|
+
fdid
|
|
24
|
+
flushall
|
|
25
|
+
FORNG
|
|
26
|
+
helloworld
|
|
27
|
+
hgetall
|
|
28
|
+
hincrby
|
|
29
|
+
Icecast
|
|
30
|
+
karka
|
|
31
|
+
Lehigh
|
|
32
|
+
Marino
|
|
33
|
+
MATEO
|
|
34
|
+
mget
|
|
35
|
+
mockgoose
|
|
36
|
+
Modul
|
|
37
|
+
Montebello
|
|
38
|
+
myhash
|
|
39
|
+
Novato
|
|
40
|
+
Onscene
|
|
41
|
+
Peraton
|
|
42
|
+
personnelapi
|
|
43
|
+
personnelapikey
|
|
44
|
+
Postdirectional
|
|
45
|
+
Predirectional
|
|
46
|
+
Prio
|
|
47
|
+
Pulsepoint
|
|
48
|
+
SFFD
|
|
49
|
+
shortcode
|
|
50
|
+
signup
|
|
51
|
+
signupkey
|
|
52
|
+
SLSA
|
|
53
|
+
Sonoma
|
|
54
|
+
stacktraces
|
|
55
|
+
tabletcommand
|
|
56
|
+
tyrion
|
|
57
|
+
unixtime
|
|
58
|
+
Ursache
|
|
59
|
+
Verdugo
|
|
60
|
+
Versaterm
|
|
61
|
+
VFIRE
|
|
62
|
+
virtuals
|
|
63
|
+
Whitby
|
|
64
|
+
xpert
|
|
65
|
+
zonehaven
|
|
@@ -1,10 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.redactOriginalURL = void 0;
|
|
7
|
+
const lodash_1 = __importDefault(require("lodash"));
|
|
4
8
|
function redactOriginalURL(maybeURL) {
|
|
5
9
|
if (!maybeURL) {
|
|
6
10
|
return "";
|
|
7
11
|
}
|
|
12
|
+
try {
|
|
13
|
+
// Attempt to keep first 7 chars of the api key
|
|
14
|
+
const href = new URL(maybeURL);
|
|
15
|
+
const prevApiKey = href.searchParams.get("apikey");
|
|
16
|
+
if (prevApiKey && lodash_1.default.isString(prevApiKey)) {
|
|
17
|
+
href.searchParams.set("apikey", prevApiKey.substring(0, 7));
|
|
18
|
+
return href.toString();
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
catch (_a) {
|
|
22
|
+
//
|
|
23
|
+
}
|
|
24
|
+
// Fallback
|
|
8
25
|
return maybeURL.replace(/apikey=.*?(&|$)/, "apikey=xxx&");
|
|
9
26
|
}
|
|
10
27
|
exports.redactOriginalURL = redactOriginalURL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAQvB,SAAgB,iBAAiB,CAAC,QAAiB;IACjD,IAAI,CAAC,QAAQ,EAAE;QACb,OAAO,EAAE,CAAC;KACX;IAED,IAAI;QACF,+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;YACxC,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;SACxB;KACF;IAAC,WAAM;QACN,EAAE;KACH;IAED,WAAW;IACX,OAAO,QAAQ,CAAC,OAAO,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;AAC5D,CAAC;AAnBD,8CAmBC;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;gBACX,OAAO;aACR;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;AA7BD,mCA6BC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":";;;;;;AAQA,oDAAuB;AAEvB,qCAA6C;AAE7C,MAAM,cAAc,GAAG,CAAC,MAAM,CAAC,CAAC;AAEhC,SAAgB,YAAY,CAAC,GAAY,EAAE,GAAa;;IACtD,IAAI,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;QAC7C,OAAO,IAAI,CAAC;KACb;IAED,6CAA6C;IAC7C,MAAM,CAAC,GAAG,CAAC,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,mCAAI,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,CAAC,SAAS,EAAE;QACd,OAAO,IAAI,CAAC;KACb;IAED,MAAM,SAAS,GAAY,gBAAC,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAoB,CAAC,CAAC;IAC5D,IAAI,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;QACvD,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,oCAkBC;AAED,SAAgB,eAAe,CAAC,OAAa,EAAE,SAAgB;IAC7D,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAC,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;QAClD,OAAO,CAAC,CAAC;KACV;IAED,OAAO,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;AACjD,CAAC;AAND,0CAMC;AAED,SAAgB,WAAW,CAAC,CAAQ;IAClC,IAAI,gBAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE;QACxB,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACrC;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAND,kCAMC;AAED,SAAwB,YAAY,CAAC,MAAe;IAClD,OAAO,SAAS,aAAa,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB;QAC3E,IAAI,CAAC,gBAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YAC/B,GAAG,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;SAC7B;QAED,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;QAEpB,mCAAmC;QACnC,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnC,kCAAkC;QAClC,GAAG,CAAC,IAAI,GAAG,SAAS,OAAO,CAAC,IAAa;YACvC,IAAI,gBAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBACpB,IAAI;oBACF,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iBACjC;gBAAC,
|
|
1
|
+
{"version":3,"file":"status-logger.js","sourceRoot":"","sources":["../../src/middleware/status-logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
require("mocha");
|
|
4
|
+
const chai_1 = require("chai");
|
|
5
|
+
const logger_1 = require("../middleware/logger");
|
|
6
|
+
describe("Logger Middleware", function () {
|
|
7
|
+
context("Redact Original URL", () => {
|
|
8
|
+
const url = "http://local:3442/incident?";
|
|
9
|
+
it("apikey is last", function () {
|
|
10
|
+
const prevApiKey = "apikey=abcdef1234567";
|
|
11
|
+
const expApiKey = "apikey=abcdef1";
|
|
12
|
+
const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
|
|
13
|
+
chai_1.assert.equal(redacted, url + expApiKey);
|
|
14
|
+
});
|
|
15
|
+
it("apikey is middle of url", function () {
|
|
16
|
+
const prevApiKey = "apikey=abcdef1234567&k=1";
|
|
17
|
+
const expApiKey = "apikey=abcdef1&k=1";
|
|
18
|
+
const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
|
|
19
|
+
chai_1.assert.equal(redacted, url + expApiKey);
|
|
20
|
+
});
|
|
21
|
+
it("apikey is short", function () {
|
|
22
|
+
const prevApiKey = "apikey=1&";
|
|
23
|
+
const expApiKey = "apikey=1";
|
|
24
|
+
const redacted = (0, logger_1.redactOriginalURL)(url + prevApiKey);
|
|
25
|
+
chai_1.assert.equal(redacted, url + expApiKey);
|
|
26
|
+
});
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
//# sourceMappingURL=middleware-logger.js.map
|
|
@@ -0,0 +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"}
|
|
@@ -3,6 +3,7 @@ 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
|
+
require("mocha");
|
|
6
7
|
const chai_1 = require("chai");
|
|
7
8
|
const metrics_1 = __importDefault(require("../middleware/metrics"));
|
|
8
9
|
const metrics_2 = require("../middleware/metrics");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"middleware-metrics.js","sourceRoot":"","sources":["../../src/test/middleware-metrics.ts"],"names":[],"mappings":"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"}
|
package/cspell.json
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
1
1
|
// cSpell Settings
|
|
2
2
|
{
|
|
3
|
-
|
|
3
|
+
"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
|
|
4
4
|
"version": "0.2",
|
|
5
5
|
// language - current active spelling language
|
|
6
6
|
"language": "en-US",
|
|
7
7
|
// words - list of words to be always considered correct
|
|
8
|
-
"words": [
|
|
9
|
-
"tabletcommand",
|
|
10
|
-
"backend",
|
|
11
|
-
"Ursache",
|
|
12
|
-
"bamse",
|
|
13
|
-
"apikey"
|
|
14
|
-
],
|
|
8
|
+
"words": [],
|
|
15
9
|
// flagWords - list of words to be always considered incorrect
|
|
16
10
|
// This is useful for offensive words and common spelling errors.
|
|
17
11
|
// For example "hte" should be "the"
|
|
@@ -19,10 +13,31 @@
|
|
|
19
13
|
"hte"
|
|
20
14
|
],
|
|
21
15
|
"ignoreWords": [],
|
|
22
|
-
"dictionaryDefinitions": [],
|
|
23
|
-
"dictionaries": [],
|
|
24
16
|
"languageSettings": [{
|
|
25
17
|
"languageId": "*",
|
|
26
18
|
"dictionaries": []
|
|
27
|
-
}]
|
|
28
|
-
|
|
19
|
+
}],
|
|
20
|
+
"ignorePaths": [
|
|
21
|
+
"node_modules",
|
|
22
|
+
"src/**/*.svg",
|
|
23
|
+
"/project-words.txt"
|
|
24
|
+
],
|
|
25
|
+
"dictionaryDefinitions": [
|
|
26
|
+
//
|
|
27
|
+
{
|
|
28
|
+
"name": "project-words",
|
|
29
|
+
"path": "./.cspell/project-words.txt",
|
|
30
|
+
"addWords": true
|
|
31
|
+
}
|
|
32
|
+
],
|
|
33
|
+
"dictionaries": [
|
|
34
|
+
"project-words"
|
|
35
|
+
],
|
|
36
|
+
"files": [
|
|
37
|
+
"gulpfile.js",
|
|
38
|
+
"package.json",
|
|
39
|
+
"README.md",
|
|
40
|
+
"test.sh",
|
|
41
|
+
"src/**"
|
|
42
|
+
]
|
|
43
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/middleware/logger.ts"],"names":[],"mappings":"
|
|
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;AAEjB,wBAAgB,iBAAiB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAmB3D;AAED,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,MAAM,CAAC,EAAE,MAAM,SACb,OAAO,OAAO,QAAQ,QAAQ,YAAY,UA4BpF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"middleware-logger.d.ts","sourceRoot":"","sources":["../../src/test/middleware-logger.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,CAAC"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
1
|
+
import "mocha";
|
|
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":"AAAA,OAAO,OAAO,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.aug.d.ts","sourceRoot":"","sources":["../../src/types/express.aug.ts"],"names":[],"mappings":"AACA,OAAO,EAAG,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;IAEb,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"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import { defineConfig } from "eslint/config";
|
|
2
|
+
import standard from "eslint-plugin-standard";
|
|
3
|
+
import security from "eslint-plugin-security";
|
|
4
|
+
import typescriptEslint from "@typescript-eslint/eslint-plugin";
|
|
5
|
+
import globals from "globals";
|
|
6
|
+
import tsParser from "@typescript-eslint/parser";
|
|
7
|
+
import path from "node:path";
|
|
8
|
+
import { fileURLToPath } from "node:url";
|
|
9
|
+
import js from "@eslint/js";
|
|
10
|
+
import { FlatCompat } from "@eslint/eslintrc";
|
|
11
|
+
|
|
12
|
+
const __filename = fileURLToPath(import.meta.url);
|
|
13
|
+
const __dirname = path.dirname(__filename);
|
|
14
|
+
const compat = new FlatCompat({
|
|
15
|
+
baseDirectory: __dirname,
|
|
16
|
+
recommendedConfig: js.configs.recommended,
|
|
17
|
+
allConfig: js.configs.all
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
export default defineConfig([{
|
|
21
|
+
extends: compat.extends(
|
|
22
|
+
"eslint:recommended",
|
|
23
|
+
"plugin:@typescript-eslint/recommended",
|
|
24
|
+
"plugin:@typescript-eslint/recommended-requiring-type-checking",
|
|
25
|
+
),
|
|
26
|
+
|
|
27
|
+
plugins: {
|
|
28
|
+
standard,
|
|
29
|
+
security,
|
|
30
|
+
"@typescript-eslint": typescriptEslint,
|
|
31
|
+
},
|
|
32
|
+
|
|
33
|
+
languageOptions: {
|
|
34
|
+
globals: {
|
|
35
|
+
...globals.node,
|
|
36
|
+
...globals.mocha,
|
|
37
|
+
},
|
|
38
|
+
|
|
39
|
+
parser: tsParser,
|
|
40
|
+
ecmaVersion: 5,
|
|
41
|
+
sourceType: "commonjs",
|
|
42
|
+
|
|
43
|
+
parserOptions: {
|
|
44
|
+
project: "./src/tsconfig.json",
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
|
|
48
|
+
rules: {
|
|
49
|
+
quotes: [2, "double"],
|
|
50
|
+
semi: [2, "always"],
|
|
51
|
+
"space-before-function-paren": [0],
|
|
52
|
+
"@typescript-eslint/explicit-module-boundary-types": 0,
|
|
53
|
+
"@typescript-eslint/no-empty-interface": 0,
|
|
54
|
+
"@typescript-eslint/require-await": 0,
|
|
55
|
+
"@typescript-eslint/restrict-template-expressions": 0,
|
|
56
|
+
|
|
57
|
+
"@typescript-eslint/no-misused-promises": ["error", {
|
|
58
|
+
checksVoidReturn: false,
|
|
59
|
+
}],
|
|
60
|
+
},
|
|
61
|
+
}]);
|
package/gulpfile.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
const gulp = require("gulp");
|
|
2
|
-
const
|
|
3
|
-
const
|
|
4
|
-
const del = require("del");
|
|
5
|
-
const copy = require("gulp-copy");
|
|
2
|
+
const exec = require("gulp-execa");
|
|
3
|
+
const { deleteAsync } = require("del");
|
|
6
4
|
|
|
7
5
|
gulp.task("clean", function() {
|
|
8
|
-
return
|
|
6
|
+
return deleteAsync(["build/**", "!build",], {
|
|
9
7
|
force: true
|
|
10
8
|
});
|
|
11
9
|
});
|
|
@@ -13,27 +11,13 @@ gulp.task("clean", function() {
|
|
|
13
11
|
gulp.task("ts",
|
|
14
12
|
gulp.series(
|
|
15
13
|
"clean",
|
|
16
|
-
|
|
14
|
+
exec.task("tsc -p src")
|
|
17
15
|
));
|
|
18
16
|
|
|
19
|
-
gulp.task("
|
|
20
|
-
gulp.task("lint", gulp.series("tslint"));
|
|
17
|
+
gulp.task("lint", exec.task("eslint src"));
|
|
21
18
|
|
|
22
|
-
gulp.task("test",
|
|
23
|
-
const tests = [
|
|
24
|
-
"build/test/**/*.js"
|
|
25
|
-
];
|
|
26
|
-
const srcOpts = {
|
|
27
|
-
read: false
|
|
28
|
-
};
|
|
29
|
-
return gulp.src(tests, srcOpts)
|
|
30
|
-
.pipe(mocha({
|
|
31
|
-
reporter: "list"
|
|
32
|
-
}));
|
|
33
|
-
}));
|
|
19
|
+
gulp.task("test", exec.task("mocha -r ts-node/register --reporter list --extension js,ts --recursive build/test"));
|
|
34
20
|
|
|
35
21
|
gulp.task("build", gulp.series("ts"));
|
|
36
22
|
|
|
37
|
-
gulp.task("
|
|
38
|
-
|
|
39
|
-
gulp.task("default", gulp.series("test"));
|
|
23
|
+
gulp.task("default", gulp.series("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.2",
|
|
4
4
|
"description": "Tablet Command Logging Configuration",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"build": "gulp ts",
|
|
@@ -17,41 +17,40 @@
|
|
|
17
17
|
"types": "definitions/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"datadog-winston": "^1.6.0",
|
|
20
|
-
"debug": "^4.
|
|
20
|
+
"debug": "^4.4.0",
|
|
21
21
|
"express-statsd": "^0.3.0",
|
|
22
22
|
"lodash": "^4.17.21",
|
|
23
23
|
"winston": "^3.17.0",
|
|
24
24
|
"winston-daily-rotate-file": "^5.0.0"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@
|
|
27
|
+
"@eslint/eslintrc": "^3.3.1",
|
|
28
|
+
"@eslint/js": "^9.24.0",
|
|
29
|
+
"@types/chai": "^5.2.1",
|
|
28
30
|
"@types/datadog-winston": "^1.0.7",
|
|
29
31
|
"@types/debug": "4.1.12",
|
|
30
32
|
"@types/express": "^4.17.21",
|
|
31
33
|
"@types/express-serve-static-core": "^4.19.6",
|
|
32
|
-
"@types/
|
|
33
|
-
"@types/lodash": "^4.17.0",
|
|
34
|
+
"@types/lodash": "^4.17.16",
|
|
34
35
|
"@types/mocha": "^10.0.10",
|
|
35
|
-
"@types/node": "^22.
|
|
36
|
-
"@typescript-eslint/eslint-plugin": "^
|
|
37
|
-
"@typescript-eslint/parser": "^
|
|
38
|
-
"chai": "^
|
|
39
|
-
"
|
|
40
|
-
"
|
|
41
|
-
"eslint
|
|
36
|
+
"@types/node": "^22.14.1",
|
|
37
|
+
"@typescript-eslint/eslint-plugin": "^8.29.1",
|
|
38
|
+
"@typescript-eslint/parser": "^8.29.1",
|
|
39
|
+
"chai": "^5.2.0",
|
|
40
|
+
"cspell": "^8.18.1",
|
|
41
|
+
"del": "^8.0.0",
|
|
42
|
+
"eslint": "^9.24.0",
|
|
42
43
|
"eslint-plugin-import": "^2.31.0",
|
|
43
|
-
"eslint-plugin-mocha-only": "0.0.3",
|
|
44
44
|
"eslint-plugin-node": "^11.1.0",
|
|
45
|
-
"eslint-plugin-promise": "^
|
|
46
|
-
"eslint-plugin-security": "^
|
|
47
|
-
"eslint-plugin-standard": "^
|
|
48
|
-
"
|
|
49
|
-
"gulp
|
|
50
|
-
"gulp-
|
|
51
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"mocha": "^10.8.2",
|
|
45
|
+
"eslint-plugin-promise": "^7.2.1",
|
|
46
|
+
"eslint-plugin-security": "^3.0.1",
|
|
47
|
+
"eslint-plugin-standard": "^5.0.0",
|
|
48
|
+
"globals": "^16.0.0",
|
|
49
|
+
"gulp": "^5.0.0",
|
|
50
|
+
"gulp-execa": "^8.0.1",
|
|
51
|
+
"mocha": "^11.2.2",
|
|
52
|
+
"ts-node": "^10.9.2",
|
|
53
|
+
"type-coverage": "^2.29.7",
|
|
55
54
|
"typescript": "~4.9.5"
|
|
56
55
|
}
|
|
57
|
-
}
|
|
56
|
+
}
|
package/src/middleware/logger.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import _ from "lodash";
|
|
1
2
|
import { Logger } from "winston";
|
|
2
3
|
import {
|
|
3
4
|
NextFunction,
|
|
@@ -10,6 +11,19 @@ export function redactOriginalURL(maybeURL?: string): string {
|
|
|
10
11
|
return "";
|
|
11
12
|
}
|
|
12
13
|
|
|
14
|
+
try {
|
|
15
|
+
// Attempt to keep first 7 chars of the api key
|
|
16
|
+
const href = new URL(maybeURL);
|
|
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
|
+
//
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
// Fallback
|
|
13
27
|
return maybeURL.replace(/apikey=.*?(&|$)/, "apikey=xxx&");
|
|
14
28
|
}
|
|
15
29
|
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import "mocha";
|
|
2
|
+
import { assert } from "chai";
|
|
3
|
+
import { redactOriginalURL } from "../middleware/logger";
|
|
4
|
+
|
|
5
|
+
describe("Logger Middleware", function() {
|
|
6
|
+
context("Redact Original URL", () => {
|
|
7
|
+
const url = "http://local:3442/incident?";
|
|
8
|
+
it("apikey is last", function() {
|
|
9
|
+
const prevApiKey = "apikey=abcdef1234567";
|
|
10
|
+
const expApiKey = "apikey=abcdef1";
|
|
11
|
+
const redacted = redactOriginalURL(url + prevApiKey);
|
|
12
|
+
assert.equal(redacted, url + expApiKey);
|
|
13
|
+
});
|
|
14
|
+
|
|
15
|
+
it("apikey is middle of url", function() {
|
|
16
|
+
const prevApiKey = "apikey=abcdef1234567&k=1";
|
|
17
|
+
const expApiKey = "apikey=abcdef1&k=1";
|
|
18
|
+
const redacted = redactOriginalURL(url + prevApiKey);
|
|
19
|
+
assert.equal(redacted, url + expApiKey);
|
|
20
|
+
});
|
|
21
|
+
|
|
22
|
+
it("apikey is short", function() {
|
|
23
|
+
const prevApiKey = "apikey=1&";
|
|
24
|
+
const expApiKey = "apikey=1";
|
|
25
|
+
const redacted = redactOriginalURL(url + prevApiKey);
|
|
26
|
+
assert.equal(redacted, url + expApiKey);
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
});
|
package/src/types/express.aug.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// https://stackoverflow.com/questions/57132428/augmentations-for-the-global-scope-can-only-be-directly-nested-in-external-modul
|
|
2
2
|
export { };
|
|
3
3
|
|
|
4
|
-
/* eslint-disable @typescript-eslint/no-unused-vars */
|
|
5
4
|
declare global {
|
|
6
5
|
// eslint-disable-next-line @typescript-eslint/no-namespace
|
|
7
6
|
namespace Express {
|
package/test.sh
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
#!/bin/bash
|
|
2
|
+
|
|
3
|
+
set -e
|
|
4
|
+
|
|
5
|
+
if [ -f ~/.bash_profile ]; then
|
|
6
|
+
source ~/.bash_profile
|
|
7
|
+
fi
|
|
8
|
+
|
|
9
|
+
if [ -f ~/.profile ]; then
|
|
10
|
+
source ~/.profile
|
|
11
|
+
fi
|
|
12
|
+
|
|
13
|
+
# MacOS
|
|
14
|
+
if hash brew 2>/dev/null; then
|
|
15
|
+
if [ -f $(brew --prefix nvm)/nvm.sh ]; then
|
|
16
|
+
source $(brew --prefix nvm)/nvm.sh
|
|
17
|
+
fi
|
|
18
|
+
fi
|
|
19
|
+
|
|
20
|
+
NODE_VERSION="v22.13.0"
|
|
21
|
+
|
|
22
|
+
nvm use $NODE_VERSION || nvm install $NODE_VERSION
|
|
23
|
+
|
|
24
|
+
npm install
|
|
25
|
+
echo "--- spelling"
|
|
26
|
+
npx cspell
|
|
27
|
+
echo "--- type coverage"
|
|
28
|
+
npx type-coverage --detail
|
|
29
|
+
echo "--- lint"
|
|
30
|
+
npm run lint
|
|
31
|
+
echo "--- test"
|
|
32
|
+
npm test
|
package/.eslintrc.js
DELETED
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
module.exports = {
|
|
2
|
-
env: {
|
|
3
|
-
node: true,
|
|
4
|
-
mocha: true
|
|
5
|
-
},
|
|
6
|
-
extends: [
|
|
7
|
-
"eslint:recommended",
|
|
8
|
-
"plugin:@typescript-eslint/recommended",
|
|
9
|
-
"plugin:@typescript-eslint/recommended-requiring-type-checking"
|
|
10
|
-
],
|
|
11
|
-
plugins: [
|
|
12
|
-
"standard",
|
|
13
|
-
"security",
|
|
14
|
-
"@typescript-eslint"
|
|
15
|
-
],
|
|
16
|
-
parser: "@typescript-eslint/parser",
|
|
17
|
-
parserOptions: {
|
|
18
|
-
project: "./src/tsconfig.json",
|
|
19
|
-
tsconfigRootDir: __dirname,
|
|
20
|
-
},
|
|
21
|
-
rules: {
|
|
22
|
-
quotes: [2, "double"],
|
|
23
|
-
semi: [2, "always"],
|
|
24
|
-
"space-before-function-paren": [0],
|
|
25
|
-
"@typescript-eslint/explicit-module-boundary-types": 0,
|
|
26
|
-
"@typescript-eslint/no-empty-interface": 0,
|
|
27
|
-
"@typescript-eslint/require-await": 0,
|
|
28
|
-
"@typescript-eslint/restrict-template-expressions": 0,
|
|
29
|
-
"@typescript-eslint/no-misused-promises": [
|
|
30
|
-
"error",
|
|
31
|
-
{
|
|
32
|
-
"checksVoidReturn": false
|
|
33
|
-
}
|
|
34
|
-
]
|
|
35
|
-
}
|
|
36
|
-
};
|