Skip to content

[fix] remove vestigial JSON server_data #6382

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

Merged
merged 4 commits into from
Aug 29, 2022
Merged

[fix] remove vestigial JSON server_data #6382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1673149
remove vestigial JSON serialization of server_data
Conduitry Aug 29, 2022
ae09a98
remove server_data as an allowed payload script attribute
Conduitry Aug 29, 2022
c6ad581
update test
Conduitry Aug 29, 2022
8c571ee
add changeset
Conduitry Aug 29, 2022
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/quiet-poems-tease.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@sveltejs/kit': patch
---

[fix] remove unnecessary JSON serialization of server data
9 changes: 0 additions & 9 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 @@ -299,15 +299,6 @@ export async function render_response({
);
}

if (branch.some((node) => node.server_data)) {
serialized_data.push(
render_json_payload_script(
{ type: 'server_data' },
branch.map(({ server_data }) => server_data)
)
);
}

if (validation_errors) {
serialized_data.push(
render_json_payload_script({ type: 'validation_errors' }, validation_errors)
Expand Down
10 changes: 6 additions & 4 deletions packages/kit/src/utils/escape.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,24 @@ import { render_json_payload_script, escape_html_attr } from './escape.js';
const json = suite('render_json_payload_script');

json('escapes slashes', () => {
// The type here doesn't really matter for the purposes of escaping,
// but we want to avoid upsetting TypeScript.
assert.equal(
render_json_payload_script({ type: 'server_data' }, [
render_json_payload_script({ type: 'validation_errors' }, [
{ unsafe: '</script><script>alert("xss")' }
]),
'<script type="application/json" sveltekit:data-type="server_data">' +
'<script type="application/json" sveltekit:data-type="validation_errors">' +
'[{"unsafe":"\\u003C/script>\\u003Cscript>alert(\\"xss\\")"}]' +
'</script>'
);
});

json('escapes exclamation marks', () => {
assert.equal(
render_json_payload_script({ type: 'server_data' }, [
render_json_payload_script({ type: 'validation_errors' }, [
{ '<!--</script>...-->alert("xss")': 'unsafe' }
]),
'<script type="application/json" sveltekit:data-type="server_data">' +
'<script type="application/json" sveltekit:data-type="validation_errors">' +
'[{"\\u003C!--\\u003C/script>...-->alert(\\"xss\\")":"unsafe"}]' +
'</script>'
);
Expand Down
1 change: 0 additions & 1 deletion packages/kit/types/internal.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ export interface PageNode {

export type PayloadScriptAttributes =
| { type: 'data'; url: string; body?: string }
| { type: 'server_data' }
| { type: 'validation_errors' };

export interface PrerenderDependency {
Expand Down