encoding/xml: validate element and attribute names in Encoder#78560
Open
mohammadmseet-hue wants to merge 1 commit intogolang:masterfrom
Open
encoding/xml: validate element and attribute names in Encoder#78560mohammadmseet-hue wants to merge 1 commit intogolang:masterfrom
mohammadmseet-hue wants to merge 1 commit intogolang:masterfrom
Conversation
Contributor
|
This PR (HEAD: dfe2abe) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/763540. Important tips:
|
Contributor
|
Message from Gopher Robot: Patch Set 1: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/763540. |
The xml.Encoder and xml.Marshal functions write element and attribute names directly to the output without validation. If an application passes attacker-controlled strings as Name.Local (via XMLName fields, EncodeElement, or EncodeToken), the output contains unescaped XML special characters, enabling XML injection. This is inconsistent with the existing validation for ProcInst targets (which calls isNameString) and the escaping of namespace values (which calls EscapeString). The fix adds isNameString validation to writeStart (for both element names and attribute names) and writeEnd, matching the validation already applied to ProcInst targets. Invalid names now return an error instead of producing malformed XML. Added TestEncodeTokenInvalidNames and TestMarshalInvalidXMLName covering element name injection, attribute name injection, and ProcInst validation as control.
dfe2abe to
76631d0
Compare
Contributor
|
This PR (HEAD: 76631d0) has been imported to Gerrit for code review. Please visit Gerrit at https://go-review.googlesource.com/c/go/+/763540. Important tips:
|
Contributor
|
Message from Mohammad Seet: Patch Set 3: (1 comment) Please don’t reply on this GitHub thread. Visit golang.org/cl/763540. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The xml.Encoder and xml.Marshal functions write element and attribute
names directly to the output without validation. If an application
passes attacker-controlled strings as Name.Local (via XMLName fields,
EncodeElement, or EncodeToken), the output contains unescaped XML
special characters, enabling XML injection.
This is inconsistent with the existing validation for ProcInst
targets (which calls isNameString at marshal.go:240) and the
escaping of namespace values (which calls EscapeString).
A crafted Name.Local value can inject arbitrary XML elements:
This affects Marshal, MarshalIndent, EncodeToken, and
EncodeElement when Name.Local is attacker-controlled.
Attribute names are equally affected via EncodeToken with
StartElement containing crafted Attr Name.Local values.
The fix adds isNameString validation to writeStart (for both
element and attribute names) and writeEnd, matching the
validation already applied to ProcInst targets. Invalid names
now return an error instead of producing malformed XML.
Added TestEncodeTokenInvalidNames and TestMarshalInvalidXMLName.