Groovy 12103 part2#2626
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR tightens XML output safety in the groovy-xml subproject by rejecting comment / processing-instruction payloads that could prematurely terminate their respective constructs (e.g., -- in comments and ?> in processing instructions), and adds regression tests to validate the new behavior.
Changes:
- Add injection-focused tests for
MarkupBuilder,StreamingMarkupBuilder, andStreamingDOMBuildercomment/PI handling. - Add validation to
MarkupBuilderHelper.comment(String)to reject comment terminators (--). - Add reusable validation closures in
AbstractStreamingBuilderand apply them inStreamingMarkupBuilder/StreamingDOMBuilderfor comments and processing instructions.
Reviewed changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| subprojects/groovy-xml/src/test/groovy/groovy/xml/MarkupBuilderInjectionTest.groovy | Adds regression tests for comment/PI injection prevention across builders. |
| subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java | Rejects XML comment text containing -- to prevent malformed output/injection. |
| subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy | Adds PI/comment validation helpers and PI map rendering guardrails. |
| subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy | Applies new validation to streaming comment/PI emission. |
| subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy | Applies new validation to DOM comment/PI creation. |
…nators in all output paths
paulk-asert
force-pushed
the
GROOVY-12103-part2
branch
from
ab8e02d to
0d4429a
Compare
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.
No description provided.