Skip to content

Commit 3123cfd

Browse files
author
Denis
authored
fix: use textContent instead of innerHTML for error elements (#11354)
Fixes #11324
1 parent d79a88d commit 3123cfd

3 files changed

Lines changed: 70 additions & 4 deletions

File tree

‎flow-client/src/main/java/com/vaadin/client/SystemErrorHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,21 @@ private Element handleError(String caption, String message, String details,
180180
if (caption != null) {
181181
Element captionDiv = document.createDivElement();
182182
captionDiv.setClassName("caption");
183-
captionDiv.setInnerHTML(caption);
183+
captionDiv.setTextContent(caption);
184184
systemErrorContainer.appendChild(captionDiv);
185185
Console.error(caption);
186186
}
187187
if (message != null) {
188188
Element messageDiv = document.createDivElement();
189189
messageDiv.setClassName("message");
190-
messageDiv.setInnerHTML(message);
190+
messageDiv.setTextContent(message);
191191
systemErrorContainer.appendChild(messageDiv);
192192
Console.error(message);
193193
}
194194
if (details != null) {
195195
Element detailsDiv = document.createDivElement();
196196
detailsDiv.setClassName("details");
197-
detailsDiv.setInnerHTML(details);
197+
detailsDiv.setTextContent(details);
198198
systemErrorContainer.appendChild(detailsDiv);
199199
Console.error(details);
200200
}

‎flow-client/src/test-gwt/java/com/vaadin/client/GwtSuite.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package com.vaadin.client;
22

3-
import com.vaadin.client.communication.GwtDefaultConnectionStateHandlerTest;
43
import junit.framework.Test;
54
import junit.framework.TestSuite;
65

76
import com.google.gwt.junit.tools.GWTTestSuite;
87

98
import com.vaadin.client.communication.GwtAtmoshperePushConnectionTest;
9+
import com.vaadin.client.communication.GwtDefaultConnectionStateHandlerTest;
1010
import com.vaadin.client.flow.GwtBasicElementBinderTest;
11+
import com.vaadin.client.flow.GwtErrotHandlerTest;
1112
import com.vaadin.client.flow.GwtEventHandlerTest;
1213
import com.vaadin.client.flow.GwtMultipleBindingTest;
1314
import com.vaadin.client.flow.GwtPolymerModelTest;
@@ -53,6 +54,7 @@ public static Test suite() {
5354
suite.addTestSuite(GwtMessageHandlerTest.class);
5455
suite.addTestSuite(GwtMultipleBindingTest.class);
5556
suite.addTestSuite(GwtDefaultConnectionStateHandlerTest.class);
57+
suite.addTestSuite(GwtErrotHandlerTest.class);
5658
return suite;
5759
}
5860
}
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright 2000-2021 Vaadin Ltd.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package com.vaadin.client.flow;
17+
18+
import com.vaadin.client.ApplicationConfiguration;
19+
import com.vaadin.client.ClientEngineTestBase;
20+
import com.vaadin.client.Registry;
21+
import com.vaadin.client.SystemErrorHandler;
22+
import com.vaadin.client.flow.reactive.Reactive;
23+
24+
import elemental.client.Browser;
25+
import elemental.dom.Element;
26+
27+
public class GwtErrotHandlerTest extends ClientEngineTestBase {
28+
29+
private Registry registry;
30+
31+
@Override
32+
protected void gwtSetUp() throws Exception {
33+
super.gwtSetUp();
34+
Reactive.reset();
35+
36+
registry = new Registry() {
37+
{
38+
set(ApplicationConfiguration.class,
39+
new ApplicationConfiguration());
40+
set(SystemErrorHandler.class, new SystemErrorHandler(this));
41+
}
42+
};
43+
44+
}
45+
46+
public void testhandleUnrecoverableError_textContentIsSetInDivsNotInnerHtml() {
47+
registry.getSystemErrorHandler().handleUnrecoverableError("<foo></foo>",
48+
"<bar></bar>", "<baz></baz>", null);
49+
Element container = Browser.getDocument().getBody()
50+
.querySelector(".v-system-error");
51+
Element caption = container.querySelector(".caption");
52+
Element message = container.querySelector(".message");
53+
Element details = container.querySelector(".details");
54+
55+
assertEquals("&lt;foo&gt;&lt;/foo&gt;", caption.getInnerHTML());
56+
assertEquals("<foo></foo>", caption.getTextContent());
57+
58+
assertEquals("&lt;bar&gt;&lt;/bar&gt;", message.getInnerHTML());
59+
assertEquals("<bar></bar>", message.getTextContent());
60+
61+
assertEquals("&lt;baz&gt;&lt;/baz&gt;", details.getInnerHTML());
62+
assertEquals("<baz></baz>", details.getTextContent());
63+
}
64+
}

0 commit comments

Comments
 (0)