@hmcts/rpx-xui-node-lib 2.30.7-new-csp-7 → 2.30.7-new-csp-8
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":"csp.d.ts","sourceRoot":"","sources":["../../../src/common/util/csp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"csp.d.ts","sourceRoot":"","sources":["../../../src/common/util/csp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAK1D,wBAAgB,GAAG,CAAC,EAClB,WAA+E,EAC/E,UAA+E,EAC/E,YAA+E,EAC/E,SAA+E,EAC/E,QAA+E,EAC/E,UAAe,EAChB;;;;;;;CAAK,IACI,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UA+BxD"}
|
package/dist/common/util/csp.js
CHANGED
|
@@ -6,11 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.csp = csp;
|
|
7
7
|
const helmet_1 = __importDefault(require("helmet"));
|
|
8
8
|
const node_crypto_1 = __importDefault(require("node:crypto"));
|
|
9
|
+
const deepmerge_1 = __importDefault(require("deepmerge")); // <-- deep merge helper
|
|
9
10
|
function csp(_a) {
|
|
10
11
|
var _b, _c, _d, _e, _f;
|
|
11
|
-
var { extraScript = ((_b = process.env.CSP_SCRIPT_EXTRA) !== null && _b !== void 0 ? _b : '').split(',').filter(Boolean), extraStyle = ((_c = process.env.CSP_STYLE_EXTRA) !== null && _c !== void 0 ? _c : '').split(',').filter(Boolean), extraConnect = ((_d = process.env.CSP_CONNECT_EXTRA) !== null && _d !== void 0 ? _d : '').split(',').filter(Boolean), extraFont = ((_e = process.env.CSP_FONT_EXTRA) !== null && _e !== void 0 ? _e : '').split(',').filter(Boolean), extraImg = ((_f = process.env.CSP_IMG_EXTRA) !== null && _f !== void 0 ? _f : '').split(',').filter(Boolean),
|
|
12
|
-
// old csp to merge with
|
|
13
|
-
defaultCsp = {} } = _a === void 0 ? {} : _a;
|
|
12
|
+
var { extraScript = ((_b = process.env.CSP_SCRIPT_EXTRA) !== null && _b !== void 0 ? _b : '').split(',').filter(Boolean), extraStyle = ((_c = process.env.CSP_STYLE_EXTRA) !== null && _c !== void 0 ? _c : '').split(',').filter(Boolean), extraConnect = ((_d = process.env.CSP_CONNECT_EXTRA) !== null && _d !== void 0 ? _d : '').split(',').filter(Boolean), extraFont = ((_e = process.env.CSP_FONT_EXTRA) !== null && _e !== void 0 ? _e : '').split(',').filter(Boolean), extraImg = ((_f = process.env.CSP_IMG_EXTRA) !== null && _f !== void 0 ? _f : '').split(',').filter(Boolean), defaultCsp = {} } = _a === void 0 ? {} : _a;
|
|
14
13
|
return (req, res, next) => {
|
|
15
14
|
const nonce = node_crypto_1.default.randomBytes(16).toString('base64');
|
|
16
15
|
res.locals.cspNonce = nonce;
|
|
@@ -20,7 +19,8 @@ function csp(_a) {
|
|
|
20
19
|
"default-src": ["'self'"],
|
|
21
20
|
"script-src": ["'self'", `'nonce-${nonce}'`, ...extraScript],
|
|
22
21
|
"style-src": ["'self'", `'nonce-${nonce}'`, ...extraStyle],
|
|
23
|
-
|
|
22
|
+
/* allow inline style *attributes* (e.g. GOV-UK warning text) */
|
|
23
|
+
styleSrcAttr: ["'unsafe-inline'"],
|
|
24
24
|
"connect-src": ["'self'", "blob:", "data:", ...extraConnect],
|
|
25
25
|
"img-src": ["'self'", "data:", ...extraImg],
|
|
26
26
|
"font-src": ["'self'", "data:", "https://fonts.gstatic.com", ...extraFont],
|
|
@@ -29,12 +29,12 @@ function csp(_a) {
|
|
|
29
29
|
"frame-ancestors": ["'self'"],
|
|
30
30
|
"form-action": ["'none'"]
|
|
31
31
|
},
|
|
32
|
-
|
|
33
|
-
//
|
|
32
|
+
/** switch header to report-only mode if the env-var is set */
|
|
33
|
+
// CSP will not break application in report-only mode, but will log violations
|
|
34
34
|
reportOnly: process.env.CSP_REPORT_ONLY === 'true'
|
|
35
35
|
};
|
|
36
|
-
const
|
|
37
|
-
helmet_1.default.contentSecurityPolicy(
|
|
36
|
+
const finalCsp = (0, deepmerge_1.default)(defaultCsp, newCsp);
|
|
37
|
+
helmet_1.default.contentSecurityPolicy(finalCsp)(req, res, next);
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=csp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../src/common/util/csp.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../src/common/util/csp.ts"],"names":[],"mappings":";;;;;AAKA,kBAuCC;AA3CD,oDAA4B;AAC5B,8DAAiC;AACjC,0DAA8B,CAAqB,wBAAwB;AAE3E,SAAgB,GAAG,CAAC,EAOd;;QAPc,EAClB,WAAW,GAAI,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,mCAAK,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/E,UAAU,GAAK,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,eAAe,mCAAM,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/E,YAAY,GAAG,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,iBAAiB,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/E,SAAS,GAAM,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,cAAc,mCAAO,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/E,QAAQ,GAAO,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,mCAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/E,UAAU,GAAG,EAAE,EAChB,mBAAG,EAAE;IACJ,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,qBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxD,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QAE5B,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE;gBACV,aAAa,EAAE,CAAC,QAAQ,CAAC;gBACzB,YAAY,EAAG,CAAC,QAAQ,EAAE,UAAU,KAAK,GAAG,EAAE,GAAG,WAAW,CAAC;gBAC7D,WAAW,EAAI,CAAC,QAAQ,EAAE,UAAU,KAAK,GAAG,EAAE,GAAG,UAAU,CAAC;gBAE5D,gEAAgE;gBAChE,YAAY,EAAG,CAAC,iBAAiB,CAAC;gBAElC,aAAa,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;gBAC5D,SAAS,EAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;gBAC/C,UAAU,EAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,2BAA2B,EAAE,GAAG,SAAS,CAAC;gBAE7E,YAAY,EAAG,CAAC,QAAQ,CAAC;gBACzB,WAAW,EAAI,CAAC,QAAQ,CAAC;gBACzB,iBAAiB,EAAE,CAAC,QAAQ,CAAC;gBAC7B,aAAa,EAAE,CAAC,QAAQ,CAAC;aAC1B;YACD,8DAA8D;YAC9D,8EAA8E;YAC9E,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM;SACnD,CAAC;QAEF,MAAM,QAAQ,GAAG,IAAA,mBAAK,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC3C,gBAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC"}
|