@mouryaamit/nx-polystack 1.2.4 → 1.2.6
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/src/cli/commands/csp.d.ts +8 -0
- package/dist/src/cli/commands/csp.js +74 -3
- package/dist/src/cli/commands/csp.js.map +1 -1
- package/dist/src/cli/help.js +3 -0
- package/dist/src/cli/help.js.map +1 -1
- package/dist/src/cli/launcher.js +1 -1
- package/dist/src/cli/launcher.js.map +1 -1
- package/dist/src/executors/build/executor.js +27 -4
- package/dist/src/executors/build/executor.js.map +1 -1
- package/dist/src/executors/build/schema.d.ts +7 -0
- package/dist/src/executors/build/schema.json +41 -1
- package/dist/src/generators/app/files/angular/server/README.md__template__ +3 -1
- package/dist/src/lib/csp/allowlist.d.ts +17 -0
- package/dist/src/lib/csp/allowlist.js +117 -3
- package/dist/src/lib/csp/allowlist.js.map +1 -1
- package/dist/src/lib/csp/import.js +21 -3
- package/dist/src/lib/csp/import.js.map +1 -1
- package/dist/src/lib/csp/render.d.ts +10 -5
- package/dist/src/lib/csp/render.js +72 -22
- package/dist/src/lib/csp/render.js.map +1 -1
- package/dist/src/lib/env-encryption/prepare.d.ts +4 -3
- package/dist/src/lib/env-encryption/prepare.js +4 -4
- package/dist/src/lib/env-encryption/prepare.js.map +1 -1
- package/dist/src/lib/hardening/strip.d.ts +1 -0
- package/dist/src/lib/hardening/strip.js +3 -3
- package/dist/src/lib/hardening/strip.js.map +1 -1
- package/dist/src/lib/helpers/inject-nonce.d.ts +36 -5
- package/dist/src/lib/helpers/inject-nonce.js +155 -41
- package/dist/src/lib/helpers/inject-nonce.js.map +1 -1
- package/dist/src/lib/helpers/inject-sri.d.ts +8 -0
- package/dist/src/lib/helpers/inject-sri.js +72 -56
- package/dist/src/lib/helpers/inject-sri.js.map +1 -1
- package/dist/src/lib/html/tags.d.ts +42 -0
- package/dist/src/lib/html/tags.js +173 -0
- package/dist/src/lib/html/tags.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.buildPolicy = exports.serializeAllowlist = exports.parseAllowlist = exports.sourceProblem = exports.DEFAULT_PERMISSIONS_POLICY = exports.CSP_DIRECTIVES = void 0;
|
|
3
|
+
exports.buildPolicy = exports.serializeAllowlist = exports.parseAllowlist = exports.sourceProblem = exports.isHashSource = exports.nonceEnvVar = exports.DEFAULT_NONCE_SOURCE = exports.REFERRER_POLICIES = exports.DEFAULT_REFERRER_POLICY = exports.DEFAULT_PERMISSIONS_POLICY = exports.CSP_DIRECTIVES = void 0;
|
|
4
4
|
/** Directives an app may extend in csp-allowlist.json, and what each starts from. */
|
|
5
5
|
exports.CSP_DIRECTIVES = {
|
|
6
6
|
'script-src': { base: ["'self'", "'nonce-{N}'"], always: true },
|
|
@@ -16,6 +16,48 @@ exports.CSP_DIRECTIVES = {
|
|
|
16
16
|
'frame-ancestors': { base: ["'none'"], always: true },
|
|
17
17
|
};
|
|
18
18
|
exports.DEFAULT_PERMISSIONS_POLICY = 'camera=(), microphone=(), geolocation=()';
|
|
19
|
+
exports.DEFAULT_REFERRER_POLICY = 'strict-origin-when-cross-origin';
|
|
20
|
+
exports.REFERRER_POLICIES = [
|
|
21
|
+
'no-referrer',
|
|
22
|
+
'no-referrer-when-downgrade',
|
|
23
|
+
'origin',
|
|
24
|
+
'origin-when-cross-origin',
|
|
25
|
+
'same-origin',
|
|
26
|
+
'strict-origin',
|
|
27
|
+
'strict-origin-when-cross-origin',
|
|
28
|
+
'unsafe-url',
|
|
29
|
+
];
|
|
30
|
+
exports.DEFAULT_NONCE_SOURCE = 'mod_unique_id';
|
|
31
|
+
/** The env variable the nonce comes from with nonce-source "env:NAME", else undefined. */
|
|
32
|
+
const nonceEnvVar = (a) => a.nonceSource?.startsWith('env:') ? a.nonceSource.slice(4) : undefined;
|
|
33
|
+
exports.nonceEnvVar = nonceEnvVar;
|
|
34
|
+
const HEADER_NAME = /^[A-Za-z0-9-]+$/;
|
|
35
|
+
const ENV_NAME = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
36
|
+
/** 'sha256-…' / 'sha384-…' / 'sha512-…' with base64 of that digest's length. */
|
|
37
|
+
const HASH_SOURCE = /^'sha(256|384|512)-([A-Za-z0-9+/_-]+={0,2})'$/i;
|
|
38
|
+
/** Whether source is a well-formed CSP hash source (base64 or base64url of a full digest). */
|
|
39
|
+
function isHashSource(source) {
|
|
40
|
+
const m = HASH_SOURCE.exec(source);
|
|
41
|
+
if (!m)
|
|
42
|
+
return false;
|
|
43
|
+
const b64 = m[2].replace(/-/g, '+').replace(/_/g, '/');
|
|
44
|
+
const bytes = Buffer.from(b64, 'base64');
|
|
45
|
+
if (bytes.length * 8 !== Number(m[1]))
|
|
46
|
+
return false;
|
|
47
|
+
// Canonical: re-encoding gives the same digits (no stray bits, padding only where due).
|
|
48
|
+
return bytes.toString('base64').replace(/=+$/, '') === b64.replace(/=+$/, '');
|
|
49
|
+
}
|
|
50
|
+
exports.isHashSource = isHashSource;
|
|
51
|
+
/** Headers pstack csp sets itself; extra-headers may not replace them. */
|
|
52
|
+
const RESERVED_HEADERS = [
|
|
53
|
+
'content-security-policy',
|
|
54
|
+
'content-security-policy-report-only',
|
|
55
|
+
'x-frame-options',
|
|
56
|
+
'x-content-type-options',
|
|
57
|
+
'referrer-policy',
|
|
58
|
+
'strict-transport-security',
|
|
59
|
+
'permissions-policy',
|
|
60
|
+
];
|
|
19
61
|
/** Host sources: https/wss (or no scheme), optional *. prefix, port and a plain path. */
|
|
20
62
|
const HOST = /^(?:(?:https|wss):\/\/)?(?:\*\.)?[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*(?::(?:\d{1,5}|\*))?(?:\/[A-Za-z0-9._~!&()*+=:@/-]*)?$/;
|
|
21
63
|
const SCHEMES = new Set(['https:', 'wss:', 'data:', 'blob:']);
|
|
@@ -30,8 +72,14 @@ function sourceProblem(directive, source) {
|
|
|
30
72
|
// WebAssembly compilation only; no JavaScript eval.
|
|
31
73
|
if (source === "'wasm-unsafe-eval'" && directive === 'script-src')
|
|
32
74
|
return undefined;
|
|
75
|
+
if (/^'sha(256|384|512)-/i.test(source)) {
|
|
76
|
+
if (directive !== 'script-src' && directive !== 'style-src') {
|
|
77
|
+
return 'hash sources only apply to script-src and style-src';
|
|
78
|
+
}
|
|
79
|
+
return isHashSource(source) ? undefined : 'not a valid sha256/384/512 hash (base64 digest)';
|
|
80
|
+
}
|
|
33
81
|
if (source.startsWith("'")) {
|
|
34
|
-
return "quoted keywords other than 'self' (and 'wasm-unsafe-eval' in script-src) are not allowed";
|
|
82
|
+
return "quoted keywords other than 'self', hashes (and 'wasm-unsafe-eval' in script-src) are not allowed";
|
|
35
83
|
}
|
|
36
84
|
if (source === '*')
|
|
37
85
|
return '"*" allows any host';
|
|
@@ -71,8 +119,12 @@ function parseAllowlist(raw) {
|
|
|
71
119
|
out.permissionsPolicy = value.trim();
|
|
72
120
|
continue;
|
|
73
121
|
}
|
|
122
|
+
if (key in OPTION_KEYS) {
|
|
123
|
+
OPTION_KEYS[key](value, out);
|
|
124
|
+
continue;
|
|
125
|
+
}
|
|
74
126
|
if (!(key in exports.CSP_DIRECTIVES)) {
|
|
75
|
-
throw new Error(`csp-allowlist.json: "${key}" is not supported (use ${Object.keys(exports.CSP_DIRECTIVES).join(', ')}, permissions-policy)`);
|
|
127
|
+
throw new Error(`csp-allowlist.json: "${key}" is not supported (use ${Object.keys(exports.CSP_DIRECTIVES).join(', ')}, permissions-policy, ${Object.keys(OPTION_KEYS).join(', ')})`);
|
|
76
128
|
}
|
|
77
129
|
if (!Array.isArray(value) || !value.every((v) => typeof v === 'string')) {
|
|
78
130
|
throw new Error(`csp-allowlist.json "${key}" must be a list of sources`);
|
|
@@ -92,6 +144,57 @@ function parseAllowlist(raw) {
|
|
|
92
144
|
return out;
|
|
93
145
|
}
|
|
94
146
|
exports.parseAllowlist = parseAllowlist;
|
|
147
|
+
const fail = (key, what) => {
|
|
148
|
+
throw new Error(`csp-allowlist.json "${key}" ${what}`);
|
|
149
|
+
};
|
|
150
|
+
/** The server-config keys of csp-allowlist.json (everything that is not a directive). */
|
|
151
|
+
const OPTION_KEYS = {
|
|
152
|
+
'nonce-source': (v, out) => {
|
|
153
|
+
if (typeof v !== 'string' ||
|
|
154
|
+
(v !== exports.DEFAULT_NONCE_SOURCE && !(v.startsWith('env:') && ENV_NAME.test(v.slice(4))))) {
|
|
155
|
+
fail('nonce-source', 'must be "mod_unique_id" or "env:<VARIABLE>" (e.g. env:UNIQUE_ID)');
|
|
156
|
+
}
|
|
157
|
+
if (v !== exports.DEFAULT_NONCE_SOURCE)
|
|
158
|
+
out.nonceSource = v;
|
|
159
|
+
},
|
|
160
|
+
'unset-headers': (v, out) => {
|
|
161
|
+
if (!Array.isArray(v) || !v.every((h) => typeof h === 'string' && HEADER_NAME.test(h))) {
|
|
162
|
+
fail('unset-headers', 'must be a list of header names');
|
|
163
|
+
}
|
|
164
|
+
out.unsetHeaders = [...new Set(v)];
|
|
165
|
+
},
|
|
166
|
+
'referrer-policy': (v, out) => {
|
|
167
|
+
if (typeof v !== 'string' || !exports.REFERRER_POLICIES.includes(v)) {
|
|
168
|
+
fail('referrer-policy', `must be one of ${exports.REFERRER_POLICIES.join(', ')}`);
|
|
169
|
+
}
|
|
170
|
+
if (v !== exports.DEFAULT_REFERRER_POLICY)
|
|
171
|
+
out.referrerPolicy = v;
|
|
172
|
+
},
|
|
173
|
+
'extra-headers': (v, out) => {
|
|
174
|
+
if (v === null || typeof v !== 'object' || Array.isArray(v)) {
|
|
175
|
+
fail('extra-headers', 'must be an object of header name → value');
|
|
176
|
+
}
|
|
177
|
+
const entries = Object.entries(v);
|
|
178
|
+
for (const [name, value] of entries) {
|
|
179
|
+
if (!HEADER_NAME.test(name))
|
|
180
|
+
fail('extra-headers', `: "${name}" is not a header name`);
|
|
181
|
+
if (RESERVED_HEADERS.includes(name.toLowerCase())) {
|
|
182
|
+
fail('extra-headers', `: "${name}" is set from the allowlist itself (use the directives, permissions-policy or referrer-policy)`);
|
|
183
|
+
}
|
|
184
|
+
if (typeof value !== 'string' || !value || /["\\\r\n]/.test(value)) {
|
|
185
|
+
fail('extra-headers', `: "${name}" must be one line without " or \\`);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
out.extraHeaders = entries;
|
|
189
|
+
},
|
|
190
|
+
ssi: (v, out) => {
|
|
191
|
+
if (v !== 'index' && v !== 'html') {
|
|
192
|
+
fail('ssi', 'must be "index" (IncludesNOEXEC on index.html) or "html" (Includes on .html)');
|
|
193
|
+
}
|
|
194
|
+
if (v === 'html')
|
|
195
|
+
out.ssi = 'html';
|
|
196
|
+
},
|
|
197
|
+
};
|
|
95
198
|
/** JSON for the file: directives in table order, then permissions-policy when not the default. */
|
|
96
199
|
function serializeAllowlist(a) {
|
|
97
200
|
const obj = {};
|
|
@@ -101,6 +204,17 @@ function serializeAllowlist(a) {
|
|
|
101
204
|
}
|
|
102
205
|
if (a.permissionsPolicy !== exports.DEFAULT_PERMISSIONS_POLICY)
|
|
103
206
|
obj['permissions-policy'] = a.permissionsPolicy;
|
|
207
|
+
if (a.nonceSource && a.nonceSource !== exports.DEFAULT_NONCE_SOURCE)
|
|
208
|
+
obj['nonce-source'] = a.nonceSource;
|
|
209
|
+
if (a.ssi === 'html')
|
|
210
|
+
obj['ssi'] = a.ssi;
|
|
211
|
+
if (a.referrerPolicy && a.referrerPolicy !== exports.DEFAULT_REFERRER_POLICY) {
|
|
212
|
+
obj['referrer-policy'] = a.referrerPolicy;
|
|
213
|
+
}
|
|
214
|
+
if (a.unsetHeaders?.length)
|
|
215
|
+
obj['unset-headers'] = a.unsetHeaders;
|
|
216
|
+
if (a.extraHeaders?.length)
|
|
217
|
+
obj['extra-headers'] = Object.fromEntries(a.extraHeaders);
|
|
104
218
|
return JSON.stringify(obj, null, 2) + '\n';
|
|
105
219
|
}
|
|
106
220
|
exports.serializeAllowlist = serializeAllowlist;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"allowlist.js","sourceRoot":"","sources":["../../../../src/lib/csp/allowlist.ts"],"names":[],"mappings":";;;AAAA,qFAAqF;AACxE,QAAA,cAAc,GAAG;IAC5B,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;IAC/D,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;IAC9D,SAAS,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;IACtD,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;IACvD,aAAa,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;IACjD,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE;IAChD,WAAW,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE;IAChD,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE;IACjD,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE;IACnD,aAAa,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;IACjD,iBAAiB,EAAE,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE;CAC7C,CAAC;AAIE,QAAA,0BAA0B,GAAG,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"allowlist.js","sourceRoot":"","sources":["../../../../src/lib/csp/allowlist.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,26 @@ const DEFAULT_SRC_FALLBACK = [
|
|
|
30
30
|
'worker-src',
|
|
31
31
|
'manifest-src',
|
|
32
32
|
];
|
|
33
|
-
|
|
33
|
+
/** A quoted keyword in lower case; a hash keeps its (case-sensitive) base64 digest. */
|
|
34
|
+
const lower = (s) => {
|
|
35
|
+
const hash = /^'(sha(?:256|384|512))-(.*)$/i.exec(s);
|
|
36
|
+
if (hash)
|
|
37
|
+
return `'${hash[1].toLowerCase()}-${hash[2]}`;
|
|
38
|
+
return s.startsWith("'") ? s.toLowerCase() : s;
|
|
39
|
+
};
|
|
40
|
+
/** -elem directives the generated policy folds into script-src / style-src. */
|
|
41
|
+
const ELEM_DIRECTIVES = {
|
|
42
|
+
'script-src-elem': 'script-src',
|
|
43
|
+
'style-src-elem': 'style-src',
|
|
44
|
+
};
|
|
34
45
|
/** Sources the generated policy already has, or that the server adds per request. */
|
|
35
46
|
function implied(directive, source) {
|
|
36
47
|
const s = lower(source);
|
|
37
|
-
if (/^'
|
|
48
|
+
if (/^'nonce-/.test(s))
|
|
38
49
|
return true;
|
|
50
|
+
// Hashes are kept where they work (script-src, style-src); elsewhere they mean nothing.
|
|
51
|
+
if (/^'sha(256|384|512)-/.test(s))
|
|
52
|
+
return directive !== 'script-src' && directive !== 'style-src';
|
|
39
53
|
if (s === "'self'" && directive !== 'frame-ancestors')
|
|
40
54
|
return true;
|
|
41
55
|
const base = allowlist_1.CSP_DIRECTIVES[directive]?.base;
|
|
@@ -193,7 +207,11 @@ function importPolicy(policy, existing) {
|
|
|
193
207
|
const skipped = [];
|
|
194
208
|
const notes = [];
|
|
195
209
|
const incoming = {};
|
|
196
|
-
for (const [
|
|
210
|
+
for (const [rawDirective, sources] of Object.entries(policy)) {
|
|
211
|
+
const directive = ELEM_DIRECTIVES[rawDirective] ?? rawDirective;
|
|
212
|
+
if (directive !== rawDirective) {
|
|
213
|
+
notes.push(`${rawDirective} was merged into ${directive} (the generated policy sets ${directive} only)`);
|
|
214
|
+
}
|
|
197
215
|
if (directive in FIXED) {
|
|
198
216
|
const extra = sources.filter((s) => !FIXED_ALLOWS[directive].includes(lower(s)));
|
|
199
217
|
if (extra.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../src/lib/csp/import.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"import.js","sourceRoot":"","sources":["../../../../src/lib/csp/import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,19 @@
|
|
|
1
1
|
import { CspAllowlist } from './allowlist';
|
|
2
2
|
/** First line of every file `pstack csp` writes; files without it are hand-written. */
|
|
3
3
|
export declare const GENERATED_MARKER = "# Generated by pstack csp from csp-allowlist.json";
|
|
4
|
-
/** What the release build (secure: true) writes where the nonce goes. */
|
|
4
|
+
/** What the release build (secure: true) writes where the nonce goes by default. */
|
|
5
5
|
export declare const CSP_NONCE_SSI = "<!--#echo var=\"CSP_NONCE\" -->";
|
|
6
|
+
/**
|
|
7
|
+
* The placeholder the release build must write for this allowlist: the default one, or with
|
|
8
|
+
* nonce-source "env:NAME" an SSI echo of NAME in single quotes (so an unprocessed placeholder
|
|
9
|
+
* cannot end the double-quoted attribute around it).
|
|
10
|
+
*/
|
|
11
|
+
export declare function noncePlaceholder(a: CspAllowlist): string;
|
|
6
12
|
/**
|
|
7
13
|
* Apache: SPA routing relative to this folder (works under any base href), a per-request nonce
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* `AllowOverride FileInfo Options=IncludesNOEXEC` (or All) for the folder.
|
|
14
|
+
* filled into index.html by SSI and used in the CSP header, the security headers, and a long
|
|
15
|
+
* cache for hashed files. The nonce is UNIQUE_ID with "@" replaced (mod_unique_id, the default),
|
|
16
|
+
* or with nonce-source "env:NAME" a variable the server sets itself (e.g. mod_lua), used as is.
|
|
12
17
|
*/
|
|
13
18
|
export declare function renderHtaccess(app: string, a: CspAllowlist): string;
|
|
14
19
|
/**
|
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.renderNginx = exports.renderHtaccess = exports.CSP_NONCE_SSI = exports.GENERATED_MARKER = void 0;
|
|
3
|
+
exports.renderNginx = exports.renderHtaccess = exports.noncePlaceholder = exports.CSP_NONCE_SSI = exports.GENERATED_MARKER = void 0;
|
|
4
4
|
const allowlist_1 = require("./allowlist");
|
|
5
5
|
/** First line of every file `pstack csp` writes; files without it are hand-written. */
|
|
6
6
|
exports.GENERATED_MARKER = '# Generated by pstack csp from csp-allowlist.json';
|
|
7
|
-
/** What the release build (secure: true) writes where the nonce goes. */
|
|
7
|
+
/** What the release build (secure: true) writes where the nonce goes by default. */
|
|
8
8
|
exports.CSP_NONCE_SSI = '<!--#echo var="CSP_NONCE" -->';
|
|
9
|
+
/**
|
|
10
|
+
* The placeholder the release build must write for this allowlist: the default one, or with
|
|
11
|
+
* nonce-source "env:NAME" an SSI echo of NAME in single quotes (so an unprocessed placeholder
|
|
12
|
+
* cannot end the double-quoted attribute around it).
|
|
13
|
+
*/
|
|
14
|
+
function noncePlaceholder(a) {
|
|
15
|
+
const env = (0, allowlist_1.nonceEnvVar)(a);
|
|
16
|
+
return env ? `<!--#echo var='${env}' -->` : exports.CSP_NONCE_SSI;
|
|
17
|
+
}
|
|
18
|
+
exports.noncePlaceholder = noncePlaceholder;
|
|
9
19
|
/** Times "@" is replaced in Apache's UNIQUE_ID (27 characters, so more is vanishingly rare). */
|
|
10
20
|
const AT_REPLACEMENTS = 8;
|
|
11
21
|
/** A header value inside double quotes in either config (only `"` needs escaping; validated). */
|
|
@@ -13,24 +23,58 @@ const quoted = (v) => v.replace(/"/g, '\\"');
|
|
|
13
23
|
const SECURITY_HEADERS = (a) => [
|
|
14
24
|
['X-Frame-Options', 'SAMEORIGIN'],
|
|
15
25
|
['X-Content-Type-Options', 'nosniff'],
|
|
16
|
-
['Referrer-Policy',
|
|
26
|
+
['Referrer-Policy', a.referrerPolicy ?? allowlist_1.DEFAULT_REFERRER_POLICY],
|
|
17
27
|
['Strict-Transport-Security', 'max-age=31536000; includeSubDomains'],
|
|
18
28
|
['Permissions-Policy', a.permissionsPolicy],
|
|
19
29
|
];
|
|
20
30
|
const header = (app) => `${exports.GENERATED_MARKER} — edit it and run \`pstack csp --app=${app}\`.`;
|
|
21
31
|
/**
|
|
22
32
|
* Apache: SPA routing relative to this folder (works under any base href), a per-request nonce
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
* `AllowOverride FileInfo Options=IncludesNOEXEC` (or All) for the folder.
|
|
33
|
+
* filled into index.html by SSI and used in the CSP header, the security headers, and a long
|
|
34
|
+
* cache for hashed files. The nonce is UNIQUE_ID with "@" replaced (mod_unique_id, the default),
|
|
35
|
+
* or with nonce-source "env:NAME" a variable the server sets itself (e.g. mod_lua), used as is.
|
|
27
36
|
*/
|
|
28
37
|
function renderHtaccess(app, a) {
|
|
29
|
-
const
|
|
38
|
+
const env = (0, allowlist_1.nonceEnvVar)(a);
|
|
39
|
+
const placeholder = noncePlaceholder(a);
|
|
40
|
+
const policy = (0, allowlist_1.buildPolicy)(a).replace(/\{N\}/g, env ? `%{${env}}e` : '%{CSP_NONCE}e');
|
|
41
|
+
const includes = a.ssi === 'html' ? 'Includes' : 'IncludesNOEXEC';
|
|
42
|
+
const modules = env
|
|
43
|
+
? 'mod_rewrite, mod_headers and mod_include'
|
|
44
|
+
: 'mod_rewrite, mod_headers, mod_include, mod_unique_id and mod_setenvif';
|
|
45
|
+
const nonce = env
|
|
46
|
+
? [
|
|
47
|
+
`# Per-request CSP nonce: ${env}, set by the server for every request (e.g. by mod_lua in a`,
|
|
48
|
+
'# fixups hook), used as is in the header and by SSI.',
|
|
49
|
+
]
|
|
50
|
+
: [
|
|
51
|
+
'# Per-request CSP nonce: UNIQUE_ID without "@" (not allowed in a nonce). reqenv() reads the',
|
|
52
|
+
'# environment only, so request headers cannot set it.',
|
|
53
|
+
`SetEnvIfExpr "reqenv('UNIQUE_ID') =~ /^(.+)$/" CSP_NONCE=$1`,
|
|
54
|
+
...Array.from({ length: AT_REPLACEMENTS }, () => `SetEnvIfExpr "reqenv('CSP_NONCE') =~ /^([^@]*)@(.*)$/" CSP_NONCE=$1_$2`),
|
|
55
|
+
];
|
|
56
|
+
const ssi = a.ssi === 'html'
|
|
57
|
+
? [
|
|
58
|
+
`# .html files: the release build (secure: true) leaves ${placeholder} where the nonce goes.`,
|
|
59
|
+
'Options +Includes',
|
|
60
|
+
'AddOutputFilter INCLUDES .html',
|
|
61
|
+
'<Files "index.html">',
|
|
62
|
+
' Header always set Cache-Control "no-store"',
|
|
63
|
+
'</Files>',
|
|
64
|
+
]
|
|
65
|
+
: [
|
|
66
|
+
`# index.html: the release build (secure: true) leaves ${placeholder} where the nonce goes.`,
|
|
67
|
+
'Options +IncludesNOEXEC',
|
|
68
|
+
'<Files "index.html">',
|
|
69
|
+
' SetOutputFilter INCLUDES',
|
|
70
|
+
' Header always set Cache-Control "no-store"',
|
|
71
|
+
'</Files>',
|
|
72
|
+
];
|
|
30
73
|
const lines = [
|
|
31
74
|
header(app),
|
|
32
|
-
|
|
33
|
-
|
|
75
|
+
`# Needs ${modules}, and`,
|
|
76
|
+
`# AllowOverride FileInfo Options=${includes} (or All) for this folder.`,
|
|
77
|
+
...(env ? [`# The server must set ${env} for every request.`] : []),
|
|
34
78
|
'',
|
|
35
79
|
'# Single-page app: anything that is not a file, a folder or a hashed build file gets index.html.',
|
|
36
80
|
'RewriteEngine On',
|
|
@@ -39,21 +83,22 @@ function renderHtaccess(app, a) {
|
|
|
39
83
|
'RewriteCond %{REQUEST_URI} !\\.[0-9a-f]{8,}\\.(js|css)$',
|
|
40
84
|
'RewriteRule ^ index.html [L]',
|
|
41
85
|
'',
|
|
42
|
-
|
|
43
|
-
'# environment only, so request headers cannot set it.',
|
|
44
|
-
`SetEnvIfExpr "reqenv('UNIQUE_ID') =~ /^(.+)$/" CSP_NONCE=$1`,
|
|
45
|
-
...Array.from({ length: AT_REPLACEMENTS }, () => `SetEnvIfExpr "reqenv('CSP_NONCE') =~ /^([^@]*)@(.*)$/" CSP_NONCE=$1_$2`),
|
|
86
|
+
...nonce,
|
|
46
87
|
'',
|
|
47
|
-
|
|
48
|
-
'Options +IncludesNOEXEC',
|
|
49
|
-
'<Files "index.html">',
|
|
50
|
-
' SetOutputFilter INCLUDES',
|
|
51
|
-
' Header always set Cache-Control "no-store"',
|
|
52
|
-
'</Files>',
|
|
88
|
+
...ssi,
|
|
53
89
|
'',
|
|
54
90
|
'# Security headers',
|
|
91
|
+
// Both tables: "always" alone does not remove a header set without it (or by a backend).
|
|
92
|
+
...(a.unsetHeaders ?? []).flatMap((h) => [`Header unset ${h}`, `Header always unset ${h}`]),
|
|
55
93
|
...SECURITY_HEADERS(a).map(([k, v]) => `Header always set ${k} "${quoted(v)}"`),
|
|
56
94
|
`Header always set Content-Security-Policy "${policy}"`,
|
|
95
|
+
...(a.extraHeaders?.length
|
|
96
|
+
? [
|
|
97
|
+
'',
|
|
98
|
+
'# extra-headers from csp-allowlist.json, as written',
|
|
99
|
+
...a.extraHeaders.map(([k, v]) => `Header always set ${k} "${v}"`),
|
|
100
|
+
]
|
|
101
|
+
: []),
|
|
57
102
|
'',
|
|
58
103
|
'# Long-lived cache for content-hashed files',
|
|
59
104
|
'<FilesMatch "\\.[0-9a-f]{8,}\\.(js|css)$">',
|
|
@@ -71,6 +116,8 @@ exports.renderHtaccess = renderHtaccess;
|
|
|
71
116
|
*/
|
|
72
117
|
function renderNginx(app, a) {
|
|
73
118
|
const policy = (0, allowlist_1.buildPolicy)(a).replace(/\{N\}/g, '$request_id');
|
|
119
|
+
const placeholder = noncePlaceholder(a);
|
|
120
|
+
const q = placeholder.includes("'") ? '"' : "'";
|
|
74
121
|
const headers = (indent, extra = []) => [
|
|
75
122
|
...SECURITY_HEADERS(a).map(([k, v]) => [k, v, true]),
|
|
76
123
|
['Content-Security-Policy', policy, true],
|
|
@@ -88,10 +135,13 @@ function renderNginx(app, a) {
|
|
|
88
135
|
' root /usr/share/nginx/html;',
|
|
89
136
|
' index index.html;',
|
|
90
137
|
'',
|
|
91
|
-
` # Per-request CSP nonce: the release build (secure: true) leaves ${
|
|
138
|
+
` # Per-request CSP nonce: the release build (secure: true) leaves ${placeholder}`,
|
|
92
139
|
' # where the nonce goes.',
|
|
93
140
|
' sub_filter_once off;',
|
|
94
|
-
` sub_filter
|
|
141
|
+
` sub_filter ${q}${placeholder}${q} $request_id;`,
|
|
142
|
+
...(a.extraHeaders?.length || a.unsetHeaders?.length
|
|
143
|
+
? [' # (extra-headers and unset-headers in csp-allowlist.json are for Apache only.)']
|
|
144
|
+
: []),
|
|
95
145
|
'',
|
|
96
146
|
' location / {',
|
|
97
147
|
' try_files $uri $uri/ /index.html;',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/lib/csp/render.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../../src/lib/csp/render.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,8 +36,9 @@ export interface PreparedEnv {
|
|
|
36
36
|
restore: () => void;
|
|
37
37
|
}
|
|
38
38
|
/**
|
|
39
|
-
* Release-build preparation of an env file
|
|
40
|
-
*
|
|
41
|
-
*
|
|
39
|
+
* Release-build preparation of an env file, in every env (DEV too): recovers a crashed build,
|
|
40
|
+
* backs the file up, fills `${VAR}` placeholders, stamps the build time and branch, encrypts;
|
|
41
|
+
* `restore()` puts the original back. DEV files may not hold placeholders (`nx serve` reads them
|
|
42
|
+
* as they are).
|
|
42
43
|
*/
|
|
43
44
|
export declare function prepareEnvFile(opts: PrepareEnvOptions): PreparedEnv;
|
|
@@ -16,9 +16,10 @@ const sensitive_1 = require("./sensitive");
|
|
|
16
16
|
const stamp_1 = require("./stamp");
|
|
17
17
|
const rel = (root, file) => path.relative(root, file).split(path.sep).join('/');
|
|
18
18
|
/**
|
|
19
|
-
* Release-build preparation of an env file
|
|
20
|
-
*
|
|
21
|
-
*
|
|
19
|
+
* Release-build preparation of an env file, in every env (DEV too): recovers a crashed build,
|
|
20
|
+
* backs the file up, fills `${VAR}` placeholders, stamps the build time and branch, encrypts;
|
|
21
|
+
* `restore()` puts the original back. DEV files may not hold placeholders (`nx serve` reads them
|
|
22
|
+
* as they are).
|
|
22
23
|
*/
|
|
23
24
|
function prepareEnvFile(opts) {
|
|
24
25
|
const log = opts.log ?? ((m) => console.log(m));
|
|
@@ -49,7 +50,6 @@ function prepareEnvFile(opts) {
|
|
|
49
50
|
'placeholders; keep them in the UAT/PROD files only.');
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
|
-
return noop;
|
|
53
53
|
}
|
|
54
54
|
// One release build at a time per file; others using the same files wait. Sorted, so two builds
|
|
55
55
|
// never take the same locks in a different order.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../../src/lib/env-encryption/prepare.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,qCAOkB;AAClB,qCAKkB;AAClB,uCAMmB;AACnB,yCAAoD;AACpD,uCAA2C;AAC3C,+BAA2D;AAC3D,iDAAuE;AACvE,iDAAoG;AACpG,2CAA6C;AAC7C,mCAAsC;AAqCtC,MAAM,GAAG,GAAG,CAAC,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEhG
|
|
1
|
+
{"version":3,"file":"prepare.js","sourceRoot":"","sources":["../../../../src/lib/env-encryption/prepare.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ export interface MinifyOptions {
|
|
|
39
39
|
export declare function stripOutput(served: string, o: StripOptions): Promise<StripResult>;
|
|
40
40
|
/** Removes `/* … *\/` blocks (license ones too) outside quoted strings and unquoted url(…). */
|
|
41
41
|
export declare function stripCssComments(css: string): string;
|
|
42
|
+
/** Comments outside tags and <script>/<style> content; SSI and IE conditionals stay. */
|
|
42
43
|
export declare function stripHtmlComments(html: string): string;
|
|
43
44
|
/**
|
|
44
45
|
* One terser pass over a file. A file guessed to be an ES module that terser cannot parse as one
|
|
@@ -4,10 +4,9 @@ exports.isModuleCode = exports.minifyOptions = exports.minifyFile = exports.stri
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const fs = tslib_1.__importStar(require("fs"));
|
|
6
6
|
const path = tslib_1.__importStar(require("path"));
|
|
7
|
+
const tags_1 = require("../html/tags");
|
|
7
8
|
const files_1 = require("./files");
|
|
8
9
|
const SKIP_DIRS = ['assets'];
|
|
9
|
-
/** Plain comments; SSI (`<!--#…`) and IE conditionals (`<!--[if …`, `<!--<![endif]`) stay. */
|
|
10
|
-
const HTML_COMMENT = /<!--(?!#|\[if|<!\[endif)[\s\S]*?-->/g;
|
|
11
10
|
/** A tag with Angular's hydration attribute `ngh`. */
|
|
12
11
|
const NGH_ATTRIBUTE = /<[^>]*\sngh(?:\s*=|[\s/>])/;
|
|
13
12
|
const TOP_LEVEL_MODULE_SYNTAX = /^\s*(import|export)\b/m;
|
|
@@ -84,8 +83,9 @@ function stripCssComments(css) {
|
|
|
84
83
|
return out;
|
|
85
84
|
}
|
|
86
85
|
exports.stripCssComments = stripCssComments;
|
|
86
|
+
/** Comments outside tags and <script>/<style> content; SSI and IE conditionals stay. */
|
|
87
87
|
function stripHtmlComments(html) {
|
|
88
|
-
return
|
|
88
|
+
return (0, tags_1.stripHtmlCommentsSafe)(html);
|
|
89
89
|
}
|
|
90
90
|
exports.stripHtmlComments = stripHtmlComments;
|
|
91
91
|
/**
|