@decocms/tanstack 8.9.0 → 8.10.0
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/README.md +4 -4
- package/dist/csp.d.ts +32 -0
- package/dist/csp.d.ts.map +1 -0
- package/dist/csp.js +76 -0
- package/dist/csp.js.map +1 -0
- package/dist/index.d.ts +5 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -3
- package/dist/index.js.map +1 -1
- package/dist/react/DecoDocument.d.ts +16 -2
- package/dist/react/DecoDocument.d.ts.map +1 -1
- package/dist/react/DecoDocument.js +15 -10
- package/dist/react/DecoDocument.js.map +1 -1
- package/dist/studio.d.ts +20 -0
- package/dist/studio.d.ts.map +1 -1
- package/dist/studio.js +47 -0
- package/dist/studio.js.map +1 -1
- package/dist/worker/assignments.d.ts.map +1 -1
- package/dist/worker/assignments.js +3 -9
- package/dist/worker/assignments.js.map +1 -1
- package/dist/worker/cache.d.ts +10 -2
- package/dist/worker/cache.d.ts.map +1 -1
- package/dist/worker/cache.js +26 -2
- package/dist/worker/cache.js.map +1 -1
- package/dist/worker/drafts.d.ts +2 -1
- package/dist/worker/drafts.d.ts.map +1 -1
- package/dist/worker/drafts.js +3 -2
- package/dist/worker/drafts.js.map +1 -1
- package/dist/worker/index.d.ts +14 -2
- package/dist/worker/index.d.ts.map +1 -1
- package/dist/worker/index.js +26 -39
- package/dist/worker/index.js.map +1 -1
- package/dist/worker/security.d.ts +7 -6
- package/dist/worker/security.d.ts.map +1 -1
- package/dist/worker/security.js +14 -30
- package/dist/worker/security.js.map +1 -1
- package/package.json +2 -2
- package/src/csp.ts +99 -0
- package/src/index.ts +12 -3
- package/src/react/DecoDocument.tsx +30 -6
- package/src/studio.ts +47 -0
- package/src/worker/assignments.ts +4 -13
- package/src/worker/cache.ts +19 -2
- package/src/worker/drafts.ts +3 -2
- package/src/worker/index.ts +42 -44
- package/src/worker/security.ts +19 -33
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../../src/worker/drafts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,KAAK,GAAG,EAAmC,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAyBjG;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAMxE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,SAAS,CAAC,GAAG,OAAO,CAKjF;AAqBD,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/B;;;OAGG;IACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED
|
|
1
|
+
{"version":3,"file":"drafts.d.ts","sourceRoot":"","sources":["../../src/worker/drafts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAE,KAAK,GAAG,EAAmC,KAAK,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAyBjG;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,cAAc,GAAG,IAAI,CAMxE;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,SAAS,CAAC,GAAG,OAAO,CAKjF;AAqBD,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,OAAO,EAAE,cAAc,GAAG,IAAI,CAAC;IAC/B;;;OAGG;IACH,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB;;;;OAIG;IACH,WAAW,CAAC,EAAE,IAAI,CAAC;IACnB;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,UAAU,GAAG,cAAc,CAAC,EAC3D,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,CA6BxB"}
|
package/dist/worker/drafts.js
CHANGED
|
@@ -85,7 +85,8 @@ function serializeCookie(value, extra) {
|
|
|
85
85
|
* request first checks for the latest release, once (`cms.checkRelease()`),
|
|
86
86
|
* and the host check and every draft read share that check. A draft
|
|
87
87
|
* pointer is read once before the page renders (`forDraft(...).revision()`,
|
|
88
|
-
* the same read the page makes
|
|
88
|
+
* the same read the page makes: every draft read under the request's release
|
|
89
|
+
* check shares one read of the draft's files): a draft that can't
|
|
89
90
|
* be read gives the release and `unavailable`, never an error page.
|
|
90
91
|
*/
|
|
91
92
|
export async function decideDraft(cms, request) {
|
|
@@ -128,7 +129,7 @@ export async function decideDraft(cms, request) {
|
|
|
128
129
|
*/
|
|
129
130
|
function isDraftGone(error) {
|
|
130
131
|
for (let e = error, depth = 0; e instanceof Error && depth < 5; e = e.cause, depth++) {
|
|
131
|
-
if (/draft changes: HTTP (404|410)\b/.test(e.message))
|
|
132
|
+
if (/draft (?:changes|index): HTTP (?:404|410)\b/.test(e.message))
|
|
132
133
|
return true;
|
|
133
134
|
}
|
|
134
135
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/worker/drafts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AACH,OAAO,EAAY,iBAAiB,EAAE,YAAY,EAAuB,MAAM,iBAAiB,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAExD,MAAM,SAAS,GAAG,KAAK,CAAC;AACxB,mFAAmF;AACnF,MAAM,aAAa,GAAG,OAAO,CAAC;AAE9B,SAAS,UAAU,CAAC,GAAQ;IAC1B,OAAO,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,UAAU,CAAC,MAAqB,EAAE,IAAY;IACrD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACrC,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI;YAAE,SAAS;QAC7D,IAAI,CAAC;YACH,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACvD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,OAAgB;IAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACpD,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IACvC,OAAO,YAAY,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,cAAc,CAAC,OAAyC;IACtE,OAAO,CACL,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI;QACzC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,KAAK,IAAI,CACjE,CAAC;AACJ,CAAC;AAED,8FAA8F;AAC9F,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,MAAM,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAC1C,OAAO,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,OAAO,KAAK,aAAa,CAAC;AAC7D,CAAC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,KAAe;IACrD,4EAA4E;IAC5E,OAAO;QACL,GAAG,YAAY,IAAI,KAAK,EAAE;QAC1B,QAAQ;QACR,GAAG,KAAK;QACR,UAAU;QACV,QAAQ;QACR,eAAe;QACf,aAAa;KACd,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AA6BD
|
|
1
|
+
{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../src/worker/drafts.ts"],"names":[],"mappings":"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"}
|
package/dist/worker/index.d.ts
CHANGED
|
@@ -24,7 +24,8 @@
|
|
|
24
24
|
* copy never carries one. A page request with `Authorization` is never
|
|
25
25
|
* handed to it and answers `private, no-cache, no-store`. A response with no
|
|
26
26
|
* `CDN-Cache-Control` tells the CDN `no-store`, at one exit.
|
|
27
|
-
* - Security headers and `frame-ancestors
|
|
27
|
+
* - Security headers, and Studio's origins in the CSP (`frame-ancestors`,
|
|
28
|
+
* `script-src`: the Studio channel's list, `studioOrigins`); immutable fingerprinted
|
|
28
29
|
* assets; one `Set-Cookie` per cookie; `x-page-status`.
|
|
29
30
|
* - The visitor: on a page or server-function request, `readVisitor` from
|
|
30
31
|
* `@decocms/blocks/experiments` (the `deco_segment` cookie, or a new
|
|
@@ -109,8 +110,19 @@ export interface DecoWorkerOptions<Env = unknown> {
|
|
|
109
110
|
cms: CMS;
|
|
110
111
|
/** Local development (`import.meta.env.DEV`): `pageCache` is never called, loopback may frame the site. */
|
|
111
112
|
dev?: boolean;
|
|
112
|
-
/**
|
|
113
|
+
/**
|
|
114
|
+
* The site's Content-Security-Policy. Studio's origins are always added:
|
|
115
|
+
* to `frame-ancestors` (when the site sets none) and to `script-src`.
|
|
116
|
+
*/
|
|
113
117
|
csp?: CspOptions;
|
|
118
|
+
/**
|
|
119
|
+
* The Studio origins the CSP allows (`script-src`, `frame-ancestors`),
|
|
120
|
+
* exact origins. Default: `DECO_STUDIO_ORIGIN` (comma-separated), else
|
|
121
|
+
* Studio's production and staging origins (`studioOrigins()` of
|
|
122
|
+
* `@decocms/tanstack`). A site that sets `studioOrigins` on `DecoDocument`
|
|
123
|
+
* sets the same list here; `DECO_STUDIO_ORIGIN` sets both.
|
|
124
|
+
*/
|
|
125
|
+
studioOrigins?: readonly string[];
|
|
114
126
|
/**
|
|
115
127
|
* The site's own page cache (the example worker entry the README links), called for
|
|
116
128
|
* every page and server-function request `isCacheable` accepts. Without
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
package/dist/worker/index.js
CHANGED
|
@@ -24,7 +24,8 @@
|
|
|
24
24
|
* copy never carries one. A page request with `Authorization` is never
|
|
25
25
|
* handed to it and answers `private, no-cache, no-store`. A response with no
|
|
26
26
|
* `CDN-Cache-Control` tells the CDN `no-store`, at one exit.
|
|
27
|
-
* - Security headers and `frame-ancestors
|
|
27
|
+
* - Security headers, and Studio's origins in the CSP (`frame-ancestors`,
|
|
28
|
+
* `script-src`: the Studio channel's list, `studioOrigins`); immutable fingerprinted
|
|
28
29
|
* assets; one `Set-Cookie` per cookie; `x-page-status`.
|
|
29
30
|
* - The visitor: on a page or server-function request, `readVisitor` from
|
|
30
31
|
* `@decocms/blocks/experiments` (the `deco_segment` cookie, or a new
|
|
@@ -51,6 +52,7 @@ import { runInScope } from "@decocms/tanstack/scope";
|
|
|
51
52
|
import { ASSIGNMENTS_HEADER, serializeAssignments } from "../assignments.js";
|
|
52
53
|
import { draftResponseHeaders, RELEASE_CHECK_HEADER, VERSION_HEADER } from "../draft.js";
|
|
53
54
|
import { PAGE_STATUS_HEADER } from "../shared.js";
|
|
55
|
+
import { studioOrigins } from "../studio.js";
|
|
54
56
|
import { VISITOR_HEADER } from "../visitor.js";
|
|
55
57
|
import { readAssignments } from "./assignments.js";
|
|
56
58
|
import { isCacheable } from "./cache.js";
|
|
@@ -129,49 +131,33 @@ function mutable(response) {
|
|
|
129
131
|
export function createDecoWorker(options) {
|
|
130
132
|
const { cms, serverEntry } = options;
|
|
131
133
|
const dev = options.dev === true;
|
|
132
|
-
|
|
134
|
+
// On the first HTML response, not at creation: the environment is read where
|
|
135
|
+
// the document reads it.
|
|
136
|
+
let securityHeaders;
|
|
133
137
|
const preloadLinks = [
|
|
134
138
|
...(options.preload?.styles ?? []).map((href) => `<${href}>; rel=preload; as=style`),
|
|
135
139
|
...(options.preload?.fonts ?? []).map((href) => `<${href}>; rel=preload; as=font; crossorigin`),
|
|
136
140
|
];
|
|
137
|
-
// The
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
};
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
}
|
|
151
|
-
return releaseRedirects.list;
|
|
141
|
+
// The redirects block, read through the client (its body is held by hash
|
|
142
|
+
// once fetched). The page the URL routes to is prefetched first, so its
|
|
143
|
+
// subtree goes out in the same wave as the redirects block (the app's
|
|
144
|
+
// later reads find the bodies by hash) and this client pins the index the
|
|
145
|
+
// page's client pins.
|
|
146
|
+
async function redirectsFor(url, pointer, releaseCheck) {
|
|
147
|
+
const client = pointer ? cms.client({ version: pointer, releaseCheck }) : cms.client();
|
|
148
|
+
const [routes] = await client.routes();
|
|
149
|
+
const match = matchRoute(url, { routes: routes ?? [] });
|
|
150
|
+
if (match.kind === "match")
|
|
151
|
+
client.prefetch(match.entry.name);
|
|
152
|
+
const [list] = await client.redirects();
|
|
153
|
+
return list ?? [];
|
|
152
154
|
}
|
|
153
|
-
// The release's page templates, for `http.route`:
|
|
154
|
-
//
|
|
155
|
-
//
|
|
156
|
-
let metricRoutes;
|
|
155
|
+
// The release's page templates, for `http.route`: the index's routes, read
|
|
156
|
+
// only while telemetry is measuring (`recordServerRequest` calls the route
|
|
157
|
+
// function only then). The same array per revision, so its trie is built once.
|
|
157
158
|
async function routeTemplate(url) {
|
|
158
|
-
const
|
|
159
|
-
const
|
|
160
|
-
let routes = metricRoutes;
|
|
161
|
-
if (routes?.revision !== revision) {
|
|
162
|
-
const pages = client
|
|
163
|
-
.list("page")
|
|
164
|
-
.then(([list]) => (list ?? []).flatMap((p) => typeof p?.path === "string" ? [{ name: p.path, path: p.path }] : []));
|
|
165
|
-
const entry = { revision, pages };
|
|
166
|
-
metricRoutes = entry;
|
|
167
|
-
routes = entry;
|
|
168
|
-
// A failed read is tried again on the next request, not kept for the revision.
|
|
169
|
-
pages.catch(() => {
|
|
170
|
-
if (metricRoutes === entry)
|
|
171
|
-
metricRoutes = undefined;
|
|
172
|
-
});
|
|
173
|
-
}
|
|
174
|
-
const match = matchRoute(url, { routes: await routes.pages });
|
|
159
|
+
const [routes] = await cms.forRelease().routes();
|
|
160
|
+
const match = matchRoute(url, { routes: routes ?? [] });
|
|
175
161
|
return match.kind === "match" ? match.entry.path : undefined;
|
|
176
162
|
}
|
|
177
163
|
/**
|
|
@@ -205,7 +191,7 @@ export function createDecoWorker(options) {
|
|
|
205
191
|
}
|
|
206
192
|
async function findRedirect(url, pointer, releaseCheck) {
|
|
207
193
|
try {
|
|
208
|
-
const redirects = await redirectsFor(pointer, releaseCheck);
|
|
194
|
+
const redirects = await redirectsFor(url, pointer, releaseCheck);
|
|
209
195
|
if (!redirects.length)
|
|
210
196
|
return null;
|
|
211
197
|
const match = matchRoute(url, { routes: [], redirects });
|
|
@@ -411,6 +397,7 @@ export function createDecoWorker(options) {
|
|
|
411
397
|
response.headers.append("Set-Cookie", served.visitorCookie);
|
|
412
398
|
dedupeSetCookies(response);
|
|
413
399
|
if (isHtml(response)) {
|
|
400
|
+
securityHeaders ??= htmlSecurityHeaders(options.csp, dev, studioOrigins(options.studioOrigins));
|
|
414
401
|
for (const [k, v] of Object.entries(securityHeaders)) {
|
|
415
402
|
if (!response.headers.has(k))
|
|
416
403
|
response.headers.set(k, v);
|
package/dist/worker/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/worker/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
export declare const SECURITY_HEADERS: Readonly<Record<string, string>>;
|
|
2
2
|
export interface CspOptions {
|
|
3
|
-
/**
|
|
3
|
+
/**
|
|
4
|
+
* The enforced policy's directives. `frame-ancestors` is added when they
|
|
5
|
+
* have none; Studio's origins are added to `script-src` (`withStudioCsp`).
|
|
6
|
+
*/
|
|
4
7
|
enforce?: string | readonly string[];
|
|
5
|
-
/** Directives sent as `Content-Security-Policy-Report-Only
|
|
8
|
+
/** Directives sent as `Content-Security-Policy-Report-Only` (Studio's origins added to its `script-src`). */
|
|
6
9
|
reportOnly?: string | readonly string[];
|
|
7
10
|
/** More origins that may frame the site, besides Studio's (a marketing tool's editor). */
|
|
8
11
|
frameAncestors?: readonly string[];
|
|
9
12
|
}
|
|
10
|
-
/**
|
|
11
|
-
export declare function
|
|
12
|
-
/** Every HTML response's security headers. */
|
|
13
|
-
export declare function htmlSecurityHeaders(csp: CspOptions | undefined, dev: boolean): Record<string, string>;
|
|
13
|
+
/** Every HTML response's security headers. `studioOrigins`: the list the Studio channel trusts. */
|
|
14
|
+
export declare function htmlSecurityHeaders(csp: CspOptions | undefined, dev: boolean, studioOrigins?: readonly string[]): Record<string, string>;
|
|
14
15
|
//# sourceMappingURL=security.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../src/worker/security.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"security.d.ts","sourceRoot":"","sources":["../../src/worker/security.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,gBAAgB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAO7D,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;IACrC,6GAA6G;IAC7G,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAAC;IACxC,0FAA0F;IAC1F,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAED,mGAAmG;AACnG,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,UAAU,GAAG,SAAS,EAC3B,GAAG,EAAE,OAAO,EACZ,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,GAChC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxB"}
|
package/dist/worker/security.js
CHANGED
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* The headers every HTML response carries: v7's security headers, the site's
|
|
3
|
-
* Content-Security-Policy, and
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
* can
|
|
3
|
+
* Content-Security-Policy, and what Studio needs in it (`withStudioCsp`):
|
|
4
|
+
* `frame-ancestors` so Deco Studio's site editor (and nothing else the site
|
|
5
|
+
* doesn't name) can show the page in its frame, and Studio's origins in
|
|
6
|
+
* `script-src` so the Studio channel can import Studio's modules. No
|
|
7
|
+
* `X-Frame-Options`: `frame-ancestors` supersedes it and, unlike
|
|
8
|
+
* `SAMEORIGIN`, can allow Studio's origin.
|
|
7
9
|
*/
|
|
8
|
-
import {
|
|
10
|
+
import { cspDirectives, withStudioCsp } from "../csp.js";
|
|
9
11
|
export const SECURITY_HEADERS = {
|
|
10
12
|
"X-Content-Type-Options": "nosniff",
|
|
11
13
|
"Referrer-Policy": "strict-origin-when-cross-origin",
|
|
@@ -14,31 +16,13 @@ export const SECURITY_HEADERS = {
|
|
|
14
16
|
"Strict-Transport-Security": "max-age=63072000; includeSubDomains; preload",
|
|
15
17
|
"Cross-Origin-Opener-Policy": "same-origin-allow-popups",
|
|
16
18
|
};
|
|
17
|
-
/**
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
/** The `frame-ancestors` sources: Studio's, the site's own, and loopback in development. */
|
|
26
|
-
export function frameAncestors(csp, dev) {
|
|
27
|
-
return [
|
|
28
|
-
...new Set([
|
|
29
|
-
...STUDIO_FRAME_ANCESTORS,
|
|
30
|
-
...(csp?.frameAncestors ?? []),
|
|
31
|
-
...(dev ? LOOPBACK_ANCESTORS : []),
|
|
32
|
-
]),
|
|
33
|
-
];
|
|
34
|
-
}
|
|
35
|
-
/** Every HTML response's security headers. */
|
|
36
|
-
export function htmlSecurityHeaders(csp, dev) {
|
|
37
|
-
const enforce = directives(csp?.enforce);
|
|
38
|
-
if (!enforce.some((d) => /^frame-ancestors(\s|$)/i.test(d))) {
|
|
39
|
-
enforce.push(`frame-ancestors ${frameAncestors(csp, dev).join(" ")}`);
|
|
40
|
-
}
|
|
41
|
-
const reportOnly = directives(csp?.reportOnly);
|
|
19
|
+
/** Every HTML response's security headers. `studioOrigins`: the list the Studio channel trusts. */
|
|
20
|
+
export function htmlSecurityHeaders(csp, dev, studioOrigins) {
|
|
21
|
+
const options = { studioOrigins, frameAncestors: csp?.frameAncestors, dev };
|
|
22
|
+
const enforce = withStudioCsp(csp?.enforce, options);
|
|
23
|
+
const reportOnly = cspDirectives(csp?.reportOnly).length
|
|
24
|
+
? withStudioCsp(csp?.reportOnly, { ...options, addFrameAncestors: false })
|
|
25
|
+
: [];
|
|
42
26
|
return {
|
|
43
27
|
...SECURITY_HEADERS,
|
|
44
28
|
"Content-Security-Policy": enforce.join("; "),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/worker/security.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../src/worker/security.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAEzD,MAAM,CAAC,MAAM,gBAAgB,GAAqC;IAChE,wBAAwB,EAAE,SAAS;IACnC,iBAAiB,EAAE,iCAAiC;IACpD,oBAAoB,EAAE,0CAA0C;IAChE,kBAAkB,EAAE,eAAe;IACnC,2BAA2B,EAAE,8CAA8C;IAC3E,4BAA4B,EAAE,0BAA0B;CACzD,CAAC;AAcF,mGAAmG;AACnG,MAAM,UAAU,mBAAmB,CACjC,GAA2B,EAC3B,GAAY,EACZ,aAAiC;IAEjC,MAAM,OAAO,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC;IAC5E,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,MAAM;QACtD,CAAC,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,GAAG,OAAO,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC;QAC1E,CAAC,CAAC,EAAE,CAAC;IACP,OAAO;QACL,GAAG,gBAAgB;QACnB,yBAAyB,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;QAC7C,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,qCAAqC,EAAE,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/F,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@decocms/tanstack",
|
|
3
|
-
"version": "8.
|
|
3
|
+
"version": "8.10.0",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=24"
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
}
|
|
95
95
|
},
|
|
96
96
|
"devDependencies": {
|
|
97
|
-
"@decocms/blocks": "8.
|
|
97
|
+
"@decocms/blocks": "8.10.0",
|
|
98
98
|
"@tanstack/react-router": "1.170.39",
|
|
99
99
|
"@tanstack/react-start": "1.168.58",
|
|
100
100
|
"@types/react": "^19.0.0",
|
package/src/csp.ts
ADDED
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* What Studio needs in a page's Content Security Policy: its origins in
|
|
3
|
+
* `script-src` (the Studio channel imports Studio's modules from them) and in
|
|
4
|
+
* `frame-ancestors` (its site editor frames the page). The worker adds both to
|
|
5
|
+
* every HTML response's policy (`csp` of `createDecoWorker`); a site that
|
|
6
|
+
* writes its own policy elsewhere passes it through {@link withStudioCsp}.
|
|
7
|
+
* The origins are {@link studioOrigins}: the same list the Studio channel
|
|
8
|
+
* trusts. No framework code: safe in every bundle.
|
|
9
|
+
*/
|
|
10
|
+
import { STUDIO_FRAME_ANCESTORS, studioOrigins } from "./studio.ts";
|
|
11
|
+
|
|
12
|
+
/** A Studio on this machine, in local development. */
|
|
13
|
+
export const LOOPBACK_ANCESTORS: readonly string[] = Object.freeze([
|
|
14
|
+
"http://localhost:*",
|
|
15
|
+
"http://127.0.0.1:*",
|
|
16
|
+
]);
|
|
17
|
+
|
|
18
|
+
export interface StudioCspOptions {
|
|
19
|
+
/**
|
|
20
|
+
* Studio's origins; default {@link studioOrigins}() (`DECO_STUDIO_ORIGIN`,
|
|
21
|
+
* else production and staging). Read through {@link studioOrigins} like any
|
|
22
|
+
* other value: an entry that isn't an exact http(s) origin is dropped.
|
|
23
|
+
*/
|
|
24
|
+
studioOrigins?: readonly string[];
|
|
25
|
+
/** More origins that may frame the site, besides Studio's (a marketing tool's editor). */
|
|
26
|
+
frameAncestors?: readonly string[];
|
|
27
|
+
/** Local development: loopback may frame the site. */
|
|
28
|
+
dev?: boolean;
|
|
29
|
+
/** Add `frame-ancestors` when the directives have none. Default `true`. */
|
|
30
|
+
addFrameAncestors?: boolean;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
/** The directives of a policy (`"a; b"` or `["a", "b"]`), trimmed, empty ones dropped. */
|
|
34
|
+
export function cspDirectives(value: string | readonly string[] | undefined): string[] {
|
|
35
|
+
if (value === undefined) return [];
|
|
36
|
+
const list = typeof value === "string" ? value.split(";") : [...value];
|
|
37
|
+
return list.map((d) => d.trim()).filter(Boolean);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
const nameOf = (directive: string) => (directive.split(/\s+/, 1)[0] ?? "").toLowerCase();
|
|
41
|
+
const isNone = (values: readonly string[]) =>
|
|
42
|
+
values.length === 1 && values[0]?.toLowerCase() === "'none'";
|
|
43
|
+
|
|
44
|
+
/** `directive` with each of `sources` it lacks appended; one that is `'none'` stays as is. */
|
|
45
|
+
function withSources(directive: string, sources: readonly string[]): string {
|
|
46
|
+
const [name = "", ...values] = directive.split(/\s+/);
|
|
47
|
+
if (isNone(values)) return directive;
|
|
48
|
+
const have = new Set(values.map((v) => v.toLowerCase()));
|
|
49
|
+
const extra = sources.filter((s) => !have.has(s.toLowerCase()));
|
|
50
|
+
return extra.length ? [name, ...values, ...extra].join(" ") : directive;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
/** The `frame-ancestors` sources: Studio's, the site's own, and loopback in development. */
|
|
54
|
+
export function studioFrameAncestors(options: StudioCspOptions = {}): string[] {
|
|
55
|
+
return [
|
|
56
|
+
...new Set([
|
|
57
|
+
...STUDIO_FRAME_ANCESTORS,
|
|
58
|
+
...studioOrigins(options.studioOrigins),
|
|
59
|
+
...(options.frameAncestors ?? []),
|
|
60
|
+
...(options.dev ? LOOPBACK_ANCESTORS : []),
|
|
61
|
+
]),
|
|
62
|
+
];
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* A policy's directives with what Studio needs added: Studio's origins in
|
|
67
|
+
* `script-src` (and `script-src-elem`), so the Studio channel can import
|
|
68
|
+
* Studio's modules, and a `frame-ancestors` with Studio's (when the policy has
|
|
69
|
+
* none). A policy that restricts scripts only through `default-src` gets a
|
|
70
|
+
* `script-src` with `default-src`'s sources plus Studio's, which allows the
|
|
71
|
+
* same scripts as before and Studio's modules. A policy that doesn't restrict
|
|
72
|
+
* scripts, or forbids them all (`'none'`), keeps its scripts as they are.
|
|
73
|
+
* A site's own `frame-ancestors` is kept as is.
|
|
74
|
+
*/
|
|
75
|
+
export function withStudioCsp(
|
|
76
|
+
directives: string | readonly string[] | undefined,
|
|
77
|
+
options: StudioCspOptions = {},
|
|
78
|
+
): string[] {
|
|
79
|
+
const origins = studioOrigins(options.studioOrigins);
|
|
80
|
+
let list = cspDirectives(directives);
|
|
81
|
+
if (origins.length) {
|
|
82
|
+
const isScript = (d: string) => ["script-src", "script-src-elem"].includes(nameOf(d));
|
|
83
|
+
if (list.some(isScript)) {
|
|
84
|
+
list = list.map((d) => (isScript(d) ? withSources(d, origins) : d));
|
|
85
|
+
} else {
|
|
86
|
+
const fallback = list.find((d) => nameOf(d) === "default-src");
|
|
87
|
+
const values = fallback?.split(/\s+/).slice(1) ?? [];
|
|
88
|
+
if (fallback && !isNone(values)) {
|
|
89
|
+
list.push(withSources(["script-src", ...values].join(" "), origins));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
if (options.addFrameAncestors !== false && !list.some((d) => nameOf(d) === "frame-ancestors")) {
|
|
94
|
+
list.push(
|
|
95
|
+
`frame-ancestors ${studioFrameAncestors({ ...options, studioOrigins: origins }).join(" ")}`,
|
|
96
|
+
);
|
|
97
|
+
}
|
|
98
|
+
return list;
|
|
99
|
+
}
|
package/src/index.ts
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* `@decocms/tanstack`: the names and lists the worker, the server helpers and
|
|
3
3
|
* the document share, for a site that needs them in its own code (a route
|
|
4
|
-
* that sets its own headers, a CSP it writes itself
|
|
5
|
-
*
|
|
4
|
+
* that sets its own headers, a CSP it writes itself: `withStudioCsp` adds
|
|
5
|
+
* Studio's origins to it, as the worker does). No framework imports, no
|
|
6
|
+
* state: safe in every bundle.
|
|
6
7
|
*/
|
|
7
8
|
export { ASSIGNMENTS_HEADER } from "./assignments.ts";
|
|
9
|
+
export { type StudioCspOptions, withStudioCsp } from "./csp.ts";
|
|
8
10
|
export { DRAFT_COOKIE, DRAFT_PARAM, draftResponseHeaders, VERSION_HEADER } from "./draft.ts";
|
|
9
|
-
export {
|
|
11
|
+
export {
|
|
12
|
+
DEFAULT_STUDIO_ORIGINS,
|
|
13
|
+
isStudioOrigin,
|
|
14
|
+
STUDIO_FRAME_ANCESTORS,
|
|
15
|
+
STUDIO_ORIGIN,
|
|
16
|
+
STUDIO_ORIGINS,
|
|
17
|
+
studioOrigins,
|
|
18
|
+
} from "./studio.ts";
|
|
10
19
|
export { VISITOR_HEADER } from "./visitor.ts";
|
|
@@ -11,15 +11,20 @@
|
|
|
11
11
|
* - `StudioBridge` (in Studio's frame it answers Studio's origins,
|
|
12
12
|
* `STUDIO_ORIGINS`; outside it, "." opens the page in Studio's editor, with
|
|
13
13
|
* the page's `pathTemplate` from the route's loader data) and `DraftBadge`
|
|
14
|
-
* (only on a draft page outside Studio's frame), from `@decocms/blocks/preview
|
|
14
|
+
* (only on a draft page outside Studio's frame), from `@decocms/blocks/preview`;
|
|
15
|
+
* - `StudioChannel` (every page, production included: framed by one of
|
|
16
|
+
* Studio's origins, `studioOrigins` / `DECO_STUDIO_ORIGIN` / Studio's
|
|
17
|
+
* production and staging origins, each exact, it loads the editor's own
|
|
18
|
+
* modules from that origin; otherwise it does nothing). The worker adds the
|
|
19
|
+
* same origins to the page's CSP `script-src` and `frame-ancestors`.
|
|
15
20
|
*
|
|
16
21
|
* A site that keeps its own document renders `DecoPreview` in its `<body>`
|
|
17
22
|
* for the bridge, the badge and the draft they read.
|
|
18
23
|
*/
|
|
19
|
-
import { DraftBadge, StudioBridge } from "@decocms/blocks/preview";
|
|
24
|
+
import { DraftBadge, StudioBridge, StudioChannel } from "@decocms/blocks/preview";
|
|
20
25
|
import { HeadContent, Outlet, ScriptOnce, Scripts, useRouterState } from "@tanstack/react-router";
|
|
21
26
|
import { type ReactNode, useEffect, useRef, useState } from "react";
|
|
22
|
-
import { STUDIO_ORIGINS } from "../studio.ts";
|
|
27
|
+
import { STUDIO_ORIGINS, studioOrigins } from "../studio.ts";
|
|
23
28
|
import { pageValues, publishScript } from "./pageValues.ts";
|
|
24
29
|
import { DATA_EVENT_OBSERVER, eventsBootstrap, PROGRESS_CSS } from "./scripts.ts";
|
|
25
30
|
|
|
@@ -95,14 +100,15 @@ function studioPageOf(
|
|
|
95
100
|
return undefined;
|
|
96
101
|
}
|
|
97
102
|
|
|
98
|
-
/** The Studio bridge, with the page on screen, and the badge for the request's draft. */
|
|
103
|
+
/** The Studio bridge, with the page on screen, the Studio channel, and the badge for the request's draft. */
|
|
99
104
|
function StudioPieces({
|
|
100
105
|
site,
|
|
101
106
|
editShortcut,
|
|
102
107
|
nonce,
|
|
108
|
+
studioOrigins: origins,
|
|
103
109
|
draft,
|
|
104
110
|
draftUnavailable,
|
|
105
|
-
}: Pick<DecoPreviewProps, "site" | "editShortcut" | "nonce"> & {
|
|
111
|
+
}: Pick<DecoPreviewProps, "site" | "editShortcut" | "nonce" | "studioOrigins"> & {
|
|
106
112
|
draft: string | undefined;
|
|
107
113
|
draftUnavailable?: boolean;
|
|
108
114
|
}) {
|
|
@@ -118,6 +124,7 @@ function StudioPieces({
|
|
|
118
124
|
page={{ pathTemplate, id: pageId }}
|
|
119
125
|
nonce={nonce}
|
|
120
126
|
/>
|
|
127
|
+
<StudioChannel studioOrigins={studioOrigins(origins)} nonce={nonce} />
|
|
121
128
|
<DraftBadge pointer={draft ?? null} unavailable={draftUnavailable} />
|
|
122
129
|
</>
|
|
123
130
|
);
|
|
@@ -135,6 +142,13 @@ export interface DecoPreviewProps {
|
|
|
135
142
|
editShortcut?: boolean;
|
|
136
143
|
/** The CSP nonce for the inline scripts, when the site enforces one. */
|
|
137
144
|
nonce?: string;
|
|
145
|
+
/**
|
|
146
|
+
* The Studio origins the Studio channel trusts, each an exact origin.
|
|
147
|
+
* Default: `DECO_STUDIO_ORIGIN` (comma-separated), else Studio's production
|
|
148
|
+
* and staging origins (`DEFAULT_STUDIO_ORIGINS`). A site that sets it sets
|
|
149
|
+
* the worker's `studioOrigins` too, so its CSP allows the same origins.
|
|
150
|
+
*/
|
|
151
|
+
studioOrigins?: readonly string[];
|
|
138
152
|
}
|
|
139
153
|
|
|
140
154
|
/**
|
|
@@ -143,7 +157,7 @@ export interface DecoPreviewProps {
|
|
|
143
157
|
* draft and CDN segment token published to the browser, `StudioBridge` and
|
|
144
158
|
* `DraftBadge`. Render it once, in the `<body>`.
|
|
145
159
|
*/
|
|
146
|
-
export function DecoPreview({ site, editShortcut, nonce }: DecoPreviewProps) {
|
|
160
|
+
export function DecoPreview({ site, editShortcut, nonce, studioOrigins }: DecoPreviewProps) {
|
|
147
161
|
const values = pageValues();
|
|
148
162
|
const publish = publishScript(values);
|
|
149
163
|
return (
|
|
@@ -159,6 +173,7 @@ export function DecoPreview({ site, editShortcut, nonce }: DecoPreviewProps) {
|
|
|
159
173
|
site={site}
|
|
160
174
|
editShortcut={editShortcut}
|
|
161
175
|
nonce={nonce}
|
|
176
|
+
studioOrigins={studioOrigins}
|
|
162
177
|
draft={values.draft}
|
|
163
178
|
draftUnavailable={values.draftUnavailable}
|
|
164
179
|
/>
|
|
@@ -188,6 +203,13 @@ export interface DecoDocumentProps {
|
|
|
188
203
|
editShortcut?: boolean;
|
|
189
204
|
/** The CSP nonce for the inline scripts, when the site enforces one. */
|
|
190
205
|
nonce?: string;
|
|
206
|
+
/**
|
|
207
|
+
* The Studio origins the Studio channel trusts, each an exact origin.
|
|
208
|
+
* Default: `DECO_STUDIO_ORIGIN` (comma-separated), else Studio's production
|
|
209
|
+
* and staging origins (`DEFAULT_STUDIO_ORIGINS`). A site that sets it sets
|
|
210
|
+
* the worker's `studioOrigins` too, so its CSP allows the same origins.
|
|
211
|
+
*/
|
|
212
|
+
studioOrigins?: readonly string[];
|
|
191
213
|
/** Rendered after the page (toasts, drawers, analytics). */
|
|
192
214
|
children?: ReactNode;
|
|
193
215
|
}
|
|
@@ -201,6 +223,7 @@ export function DecoDocument({
|
|
|
201
223
|
outlet = "main",
|
|
202
224
|
editShortcut,
|
|
203
225
|
nonce,
|
|
226
|
+
studioOrigins,
|
|
204
227
|
children,
|
|
205
228
|
}: DecoDocumentProps) {
|
|
206
229
|
// Pages wait for this signal before running work that must follow hydration.
|
|
@@ -239,6 +262,7 @@ export function DecoDocument({
|
|
|
239
262
|
site={site}
|
|
240
263
|
editShortcut={editShortcut}
|
|
241
264
|
nonce={nonce}
|
|
265
|
+
studioOrigins={studioOrigins}
|
|
242
266
|
draft={values.draft}
|
|
243
267
|
draftUnavailable={values.draftUnavailable}
|
|
244
268
|
/>
|