[GEOS-11153] Improve handling special characters in the WMS OpenLayers Format #7174
Conversation
This file contains 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
sikeoka
added
backport 2.23.x
aaime
reviewed
Oct 16, 2023
| @@ -292,7 +293,7 @@ private List<String> styleNames(WMSMapContent mapContent) { | |||
| MapLayerInfo info = mapContent.getRequest().getLayers().get(0); | |||
| result = info.getOtherStyleNames(); | |||
| } | |||
| return result; | |||
| return result.stream().map(StringEscapeUtils::escapeHtml4).collect(Collectors.toList()); | |||
There was a problem hiding this comment.
Why are the other parameters escaped in the template, while this one is escaped in Java code?
There was a problem hiding this comment.
I wasn't sure what to do with this one. The FreeMarker ?html directive is deprecated in favor of auto-escaping but HTML auto-escaping will escape the contents of script tags so that they may not be entirely correct JavaScript. The ?js_string directive is not deprecated.
There was a problem hiding this comment.
I see, the explanation makes sense, thanks!
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.
This PR updates the WMS OpenLayers Format to properly escape special characters from GeoServer catalog information.
Checklist
mainbranch (backports managed later; ignore for branch specific issues).For core and extension modules:
[GEOS-XYZWV] Title of the Jira ticket.