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.

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: introduce escape utility and use it to escape html attribute #2534

Merged
merged 5 commits into from
Oct 1, 2021

Conversation

dominikg
Copy link
Member

@dominikg dominikg commented Oct 1, 2021

and body of injected data script block

possibly fixes #2530

full json escape is a proto implementation and tests fail locally for me. Unfortunately i wasn't able to tell if it's just bc fixtures need updating or there's an issue with the way it's encoded.

cc @Conduitry

Before submitting the PR, please make sure you do the following

  • It's really useful if your PR references an issue where it is discussed ahead of time. In many cases, features are absent for a reason. For large changes, please create an RFC: https://github.com/sveltejs/rfcs
  • This message body should clearly illustrate what problems it solves.
  • Ideally, include a test that fails without this PR but passes with it.

Tests

  • Run the tests with pnpm test and lint the project with pnpm lint and pnpm check

Changesets

  • If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running pnpx changeset and following the prompts. All changesets should be patch until SvelteKit 1.0

@changeset-bot
Copy link

changeset-bot bot commented Oct 1, 2021

🦋 Changeset detected

Latest commit: 1ad6a12

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
@sveltejs/kit Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@Conduitry
Copy link
Member

Thanks! I've tidied a couple of function names, fixed the escaping of the selector on the other end where we retrieve the serialized endpoint response, and added a changeset. I'm going to watch the tests and then I think we're ready to go.

@Conduitry
Copy link
Member

Oh, I should also say that I've pulled down the repro in #2530 and run it locally with this branch, and things seem to be working fine. The attribute value in the HTML gets escaped properly, and then it's successfully retrieved later with document.querySelector.

@Conduitry Conduitry merged commit 59badb5 into sveltejs:master Oct 1, 2021
@github-actions github-actions bot mentioned this pull request Oct 1, 2021
@dominikg dominikg deleted the fix/escape-data branch October 9, 2021 13:22
@dominikg dominikg mentioned this pull request Feb 26, 2022
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

XSS using data-url when doing SSR
2 participants