This is an automated email from the ASF dual-hosted git repository. papegaaij pushed a commit to branch wicket-8.x in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 8c1eff3d42266a68b14c3628a9ff324837269c55 Author: Emond Papegaaij <[email protected]> AuthorDate: Wed Aug 19 22:25:09 2026 +0200 Escape the additional option attributes of a palette AbstractOptions escapes the id and the display value of an option according to escapeModelStrings, and wrote the keys and values of getAdditionalAttributes as they came. RadioChoice and CheckBoxMultipleChoice escape both for the hook of the same name, and have since bf8e0e1d7b, so the palette was the odd one out. Both go through Strings.escapeMarkup now, unconditionally, the way the other two do it: the buffer here builds the attribute itself, so there is nothing else that would encode it and nothing that could encode it twice. Note this escapes a name well enough to keep it inside its own attribute and no further. Strings.escapeMarkup leaves a space and an equals sign alone, so a name assembled from something other than an identifier is still able to end up as more than one attribute. Attribute names are identifiers an application writes, which is the assumption RadioChoice makes as well, and the test says so. Co-Authored-By: Claude Opus 5 (1M context) <[email protected]> --- .../form/palette/component/AbstractOptions.java | 4 +- ...tteAdditionalAttributesTest$AttributesPage.html | 7 ++ .../palette/PaletteAdditionalAttributesTest.java | 113 +++++++++++++++++++++ 3 files changed, 122 insertions(+), 2 deletions(-) diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java index 9c276fddfd..980c093a24 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/palette/component/AbstractOptions.java @@ -124,9 +124,9 @@ public abstract class AbstractOptions<T> extends FormComponent<T> for (Map.Entry<String, String> entry : additionalAttributesMap.entrySet()) { buffer.append(' ') - .append(entry.getKey()) + .append(Strings.escapeMarkup(entry.getKey())) .append("=\"") - .append(entry.getValue()) + .append(Strings.escapeMarkup(entry.getValue())) .append("\""); } } diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteAdditionalAttributesTest$AttributesPage.html b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteAdditionalAttributesTest$AttributesPage.html new file mode 100644 index 0000000000..ae1230fd0a --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteAdditionalAttributesTest$AttributesPage.html @@ -0,0 +1,7 @@ +<html> +<body> + <form wicket:id="form"> + <div wicket:id="palette"></div> + </form> +</body> +</html> diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteAdditionalAttributesTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteAdditionalAttributesTest.java new file mode 100644 index 0000000000..4c399c2fdf --- /dev/null +++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/form/palette/PaletteAdditionalAttributesTest.java @@ -0,0 +1,113 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.wicket.extensions.markup.html.form.palette; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import org.apache.wicket.extensions.markup.html.form.palette.component.AbstractOptions; +import org.apache.wicket.markup.html.WebPage; +import org.apache.wicket.markup.html.form.Form; +import org.apache.wicket.markup.html.form.IChoiceRenderer; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.util.ListModel; +import org.apache.wicket.util.tester.WicketTestCase; +import org.junit.Test; + +/** + * The attributes {@link AbstractOptions} adds to an option are escaped, the way + * {@code RadioChoice} and {@code CheckBoxMultipleChoice} escape the attributes of the same hook. + */ +public class PaletteAdditionalAttributesTest extends WicketTestCase +{ + public static class AttributesPage extends WebPage + { + AttributesPage(final Map<String, String> additionalAttributes) + { + Form<Object> form = new Form<>("form"); + add(form); + + IChoiceRenderer<String> renderer = new IChoiceRenderer<String>() + { + @Override + public Object getDisplayValue(String s) + { + return s; + } + + @Override + public String getIdValue(String s, int index) + { + return s; + } + }; + + IModel<List<String>> selected = new ListModel<>(new ArrayList<>(Arrays.asList("A"))); + IModel<List<String>> all = new ListModel<>(new ArrayList<>(Arrays.asList("A", "B"))); + + form.add(new Palette<String>("palette", selected, all, renderer, 10, true) + { + @Override + protected Map<String, String> getAdditionalAttributesForChoices(Object choice) + { + return additionalAttributes; + } + + @Override + protected Map<String, String> getAdditionalAttributesForSelection(Object choice) + { + return additionalAttributes; + } + }); + } + } + + @Test + public void additionalAttributeValueIsEscaped() + { + tester.startPage(new AttributesPage( + Collections.singletonMap("title", "x\" onload=\"x=1"))); + + String response = tester.getLastResponseAsString(); + assertTrue("the attribute value should be escaped", + response.contains("title=\"x" onload="x=1\"")); + assertFalse("the attribute value should not be able to add another attribute", + response.contains("onload=\"x=1\"")); + } + + /** + * The attribute name is escaped the same way, which is what {@code RadioChoice} and + * {@code CheckBoxMultipleChoice} do with the name from the same hook. Note that + * {@code Strings#escapeMarkup} leaves a space and an equals sign alone, so escaping a name is + * not by itself a defence against a name that is built from untrusted input. Attribute names + * are identifiers the application writes, not data. + */ + @Test + public void additionalAttributeNameIsEscaped() + { + tester.startPage(new AttributesPage(Collections.singletonMap("a\"b", "v"))); + + assertTrue("the attribute name should be escaped", + tester.getLastResponseAsString().contains("a"b=\"v\"")); + } +}
