Skip to content

Commit 59214e7

Browse files
goekaygoekay
authored
Encode values properly when rendering HTML pages (#1533)
* use html encoder on page: chagepointDetails (#1532) * use html encoder on page: transactions (#1532) * use html encoder on page: transactionDetails (#1532) * use html encoder on page: ocppTags (#1532) * use html encoder on page: connectorStatus (#1532) * use html encoder on page: GetConfigurationResponse (#1532) * use html encoder on page: taskResult (#1532)
1 parent a79983f commit 59214e7

File tree

7 files changed

+34
-34
lines changed

7 files changed

+34
-34
lines changed

‎src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<tbody>
4040
<c:forEach items="${response.configurationKeys}" var="element">
4141
<tr>
42-
<td>${element.key}</td>
43-
<td>${element.value}</td>
42+
<td><encode:forHtml value="${element.key}" /></td>
43+
<td><encode:forHtml value="${element.value}" /></td>
4444
<td>${element.readonly}</td>
4545
</tr>
4646
</c:forEach>

‎src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ Connector Status
8585
</td>
8686
<td>${cs.connectorId}</td>
8787
<td data-sort-value="${cs.statusTimestamp.millis}">${cs.timeStamp}</td>
88-
<td>${cs.status}</td>
89-
<td>${cs.errorCode}</td>
88+
<td><encode:forHtml value="${cs.status}" /></td>
89+
<td><encode:forHtml value="${cs.errorCode}" /></td>
9090
</tr>
9191
</c:forEach>
9292
</tbody>
9393
</table>
9494
</div></div>
95-
<%@ include file="00-footer.jsp" %>
95+
<%@ include file="00-footer.jsp" %>

‎src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@
8484
</a>
8585
</td>
8686
</tr>
87-
<tr><td>Endpoint Address:</td><td>${cp.chargeBox.endpointAddress}</td></tr>
88-
<tr><td>Ocpp Protocol:</td><td>${cp.chargeBox.ocppProtocol}</td></tr>
89-
<tr><td>Charge Point Vendor:</td><td>${cp.chargeBox.chargePointVendor}</td></tr>
90-
<tr><td>Charge Point Model:</td><td>${cp.chargeBox.chargePointModel}</td></tr>
91-
<tr><td>Charge Point Serial Number:</td><td>${cp.chargeBox.chargePointSerialNumber}</td></tr>
92-
<tr><td>Charge Box Serial Number:</td><td>${cp.chargeBox.chargeBoxSerialNumber}</td></tr>
93-
<tr><td>Firmware Version:</td><td>${cp.chargeBox.fwVersion}</td></tr>
94-
<tr><td>Firmware Update Timestamp:</td><td>${cp.chargeBox.fwUpdateTimestamp}</td></tr>
95-
<tr><td>Iccid:</td><td>${cp.chargeBox.iccid}</td></tr>
96-
<tr><td>Imsi:</td><td>${cp.chargeBox.imsi}</td></tr>
97-
<tr><td>Meter Type:</td><td>${cp.chargeBox.meterType}</td></tr>
98-
<tr><td>Meter Serial Number:</td><td>${cp.chargeBox.meterSerialNumber}</td></tr>
99-
<tr><td>Diagnostics Status:</td><td>${cp.chargeBox.diagnosticsStatus}</td></tr>
100-
<tr><td>Diagnostics Timestamp:</td><td>${cp.chargeBox.diagnosticsTimestamp}</td></tr>
101-
<tr><td>Last Hearbeat Timestamp:</td><td>${cp.chargeBox.lastHeartbeatTimestamp}</td></tr>
87+
<tr><td>Endpoint Address:</td><td><encode:forHtml value="${cp.chargeBox.endpointAddress}" /></td></tr>
88+
<tr><td>Ocpp Protocol:</td><td><encode:forHtml value="${cp.chargeBox.ocppProtocol}" /></td></tr>
89+
<tr><td>Charge Point Vendor:</td><td><encode:forHtml value="${cp.chargeBox.chargePointVendor}" /></td></tr>
90+
<tr><td>Charge Point Model:</td><td><encode:forHtml value="${cp.chargeBox.chargePointModel}" /></td></tr>
91+
<tr><td>Charge Point Serial Number:</td><td><encode:forHtml value="${cp.chargeBox.chargePointSerialNumber}" /></td></tr>
92+
<tr><td>Charge Box Serial Number:</td><td><encode:forHtml value="${cp.chargeBox.chargeBoxSerialNumber}" /></td></tr>
93+
<tr><td>Firmware Version:</td><td><encode:forHtml value="${cp.chargeBox.fwVersion}" /></td></tr>
94+
<tr><td>Firmware Update Timestamp:</td><td><encode:forHtml value="${cp.chargeBox.fwUpdateTimestamp}" /></td></tr>
95+
<tr><td>Iccid:</td><td><encode:forHtml value="${cp.chargeBox.iccid}" /></td></tr>
96+
<tr><td>Imsi:</td><td><encode:forHtml value="${cp.chargeBox.imsi}" /></td></tr>
97+
<tr><td>Meter Type:</td><td><encode:forHtml value="${cp.chargeBox.meterType}" /></td></tr>
98+
<tr><td>Meter Serial Number:</td><td><encode:forHtml value="${cp.chargeBox.meterSerialNumber}" /></td></tr>
99+
<tr><td>Diagnostics Status:</td><td><encode:forHtml value="${cp.chargeBox.diagnosticsStatus}" /></td></tr>
100+
<tr><td>Diagnostics Timestamp:</td><td><encode:forHtml value="${cp.chargeBox.diagnosticsTimestamp}" /></td></tr>
101+
<tr><td>Last Heartbeat Timestamp:</td><td><encode:forHtml value="${cp.chargeBox.lastHeartbeatTimestamp}" /></td></tr>
102102
<tr>
103103
<td>Insert connector status after start/stop transaction:
104104
</td>

‎src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<tbody>
4949
<c:forEach items="${unknownList}" var="item">
5050
<tr>
51-
<td>${item.key}</td>
51+
<td><encode:forHtml value="${item.key}" /></td>
5252
<td>${item.numberOfAttempts}</td>
5353
<td data-sort-value="${item.lastAttemptTimestamp.millis}">${item.lastAttemptTimestamp}</td>
5454
<td class="inlineWrapper">
@@ -160,4 +160,4 @@
160160
</div>
161161
</div>
162162
</div>
163-
<%@ include file="../00-footer.jsp" %>
163+
<%@ include file="../00-footer.jsp" %>

‎src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<tr><td>Start Value</td><td>${details.transaction.startValue}</td></tr>
3737
<tr><td>Stop Date/Time</td><td>${details.transaction.stopTimestamp}</td></tr>
3838
<tr><td>Stop Value</td><td>${details.transaction.stopValue}</td></tr>
39-
<tr><td>Stop Reason</td><td>${details.transaction.stopReason}</td></tr>
39+
<tr><td>Stop Reason</td><td><encode:forHtml value="${details.transaction.stopReason}" /></td></tr>
4040
<tr><td>Stop Event Actor</td><td>${details.transaction.stopEventActor}</td></tr>
4141
</table>
4242
</center>
@@ -59,13 +59,13 @@
5959
<c:forEach items="${details.values}" var="v">
6060
<tr>
6161
<td data-sort-value="${v.valueTimestamp.millis}">${v.valueTimestamp}</td>
62-
<td>${v.value}</td>
63-
<td>${v.readingContext}</td>
64-
<td>${v.format}</td>
65-
<td>${v.measurand}</td>
66-
<td>${v.location}</td>
67-
<td>${v.unit}</td>
68-
<td>${v.phase}</td>
62+
<td><encode:forHtml value="${v.value}" /></td>
63+
<td><encode:forHtml value="${v.readingContext}" /></td>
64+
<td><encode:forHtml value="${v.format}" /></td>
65+
<td><encode:forHtml value="${v.measurand}" /></td>
66+
<td><encode:forHtml value="${v.location}" /></td>
67+
<td><encode:forHtml value="${v.unit}" /></td>
68+
<td><encode:forHtml value="${v.phase}" /></td>
6969
</tr>
7070
</c:forEach>
7171
</tbody>

‎src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Transactions
119119
<td>${ta.startValue}</td>
120120
<td data-sort-value="${ta.stopTimestamp.millis}">${ta.stopTimestampFormatted}</td>
121121
<td>${ta.stopValue}</td>
122-
<td>${ta.stopReason}</td>
122+
<td><encode:forHtml value="${ta.stopReason}" /></td>
123123
<td>
124124
<c:if test="${empty ta.stopValue}">
125125
<form:form action="${ctxPath}/manager/transactions/stop/${ta.id}">

‎src/main/resources/webapp/WEB-INF/views/taskResult.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@
5252
<td>
5353
<c:choose>
5454
<c:when test="${result.value.details == null}">
55-
${result.value.response}
55+
<encode:forHtml value="${result.value.response}" />
5656
</c:when>
5757
<c:otherwise>
58-
${result.value.response} (<a href="${ctxPath}/manager/operations/tasks/${taskId}/details/${result.key}/">Details</a>)
58+
<encode:forHtml value="${result.value.response}" /> (<a href="${ctxPath}/manager/operations/tasks/${taskId}/details/${result.key}/">Details</a>)
5959
</c:otherwise>
6060
</c:choose>
6161
</td>
@@ -65,4 +65,4 @@
6565
</tbody>
6666
</table>
6767
</div>
68-
<%@ include file="00-footer.jsp" %>
68+
<%@ include file="00-footer.jsp" %>

0 commit comments

Comments
 (0)