@axinom/mosaic-service-common 0.10.0 → 0.11.0-rc.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mask-middleware.d.ts","sourceRoot":"","sources":["../../../src/common/logging/mask-middleware.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,oBAAY,QAAQ;IAClB;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,kBAAkB,qCAAqC;IACvD;;OAEG;IACH,KAAK,wBAAwB;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED;;GAEG;AACH,oBAAY,cAAc,GAAG;AAC3B;;GAEG;AACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;AACrB;;GAEG;AACH,WAAW,CAAC,EAAE,WAAW,KACtB,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"mask-middleware.d.ts","sourceRoot":"","sources":["../../../src/common/logging/mask-middleware.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,oBAAY,QAAQ;IAClB;;OAEG;IACH,cAAc,mBAAmB;IACjC;;OAEG;IACH,kBAAkB,qCAAqC;IACvD;;OAEG;IACH,KAAK,wBAAwB;CAC9B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;CAC5B;AAED;;GAEG;AACH,oBAAY,cAAc,GAAG;AAC3B;;GAEG;AACH,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI;AACrB;;GAEG;AACH,WAAW,CAAC,EAAE,WAAW,KACtB,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;AAK/B;;;;;;;;GAQG;AACH,eAAO,MAAM,mBAAmB,0JACyH,CAAC;AAE1J;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,UAAiC,CAAC;AAevE;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,EAAE,cA2EnC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,UAAU,WACb,GAAG,kBACK,cAAc,4CAE7B,GAAG,GAAG,IAAI,GAAG,SA6Ef,CAAC"}
|
|
@@ -26,6 +26,7 @@ var MaskMode;
|
|
|
26
26
|
MaskMode["DEBUG"] = "UNSAFE_DEBUG_UNSAFE";
|
|
27
27
|
})(MaskMode = exports.MaskMode || (exports.MaskMode = {}));
|
|
28
28
|
const mask = '******';
|
|
29
|
+
const jwtSignatureMask = '***MASKED_JWT_SIGNATURE***';
|
|
29
30
|
/**
|
|
30
31
|
* A set of keywords that can be used to mask secret data in log files. Information about some of them:
|
|
31
32
|
*- `AccountKey` - Azure connection string
|
|
@@ -77,7 +78,24 @@ const defaultMaskMiddleware = (value, maskOptions) => {
|
|
|
77
78
|
// Token is separated by dots, 1-st and 2-nd part are encoded using Base64URL encoding, while 3-d part is also Base64URL encoded, but with - and _ characters.
|
|
78
79
|
// Approximate minimum length of parts is calculated as 36, 100, 40. In reality it will be more, but this is enough to cover most cases.
|
|
79
80
|
// This masking is here as a substitute of `token` keyword, so we do it even if string contains no configured keywords.
|
|
80
|
-
let maskedValue = value.replace(/([A-Za-z0-9]{36,})\.([A-Za-z0-9]{100,})\.([A-Za-z0-9-_]{40,})/gi, '$
|
|
81
|
+
let maskedValue = value.replace(/([A-Za-z0-9]{36,})\.([A-Za-z0-9]{100,})\.([A-Za-z0-9-_]{40,})/gi, `$1.'$2'.${jwtSignatureMask}`);
|
|
82
|
+
// In addition to masking the signature, we also decode the payload, mask it, encode it back to base64url string and replace the original payload part
|
|
83
|
+
if (maskedValue.includes(jwtSignatureMask)) {
|
|
84
|
+
try {
|
|
85
|
+
const parts = maskedValue.split('.');
|
|
86
|
+
const payloadIndex = parts.findIndex((part) => part.includes(jwtSignatureMask)) - 1;
|
|
87
|
+
const decodedPayload = JSON.parse(Buffer.from(parts[payloadIndex], 'base64').toString('ascii'));
|
|
88
|
+
const maskedPayload = exports.maskObject(decodedPayload, exports.defaultMaskMiddleware, maskOptions);
|
|
89
|
+
parts[payloadIndex] = Buffer.from(JSON.stringify(maskedPayload))
|
|
90
|
+
.toString('base64')
|
|
91
|
+
.replace(/=+$/, '');
|
|
92
|
+
maskedValue = parts.join('.');
|
|
93
|
+
}
|
|
94
|
+
catch (_a) {
|
|
95
|
+
// If value is not a valid JWT - exception is thrown during parsing, so we consider it a regular string
|
|
96
|
+
maskedValue = value;
|
|
97
|
+
}
|
|
98
|
+
}
|
|
81
99
|
if (!(maskOptions === null || maskOptions === void 0 ? void 0 : maskOptions.keywords) ||
|
|
82
100
|
maskOptions.keywords.length === 0 ||
|
|
83
101
|
maskOptions.keywords.every((key) => !value.toLocaleLowerCase().includes(key.toLocaleLowerCase()))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mask-middleware.js","sourceRoot":"","sources":["../../../src/common/logging/mask-middleware.ts"],"names":[],"mappings":";;;AAAA,sEAAsE;AACtE,uDAAuD;AACvD,wCAA+D;AAG/D;;;;;GAKG;AACH,IAAY,QAaX;AAbD,WAAY,QAAQ;IAClB;;OAEG;IACH,6CAAiC,CAAA;IACjC;;OAEG;IACH,mEAAuD,CAAA;IACvD;;OAEG;IACH,yCAA6B,CAAA;AAC/B,CAAC,EAbW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAanB;AA8BD,MAAM,IAAI,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"mask-middleware.js","sourceRoot":"","sources":["../../../src/common/logging/mask-middleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-service-common",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0-rc.2",
|
|
4
4
|
"description": "Common helpers and PostgreSQL-related functionality",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -62,5 +62,5 @@
|
|
|
62
62
|
"publishConfig": {
|
|
63
63
|
"access": "public"
|
|
64
64
|
},
|
|
65
|
-
"gitHead": "
|
|
65
|
+
"gitHead": "e05baab26ad39306f4b06d4e219db0a98a26a5e4"
|
|
66
66
|
}
|