Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: page response missing CSP and Link headers when return promise in load #12418

Merged
merged 4 commits into from
Oct 10, 2024
Merged

fix: page response missing CSP and Link headers when return promise in load #12418

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e4c1ffa
fix: page response missing CSP and Link headers when return promise i…
0x221A Jun 30, 2024
068a914
fix: add nonce in stream data part
0x221A Jun 30, 2024
fce240d
Merge branch 'sveltejs:main' into main
0x221A Oct 10, 2024
c8eb682
test: ensure CSP header in stream response
0x221A Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tidy-timers-perform.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

fix: page response missing CSP and Link headers when return promise in `load`
12 changes: 7 additions & 5 deletions packages/kit/src/runtime/server/page/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ export async function render_response({
event,
options,
branch.map((b) => b.server_data),
csp,
global
);

Expand Down Expand Up @@ -511,9 +512,7 @@ export async function render_response({
type: 'bytes'
}),
{
headers: {
'content-type': 'text/html'
}
headers
eltigerchino marked this conversation as resolved.
Show resolved Hide resolved
}
);
}
Expand All @@ -524,10 +523,11 @@ export async function render_response({
* @param {import('@sveltejs/kit').RequestEvent} event
* @param {import('types').SSROptions} options
* @param {Array<import('types').ServerDataNode | null>} nodes
* @param {import('./csp.js').Csp} csp
* @param {string} global
* @returns {{ data: string, chunks: AsyncIterable<string> | null }}
*/
function get_data(event, options, nodes, global) {
function get_data(event, options, nodes, csp, global) {
let promise_id = 1;
let count = 0;

Expand Down Expand Up @@ -566,7 +566,9 @@ function get_data(event, options, nodes, global) {
str = devalue.uneval({ id, data, error }, replacer);
}

push(`<script>${global}.resolve(${str})</script>\n`);
push(
`<script${csp.script_needs_nonce ? ` nonce="${csp.nonce}"` : ''}>${global}.resolve(${str})</script>\n`
);
if (count === 0) done();
}
);
Expand Down
Loading