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

Jump to bottom

html/template: errors returned from MarshalJSON are not correctly escaped [1.22 backport] #65969

Closed
gopherbot opened this issue Feb 27, 2024 · 2 comments
Closed

html/template: errors returned from MarshalJSON are not correctly escaped [1.22 backport] #65969

gopherbot opened this issue Feb 27, 2024 · 2 comments
Labels
CherryPickApproved Used during the release process for point releases Security
Milestone
Go1.22.1

Comments

@gopherbot
Copy link
Contributor

@rolandshoemaker requested issue #65697 to be considered for backport to the next 1.22 minor release.

@gopherbot please open backport issues, this is a PUBLIC track security issue.
@gopherbot gopherbot added CherryPickCandidate Used during the release process for point releases Security labels Feb 27, 2024
@gopherbot gopherbot mentioned this issue Feb 27, 2024
Closed
@gopherbot gopherbot added this to the Go1.22.1 milestone Feb 27, 2024
@rolandshoemaker rolandshoemaker added CherryPickApproved Used during the release process for point releases and removed CherryPickCandidate Used during the release process for point releases labels Feb 27, 2024
@gopherbot
Copy link
Contributor Author

Change https://go.dev/cl/567535 mentions this issue: [release-branch.go1.22] html/template: escape additional tokens in MarshalJSON errors

@gopherbot
Copy link
Contributor Author

Closed by merging 056b0ed to release-branch.go1.22.

gopherbot pushed a commit that referenced this issue Feb 28, 2024
@rolandshoemaker @cagedmantis
[release-branch.go1.22] html/template: escape additional tokens in Ma…
056b0ed 
…rshalJSON errors

Escape "</script" and "<!--" in errors returned from MarshalJSON errors
when attempting to marshal types in script blocks. This prevents any
user controlled content from prematurely terminating the script block.

Updates #65697
Fixes #65969

Change-Id: Icf0e26c54ea7d9c1deed0bff11b6506c99ddef1b
Reviewed-on: https://go-review.googlesource.com/c/go/+/564196
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
(cherry picked from commit ccbc725)
Reviewed-on: https://go-review.googlesource.com/c/go/+/567535
Reviewed-by: Carlos Amedee <carlos@golang.org>
bradfitz pushed a commit to tailscale/go that referenced this issue Mar 5, 2024
@rolandshoemaker @bradfitz
[release-branch.go1.22] html/template: escape additional tokens in Ma…
0249524 
…rshalJSON errors

Escape "</script" and "<!--" in errors returned from MarshalJSON errors
when attempting to marshal types in script blocks. This prevents any
user controlled content from prematurely terminating the script block.

Updates golang#65697
Fixes golang#65969

Change-Id: Icf0e26c54ea7d9c1deed0bff11b6506c99ddef1b
Reviewed-on: https://go-review.googlesource.com/c/go/+/564196
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
(cherry picked from commit ccbc725)
Reviewed-on: https://go-review.googlesource.com/c/go/+/567535
Reviewed-by: Carlos Amedee <carlos@golang.org>
romaindoumenc pushed a commit to TroutSoftware/go that referenced this issue Mar 6, 2024
@rolandshoemaker @romaindoumenc
[release-branch.go1.22] html/template: escape additional tokens in Ma…
16afdc0 
…rshalJSON errors

Escape "</script" and "<!--" in errors returned from MarshalJSON errors
when attempting to marshal types in script blocks. This prevents any
user controlled content from prematurely terminating the script block.

Updates golang#65697
Fixes golang#65969

Change-Id: Icf0e26c54ea7d9c1deed0bff11b6506c99ddef1b
Reviewed-on: https://go-review.googlesource.com/c/go/+/564196
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
(cherry picked from commit ccbc725)
Reviewed-on: https://go-review.googlesource.com/c/go/+/567535
Reviewed-by: Carlos Amedee <carlos@golang.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
CherryPickApproved Used during the release process for point releases Security
Projects
None yet
Milestone
Go1.22.1
Development

No branches or pull requests
2 participants
@rolandshoemaker @gopherbot