@dwp/govuk-casa 9.4.0 → 9.4.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/dist/assets/css/casa.css +1 -1
- package/dist/assets/css/casa.css.map +1 -1
- package/dist/casa.js +17 -7
- package/dist/casa.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/configure.d.ts +6 -1
- package/dist/core-plugins/edit-snapshot/src/configure.js +8 -0
- package/dist/core-plugins/edit-snapshot/src/configure.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/post-steer-hook.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/pre-steer-hook.js.map +1 -1
- package/dist/core-plugins/edit-snapshot/src/utils.js +4 -2
- package/dist/core-plugins/edit-snapshot/src/utils.js.map +1 -1
- package/dist/lib/CasaTemplateLoader.js +0 -1
- package/dist/lib/CasaTemplateLoader.js.map +1 -1
- package/dist/lib/JourneyContext.d.ts +10 -6
- package/dist/lib/JourneyContext.js +11 -9
- package/dist/lib/JourneyContext.js.map +1 -1
- package/dist/lib/MutableRouter.d.ts +1 -1
- package/dist/lib/MutableRouter.js +0 -1
- package/dist/lib/MutableRouter.js.map +1 -1
- package/dist/lib/Plan.d.ts +3 -3
- package/dist/lib/ValidationError.d.ts +1 -1
- package/dist/lib/ValidationError.js +1 -1
- package/dist/lib/ValidatorFactory.js +0 -3
- package/dist/lib/ValidatorFactory.js.map +1 -1
- package/dist/lib/configuration-ingestor.d.ts +74 -14
- package/dist/lib/configuration-ingestor.js +115 -26
- package/dist/lib/configuration-ingestor.js.map +1 -1
- package/dist/lib/configure.js.map +1 -1
- package/dist/lib/context-id-generators.js +1 -1
- package/dist/lib/context-id-generators.js.map +1 -1
- package/dist/lib/field.d.ts +8 -8
- package/dist/lib/field.js +6 -10
- package/dist/lib/field.js.map +1 -1
- package/dist/lib/index.js +17 -7
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/nunjucks-filters.d.ts +5 -1
- package/dist/lib/nunjucks-filters.js +13 -1
- package/dist/lib/nunjucks-filters.js.map +1 -1
- package/dist/lib/utils.js +8 -5
- package/dist/lib/utils.js.map +1 -1
- package/dist/lib/validators/dateObject.d.ts +2 -1
- package/dist/lib/validators/dateObject.js +0 -2
- package/dist/lib/validators/dateObject.js.map +1 -1
- package/dist/lib/validators/email.js +1 -2
- package/dist/lib/validators/email.js.map +1 -1
- package/dist/lib/validators/inArray.js +0 -1
- package/dist/lib/validators/inArray.js.map +1 -1
- package/dist/lib/validators/nino.js +0 -1
- package/dist/lib/validators/nino.js.map +1 -1
- package/dist/lib/validators/postalAddressObject.js +5 -5
- package/dist/lib/validators/postalAddressObject.js.map +1 -1
- package/dist/lib/validators/range.js +0 -1
- package/dist/lib/validators/range.js.map +1 -1
- package/dist/lib/validators/regex.js +0 -1
- package/dist/lib/validators/regex.js.map +1 -1
- package/dist/lib/validators/required.js +0 -1
- package/dist/lib/validators/required.js.map +1 -1
- package/dist/lib/validators/strlen.js +0 -1
- package/dist/lib/validators/strlen.js.map +1 -1
- package/dist/lib/validators/wordCount.js +0 -1
- package/dist/lib/validators/wordCount.js.map +1 -1
- package/dist/lib/waypoint-url.d.ts +4 -5
- package/dist/lib/waypoint-url.js +4 -5
- package/dist/lib/waypoint-url.js.map +1 -1
- package/dist/middleware/body-parser.d.ts +26 -4
- package/dist/middleware/body-parser.js +31 -0
- package/dist/middleware/body-parser.js.map +1 -1
- package/dist/middleware/csrf.d.ts +15 -1
- package/dist/middleware/csrf.js +13 -3
- package/dist/middleware/csrf.js.map +1 -1
- package/dist/middleware/data.d.ts +21 -4
- package/dist/middleware/data.js +33 -4
- package/dist/middleware/data.js.map +1 -1
- package/dist/middleware/gather-fields.js +1 -1
- package/dist/middleware/i18n.d.ts +11 -2
- package/dist/middleware/i18n.js +14 -3
- package/dist/middleware/i18n.js.map +1 -1
- package/dist/middleware/post.d.ts +3 -1
- package/dist/middleware/post.js +5 -0
- package/dist/middleware/post.js.map +1 -1
- package/dist/middleware/session.d.ts +27 -8
- package/dist/middleware/session.js +39 -12
- package/dist/middleware/session.js.map +1 -1
- package/dist/routes/journey.js +2 -3
- package/dist/routes/journey.js.map +1 -1
- package/package.json +31 -33
- package/src/core-plugins/edit-snapshot/src/configure.js +19 -7
- package/src/core-plugins/edit-snapshot/src/post-steer-hook.js +3 -1
- package/src/core-plugins/edit-snapshot/src/pre-steer-hook.js +14 -4
- package/src/core-plugins/edit-snapshot/src/utils.js +19 -7
- package/src/lib/CasaTemplateLoader.js +0 -1
- package/src/lib/JourneyContext.js +16 -11
- package/src/lib/MutableRouter.js +0 -1
- package/src/lib/ValidationError.js +1 -1
- package/src/lib/ValidatorFactory.js +0 -3
- package/src/lib/configuration-ingestor.js +111 -19
- package/src/lib/configure.js +2 -2
- package/src/lib/context-id-generators.js +1 -1
- package/src/lib/field.js +7 -10
- package/src/lib/nunjucks-filters.js +15 -1
- package/src/lib/utils.js +9 -5
- package/src/lib/validators/dateObject.js +1 -2
- package/src/lib/validators/email.js +1 -2
- package/src/lib/validators/inArray.js +0 -1
- package/src/lib/validators/nino.js +0 -1
- package/src/lib/validators/postalAddressObject.js +5 -5
- package/src/lib/validators/range.js +0 -2
- package/src/lib/validators/regex.js +0 -1
- package/src/lib/validators/required.js +0 -1
- package/src/lib/validators/strlen.js +0 -1
- package/src/lib/validators/wordCount.js +0 -1
- package/src/lib/waypoint-url.js +4 -5
- package/src/middleware/body-parser.js +34 -0
- package/src/middleware/csrf.js +13 -3
- package/src/middleware/data.js +37 -5
- package/src/middleware/gather-fields.js +1 -1
- package/src/middleware/i18n.js +15 -3
- package/src/middleware/post.js +6 -0
- package/src/middleware/session.js +24 -5
- package/src/routes/journey.js +6 -4
- package/src/core-plugins/edit-snapshot/readme.md +0 -19
- package/src/core-plugins/readme.md +0 -3
|
@@ -1,4 +1,13 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Internationalisation middleware.
|
|
3
|
+
*
|
|
4
|
+
* @param {object} opts Options
|
|
5
|
+
* @param {string[]} [opts.languages] Language codes
|
|
6
|
+
* @param {string[]} [opts.directories] Source translations directories
|
|
7
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
8
|
+
*/
|
|
1
9
|
export default function i18nMiddleware({ languages, directories, }: {
|
|
2
10
|
languages?: string[] | undefined;
|
|
3
|
-
directories?:
|
|
4
|
-
}):
|
|
11
|
+
directories?: string[] | undefined;
|
|
12
|
+
}): RequestHandler[];
|
|
13
|
+
export type RequestHandler = import("express").RequestHandler;
|
package/dist/middleware/i18n.js
CHANGED
|
@@ -9,8 +9,12 @@ const i18next_http_middleware_1 = require("i18next-http-middleware");
|
|
|
9
9
|
const node_path_1 = require("node:path");
|
|
10
10
|
const node_fs_1 = require("node:fs");
|
|
11
11
|
const deepmerge_1 = __importDefault(require("deepmerge"));
|
|
12
|
-
const js_yaml_1 =
|
|
12
|
+
const js_yaml_1 = require("js-yaml");
|
|
13
13
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
14
|
+
/**
|
|
15
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
16
|
+
* @access private
|
|
17
|
+
*/
|
|
14
18
|
const log = (0, logger_js_1.default)("middleware:i18n");
|
|
15
19
|
const loadJson = (file) => {
|
|
16
20
|
// Strip out newlines (this is a legacy feature which we're keeping for
|
|
@@ -20,7 +24,7 @@ const loadJson = (file) => {
|
|
|
20
24
|
return JSON.parse(json.replace(/[\r\n]/g, ""));
|
|
21
25
|
};
|
|
22
26
|
/* eslint-disable-next-line security/detect-non-literal-fs-filename */
|
|
23
|
-
const loadYaml = (file) => js_yaml_1.
|
|
27
|
+
const loadYaml = (file) => (0, js_yaml_1.load)((0, node_fs_1.readFileSync)(file, "utf8"));
|
|
24
28
|
const extract = (file) => {
|
|
25
29
|
const ext = /.yaml$/i.test(file) ? ".yaml" : ".json";
|
|
26
30
|
const data = ext === ".yaml" ? loadYaml(file) : loadJson(file);
|
|
@@ -56,6 +60,14 @@ const loadResources = (languages, directories) => {
|
|
|
56
60
|
}
|
|
57
61
|
return store;
|
|
58
62
|
};
|
|
63
|
+
/**
|
|
64
|
+
* Internationalisation middleware.
|
|
65
|
+
*
|
|
66
|
+
* @param {object} opts Options
|
|
67
|
+
* @param {string[]} [opts.languages] Language codes
|
|
68
|
+
* @param {string[]} [opts.directories] Source translations directories
|
|
69
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
70
|
+
*/
|
|
59
71
|
function i18nMiddleware({ languages = ["en", "cy"], directories = [], }) {
|
|
60
72
|
// Load _all_ translations, from all directories into memory.
|
|
61
73
|
const resources = loadResources(languages, directories);
|
|
@@ -81,7 +93,6 @@ function i18nMiddleware({ languages = ["en", "cy"], directories = [], }) {
|
|
|
81
93
|
return [
|
|
82
94
|
(req, res, next) => {
|
|
83
95
|
if (!req.session.language) {
|
|
84
|
-
/* eslint-disable-next-line prefer-destructuring */
|
|
85
96
|
req.session.language = languages[0];
|
|
86
97
|
}
|
|
87
98
|
if (req?.query.lang && languages.includes(req.query.lang)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/middleware/i18n.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"i18n.js","sourceRoot":"","sources":["../../src/middleware/i18n.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1,3 @@
|
|
|
1
|
-
|
|
1
|
+
/** @returns {RequestHandler[]} Middleware functions */
|
|
2
|
+
export default function postMiddleware(): RequestHandler[];
|
|
3
|
+
export type RequestHandler = import("express").RequestHandler;
|
package/dist/middleware/post.js
CHANGED
|
@@ -6,7 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.default = postMiddleware;
|
|
7
7
|
// 2 middleware: one as a fallback 404 handler, one to handle thrown errors
|
|
8
8
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
9
|
+
/**
|
|
10
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
11
|
+
* @access private
|
|
12
|
+
*/
|
|
9
13
|
const log = (0, logger_js_1.default)("middleware:post");
|
|
14
|
+
/** @returns {RequestHandler[]} Middleware functions */
|
|
10
15
|
function postMiddleware() {
|
|
11
16
|
return [
|
|
12
17
|
(req, res) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"post.js","sourceRoot":"","sources":["../../src/middleware/post.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"post.js","sourceRoot":"","sources":["../../src/middleware/post.js"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,29 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Produces three middleware functions:
|
|
3
|
+
*
|
|
4
|
+
* - Set the session cookie
|
|
5
|
+
* - Parse request cookies
|
|
6
|
+
* - Handle expiry of server-side session
|
|
7
|
+
*
|
|
8
|
+
* @param {object} opts Options
|
|
9
|
+
* @param {RequestHandler} opts.cookieParserMiddleware Cookie parsing middleware
|
|
10
|
+
* @param {string} opts.secret Session encryption secret
|
|
11
|
+
* @param {string} opts.name Session cookie name
|
|
12
|
+
* @param {boolean} opts.secure Secure cookies only
|
|
13
|
+
* @param {number} opts.ttl Session data time-to-live
|
|
14
|
+
* @param {boolean | string} [opts.cookieSameSite] Cooke SameSite setting
|
|
15
|
+
* @param {string} [opts.cookiePath] Cookie path
|
|
16
|
+
* @param {object} [opts.store] Storage instance
|
|
17
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
18
|
+
*/
|
|
1
19
|
export default function sessionMiddleware({ cookieParserMiddleware, secret, name, secure, ttl, cookieSameSite, cookiePath, store, }: {
|
|
2
|
-
cookieParserMiddleware:
|
|
3
|
-
secret:
|
|
4
|
-
name:
|
|
5
|
-
secure:
|
|
6
|
-
ttl:
|
|
7
|
-
cookieSameSite?: boolean | undefined;
|
|
20
|
+
cookieParserMiddleware: RequestHandler;
|
|
21
|
+
secret: string;
|
|
22
|
+
name: string;
|
|
23
|
+
secure: boolean;
|
|
24
|
+
ttl: number;
|
|
25
|
+
cookieSameSite?: string | boolean | undefined;
|
|
8
26
|
cookiePath?: string | undefined;
|
|
9
|
-
store?:
|
|
10
|
-
}):
|
|
27
|
+
store?: object | undefined;
|
|
28
|
+
}): RequestHandler[];
|
|
29
|
+
export type RequestHandler = import("express").RequestHandler;
|
|
@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
15
15
|
}) : function(o, v) {
|
|
16
16
|
o["default"] = v;
|
|
17
17
|
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
};
|
|
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
|
+
})();
|
|
25
35
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
36
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
37
|
};
|
|
@@ -33,6 +43,10 @@ exports.default = sessionMiddleware;
|
|
|
33
43
|
const express_session_1 = __importStar(require("express-session"));
|
|
34
44
|
const logger_js_1 = __importDefault(require("../lib/logger.js"));
|
|
35
45
|
const utils_js_1 = require("../lib/utils.js");
|
|
46
|
+
/**
|
|
47
|
+
* @typedef {import("express").RequestHandler} RequestHandler
|
|
48
|
+
* @access private
|
|
49
|
+
*/
|
|
36
50
|
const log = (0, logger_js_1.default)("middleware:session");
|
|
37
51
|
const sessionExpiryMiddleware = (ttl, getCookie, touchCookie, removeCookie) => (req, res, next) => {
|
|
38
52
|
const lastModified = getCookie(req);
|
|
@@ -74,7 +88,6 @@ const sessionExpiryMiddleware = (ttl, getCookie, touchCookie, removeCookie) => (
|
|
|
74
88
|
referrer: req.originalUrl,
|
|
75
89
|
lang: language,
|
|
76
90
|
});
|
|
77
|
-
/* eslint-disable-next-line prefer-template */
|
|
78
91
|
res.redirect(302, (0, utils_js_1.validateUrlPath)(`${req.baseUrl}/session-timeout`) +
|
|
79
92
|
`?${params.toString()}`);
|
|
80
93
|
}
|
|
@@ -86,10 +99,24 @@ const sessionExpiryMiddleware = (ttl, getCookie, touchCookie, removeCookie) => (
|
|
|
86
99
|
next();
|
|
87
100
|
}
|
|
88
101
|
};
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
102
|
+
/**
|
|
103
|
+
* Produces three middleware functions:
|
|
104
|
+
*
|
|
105
|
+
* - Set the session cookie
|
|
106
|
+
* - Parse request cookies
|
|
107
|
+
* - Handle expiry of server-side session
|
|
108
|
+
*
|
|
109
|
+
* @param {object} opts Options
|
|
110
|
+
* @param {RequestHandler} opts.cookieParserMiddleware Cookie parsing middleware
|
|
111
|
+
* @param {string} opts.secret Session encryption secret
|
|
112
|
+
* @param {string} opts.name Session cookie name
|
|
113
|
+
* @param {boolean} opts.secure Secure cookies only
|
|
114
|
+
* @param {number} opts.ttl Session data time-to-live
|
|
115
|
+
* @param {boolean | string} [opts.cookieSameSite] Cooke SameSite setting
|
|
116
|
+
* @param {string} [opts.cookiePath] Cookie path
|
|
117
|
+
* @param {object} [opts.store] Storage instance
|
|
118
|
+
* @returns {RequestHandler[]} Middleware functions
|
|
119
|
+
*/
|
|
93
120
|
function sessionMiddleware({ cookieParserMiddleware, secret, name, secure, ttl, cookieSameSite = true, cookiePath = "/", store = new express_session_1.MemoryStore(), }) {
|
|
94
121
|
const commonCookieOptions = {
|
|
95
122
|
httpOnly: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/middleware/session.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/middleware/session.js"],"names":[],"mappings":"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"}
|
package/dist/routes/journey.js
CHANGED
|
@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.default = journeyRouter;
|
|
7
|
-
/* eslint-disable object-curly-newline,max-len */
|
|
8
7
|
const MutableRouter_js_1 = __importDefault(require("../lib/MutableRouter.js"));
|
|
9
8
|
const skip_waypoint_js_1 = __importDefault(require("../middleware/skip-waypoint.js"));
|
|
10
9
|
const steer_journey_js_1 = __importDefault(require("../middleware/steer-journey.js"));
|
|
@@ -67,8 +66,8 @@ const generateGovukErrors = (errors, req) => Object.values(errors || {}).map(([e
|
|
|
67
66
|
href: error.fieldHref,
|
|
68
67
|
}));
|
|
69
68
|
const generateEditCancelUrl = (editOrigin, waypoint) => {
|
|
70
|
-
const url = new URL(editOrigin,
|
|
71
|
-
url.searchParams.set(
|
|
69
|
+
const url = new URL(editOrigin, "https://placeholder.test/");
|
|
70
|
+
url.searchParams.set("editcancel", waypoint);
|
|
72
71
|
return `${url.pathname}${url.search}`;
|
|
73
72
|
};
|
|
74
73
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"journey.js","sourceRoot":"","sources":["../../src/routes/journey.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dwp/govuk-casa",
|
|
3
|
-
"version": "9.4.
|
|
3
|
+
"version": "9.4.2",
|
|
4
4
|
"description": "A framework for building GOVUK Collect-And-Submit-Applications",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -22,8 +22,8 @@
|
|
|
22
22
|
"!src/core-plugins/**/tests/"
|
|
23
23
|
],
|
|
24
24
|
"engines": {
|
|
25
|
-
"node": "
|
|
26
|
-
"npm": "
|
|
25
|
+
"node": ">=18 <=22",
|
|
26
|
+
"npm": ">=8 <=10"
|
|
27
27
|
},
|
|
28
28
|
"scripts": {
|
|
29
29
|
"pipeline": "npm run coverage && npm run lint",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"test:e2e": "spiderplan --worker-init ./tests/e2e/worker-init.js --language en ./tests/e2e/personas/**/*.yaml",
|
|
34
34
|
"test:dast": "spiderplan --worker-init ./tests/e2e/worker-init.js --language en ./tests/e2e/personas/**/traversal.yaml --workers 1 --zap --zap-proxy 'http://localhost:8080/' --zap-target-hostname 'host.docker.internal'",
|
|
35
35
|
"test:dast:report": "curl -s --header 'X-ZAP-Api-Key: secret' http://localhost:8080/OTHER/core/other/htmlreport > gl-dast-report.html",
|
|
36
|
-
"test:dast:setup": "docker run --rm --name casa-dast -d -u zap -p 8080:8080 -i ghcr.io/zaproxy/zaproxy:bare@sha256:24a4037a3e8607d9fedbd75e4a7f1336d11998e1c331aab9991ef074f5de4b22 zap.sh -daemon -host 0.0.0.0 -port 8080 -config api.addrs.addr.name=\".*\" -config api.addrs.addr.regex=true -config api.key=secret; npm run test:dast:ready-check",
|
|
36
|
+
"test:dast:setup": "docker run --rm --name casa-dast -d -u zap -p 8080:8080 -i ghcr.io/zaproxy/zaproxy:bare@sha256:24a4037a3e8607d9fedbd75e4a7f1336d11998e1c331aab9991ef074f5de4b22 zap.sh -daemon -host 0.0.0.0 -port 8080 -config api.addrs.addr.name=\".*\" -config api.addrs.addr.regex=true -config api.key=secret -notel; npm run test:dast:ready-check",
|
|
37
37
|
"test:dast:ready-check": "while [ \"$(curl -Is -o /dev/null -w %{response_code} http://localhost:8080/)\" -ne \"200\" ]; do sleep 1; echo 'Waiting for ZAP to start ...'; done",
|
|
38
38
|
"test:dast:teardown": "docker stop casa-dast",
|
|
39
39
|
"lint": "eslint .",
|
|
@@ -55,14 +55,14 @@
|
|
|
55
55
|
"bytes": "3.1.2",
|
|
56
56
|
"cookie-parser": "1.4.7",
|
|
57
57
|
"csrf-sync": "4.0.3",
|
|
58
|
-
"debug": "4.
|
|
58
|
+
"debug": "4.4.0",
|
|
59
59
|
"deepmerge": "4.3.1",
|
|
60
|
-
"express": "4.21.
|
|
60
|
+
"express": "4.21.2",
|
|
61
61
|
"express-session": "1.18.1",
|
|
62
|
-
"govuk-frontend": "5.
|
|
63
|
-
"helmet": "
|
|
64
|
-
"i18next": "
|
|
65
|
-
"i18next-http-middleware": "3.
|
|
62
|
+
"govuk-frontend": "5.8.0",
|
|
63
|
+
"helmet": "8.0.0",
|
|
64
|
+
"i18next": "24.2.1",
|
|
65
|
+
"i18next-http-middleware": "3.7.1",
|
|
66
66
|
"js-yaml": "4.1.0",
|
|
67
67
|
"lodash": "4.17.21",
|
|
68
68
|
"luxon": "3.5.0",
|
|
@@ -72,37 +72,35 @@
|
|
|
72
72
|
"validator": "13.12.0"
|
|
73
73
|
},
|
|
74
74
|
"devDependencies": {
|
|
75
|
-
"@
|
|
76
|
-
"@
|
|
77
|
-
"@
|
|
78
|
-
"@
|
|
79
|
-
"@
|
|
80
|
-
"@dwp/
|
|
81
|
-
"@dwp/casa-spiderplan-a11y-plugin": "1.0.1",
|
|
82
|
-
"@dwp/casa-spiderplan-zap-plugin": "1.0.0",
|
|
83
|
-
"@dwp/eslint-config-base": "7.0.0",
|
|
75
|
+
"@ckeditor/jsdoc-plugins": "43.0.1",
|
|
76
|
+
"@commitlint/config-conventional": "19.6.0",
|
|
77
|
+
"@dwp/casa-spiderplan": "4.1.1",
|
|
78
|
+
"@dwp/casa-spiderplan-a11y-plugin": "1.0.2",
|
|
79
|
+
"@dwp/casa-spiderplan-zap-plugin": "1.0.3",
|
|
80
|
+
"@dwp/eslint-config-base": "9.0.2",
|
|
84
81
|
"@types/express": "4.17.21",
|
|
85
|
-
"@types/
|
|
82
|
+
"@types/luxon": "3.4.2",
|
|
83
|
+
"@types/node": "22.10.5",
|
|
86
84
|
"@types/nunjucks": "3.2.6",
|
|
87
|
-
"c8": "10.1.
|
|
85
|
+
"c8": "10.1.3",
|
|
88
86
|
"chai": "5.1.2",
|
|
89
87
|
"cheerio": "1.0.0",
|
|
90
|
-
"commitlint": "19.
|
|
88
|
+
"commitlint": "19.6.1",
|
|
91
89
|
"docdash": "2.0.2",
|
|
92
|
-
"eslint": "
|
|
90
|
+
"eslint": "9.17.0",
|
|
93
91
|
"eslint-plugin-import": "2.31.0",
|
|
94
|
-
"eslint-plugin-jsdoc": "
|
|
95
|
-
"eslint-plugin-security": "
|
|
96
|
-
"eslint-plugin-sonarjs": "0.
|
|
97
|
-
"fast-check": "3.23.
|
|
92
|
+
"eslint-plugin-jsdoc": "50.6.1",
|
|
93
|
+
"eslint-plugin-security": "3.0.1",
|
|
94
|
+
"eslint-plugin-sonarjs": "3.0.1",
|
|
95
|
+
"fast-check": "3.23.2",
|
|
98
96
|
"jsdoc": "4.0.4",
|
|
99
97
|
"jsdoc-tsimport-plugin": "1.0.5",
|
|
100
|
-
"mocha": "
|
|
101
|
-
"prettier": "3.
|
|
102
|
-
"prettier-plugin-jsdoc": "1.3.
|
|
103
|
-
"sass": "1.
|
|
104
|
-
"sinon": "
|
|
98
|
+
"mocha": "11.0.1",
|
|
99
|
+
"prettier": "3.4.2",
|
|
100
|
+
"prettier-plugin-jsdoc": "1.3.2",
|
|
101
|
+
"sass": "1.83.1",
|
|
102
|
+
"sinon": "19.0.2",
|
|
105
103
|
"supertest": "7.0.0",
|
|
106
|
-
"typescript": "5.
|
|
104
|
+
"typescript": "5.7.3"
|
|
107
105
|
}
|
|
108
106
|
}
|
|
@@ -2,17 +2,29 @@ import logger from "../../../lib/logger.js";
|
|
|
2
2
|
import preSteerHook from "./pre-steer-hook.js";
|
|
3
3
|
import postSteerHook from "./post-steer-hook.js";
|
|
4
4
|
|
|
5
|
+
/**
|
|
6
|
+
* @typedef {import("../../../casa.js").ConfigurationOptions} ConfigurationOptions
|
|
7
|
+
* @access private
|
|
8
|
+
*/
|
|
9
|
+
|
|
5
10
|
const log = logger("lib:internal-plugin:edit-snapshot");
|
|
6
11
|
|
|
12
|
+
/**
|
|
13
|
+
* @param {ConfigurationOptions} config Configuration object
|
|
14
|
+
* @returns {void}
|
|
15
|
+
*/
|
|
7
16
|
export default function (config) {
|
|
8
17
|
log.info("Configuring 'edit-snapshot' plugin");
|
|
9
18
|
|
|
10
19
|
config.hooks ??= [];
|
|
11
|
-
config.hooks.push(
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
20
|
+
config.hooks.push(
|
|
21
|
+
{
|
|
22
|
+
hook: "journey.presteer",
|
|
23
|
+
middleware: preSteerHook,
|
|
24
|
+
},
|
|
25
|
+
{
|
|
26
|
+
hook: "journey.poststeer",
|
|
27
|
+
middleware: postSteerHook,
|
|
28
|
+
},
|
|
29
|
+
);
|
|
18
30
|
}
|
|
@@ -9,7 +9,9 @@ export default (req, res, next) => {
|
|
|
9
9
|
// to redirect if the journey cannot be traversed to the edit origin.
|
|
10
10
|
// eslint-disable-next-line security/detect-object-injection
|
|
11
11
|
if (req.casa[FLAG_FOR_PURGING] === true) {
|
|
12
|
-
log.debug(
|
|
12
|
+
log.debug(
|
|
13
|
+
`Snapshot purging flag has been set for context '${req.casa.journeyContext.identity.id}'. Snapshot will be deleted.`,
|
|
14
|
+
);
|
|
13
15
|
deleteSnapshot(log, req);
|
|
14
16
|
// eslint-disable-next-line security/detect-object-injection
|
|
15
17
|
req.casa[FLAG_FOR_PURGING] = false;
|
|
@@ -1,23 +1,33 @@
|
|
|
1
1
|
import logger from "../../../lib/logger.js";
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
FLAG_FOR_PURGING,
|
|
4
|
+
snapshotExists,
|
|
5
|
+
recoverSnapshot,
|
|
6
|
+
createSnapshot,
|
|
7
|
+
reachedEditOrigin,
|
|
8
|
+
} from "./utils.js";
|
|
3
9
|
|
|
4
10
|
const log = logger("lib:internal-plugin:edit-snapshot:pre-steer-hook");
|
|
5
11
|
|
|
6
12
|
export default (req, res, next) => {
|
|
7
13
|
if (req.query.editcancel && snapshotExists(req)) {
|
|
8
|
-
log.debug(
|
|
14
|
+
log.debug(
|
|
15
|
+
"Edit workflow was actively canceled. Snapshot will be recovered.",
|
|
16
|
+
);
|
|
9
17
|
recoverSnapshot(log, req);
|
|
10
18
|
return req.session.save(next);
|
|
11
19
|
}
|
|
12
20
|
|
|
13
21
|
if (!req.casa.editMode && snapshotExists(req)) {
|
|
14
|
-
log.debug("Edit workflow passively canceled. Snapshot will be recovered.")
|
|
22
|
+
log.debug("Edit workflow passively canceled. Snapshot will be recovered.");
|
|
15
23
|
recoverSnapshot(log, req);
|
|
16
24
|
return req.session.save(next);
|
|
17
25
|
}
|
|
18
26
|
|
|
19
27
|
if (req.casa.editMode && reachedEditOrigin(log, req)) {
|
|
20
|
-
log.trace(
|
|
28
|
+
log.trace(
|
|
29
|
+
`Editing workflow has reached editorigin. Purge MAY be carried out in poststeer hook on context '${req.casa.journeyContext.identity.id}'.`,
|
|
30
|
+
);
|
|
21
31
|
// eslint-disable-next-line security/detect-object-injection
|
|
22
32
|
req.casa[FLAG_FOR_PURGING] = true;
|
|
23
33
|
return next();
|
|
@@ -6,7 +6,10 @@ const SESSION_KEY = "casa_edit_snapshots";
|
|
|
6
6
|
export const FLAG_FOR_PURGING = Symbol("flag_to_purge_edit_snapshot");
|
|
7
7
|
|
|
8
8
|
export const snapshotExists = (req) => {
|
|
9
|
-
return
|
|
9
|
+
return (
|
|
10
|
+
req?.session[SESSION_KEY] &&
|
|
11
|
+
Object.hasOwn(req.session[SESSION_KEY], req.casa.journeyContext.identity.id)
|
|
12
|
+
);
|
|
10
13
|
};
|
|
11
14
|
|
|
12
15
|
export const reachedEditOrigin = (log, req) => {
|
|
@@ -23,19 +26,28 @@ export const reachedEditOrigin = (log, req) => {
|
|
|
23
26
|
};
|
|
24
27
|
|
|
25
28
|
export const createSnapshot = (log, req) => {
|
|
26
|
-
log.debug(
|
|
29
|
+
log.debug(
|
|
30
|
+
`Creating a new edit snapshot for context '${req.casa.journeyContext.identity.id}'`,
|
|
31
|
+
);
|
|
27
32
|
req.session[SESSION_KEY] ??= Object.create(null);
|
|
28
|
-
req.session[SESSION_KEY][req.casa.journeyContext.identity.id] =
|
|
29
|
-
|
|
33
|
+
req.session[SESSION_KEY][req.casa.journeyContext.identity.id] =
|
|
34
|
+
req.casa.journeyContext.toObject();
|
|
35
|
+
};
|
|
30
36
|
|
|
31
37
|
export const recoverSnapshot = (log, req) => {
|
|
32
|
-
log.debug(
|
|
33
|
-
|
|
38
|
+
log.debug(
|
|
39
|
+
`Recovering snapshot for context '${req.casa.journeyContext.identity.id}'`,
|
|
40
|
+
);
|
|
41
|
+
req.casa.journeyContext.configureFromObject(
|
|
42
|
+
req.session[SESSION_KEY][req.casa.journeyContext.identity.id],
|
|
43
|
+
);
|
|
34
44
|
JourneyContext.putContext(req.session, req.casa.journeyContext);
|
|
35
45
|
deleteSnapshot(log, req);
|
|
36
46
|
};
|
|
37
47
|
|
|
38
48
|
export const deleteSnapshot = (log, req) => {
|
|
39
|
-
log.debug(
|
|
49
|
+
log.debug(
|
|
50
|
+
`Purging edit snapshot for context '${req.casa.journeyContext.identity.id}'`,
|
|
51
|
+
);
|
|
40
52
|
req.session[SESSION_KEY][req.casa.journeyContext.identity.id] = undefined;
|
|
41
53
|
};
|
|
@@ -97,7 +97,6 @@ export default class CasaTemplateLoader extends FileSystemLoader {
|
|
|
97
97
|
/* eslint-disable-next-line security/detect-object-injection */
|
|
98
98
|
const { block, modifier } = this.#blockModifiers[i];
|
|
99
99
|
if (source.src.indexOf(`block ${block}`) > -1) {
|
|
100
|
-
/* eslint-disable-next-line no-param-reassign */
|
|
101
100
|
source.src = source.src.replace(
|
|
102
101
|
`block ${block} %}`,
|
|
103
102
|
`block ${block} %}${modifier(name)}`,
|