backport #1533

steve-community · Aug 6, 2024 · 5717d8e · 5717d8e
1 parent 095ba52
commit 5717d8e
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 34 deletions.
diff --git a/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp b/src/main/resources/webapp/WEB-INF/views/GetConfigurationResponse.jsp
@@ -39,8 +39,8 @@
 			<tbody>
 			<c:forEach items="${response.configurationKeys}" var="element">
 				<tr>
-					<td>${element.key}</td>
-					<td>${element.value}</td>
+					<td><encode:forHtml value="${element.key}" /></td>
+					<td><encode:forHtml value="${element.value}" /></td>
 					<td>${element.readonly}</td>
 				</tr>
 			</c:forEach>

diff --git a/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp b/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp
@@ -85,11 +85,11 @@ Connector Status
 				</td>
 				<td>${cs.connectorId}</td>
 				<td data-sort-value="${cs.statusTimestamp.millis}">${cs.timeStamp}</td>
-				<td>${cs.status}</td>
-				<td>${cs.errorCode}</td>
+				<td><encode:forHtml value="${cs.status}" /></td>
+				<td><encode:forHtml value="${cs.errorCode}" /></td>
 			</tr>
 		</c:forEach>
 	</tbody>
 </table>
 </div></div>
-<%@ include file="00-footer.jsp" %>
+<%@ include file="00-footer.jsp" %>
diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/chargepointDetails.jsp
@@ -84,21 +84,21 @@
                             </a>
                         </td>
                     </tr>
-                    <tr><td>Endpoint Address:</td><td>${cp.chargeBox.endpointAddress}</td></tr>
-                    <tr><td>Ocpp Protocol:</td><td>${cp.chargeBox.ocppProtocol}</td></tr>
-                    <tr><td>Charge Point Vendor:</td><td>${cp.chargeBox.chargePointVendor}</td></tr>
-                    <tr><td>Charge Point Model:</td><td>${cp.chargeBox.chargePointModel}</td></tr>
-                    <tr><td>Charge Point Serial Number:</td><td>${cp.chargeBox.chargePointSerialNumber}</td></tr>
-                    <tr><td>Charge Box Serial Number:</td><td>${cp.chargeBox.chargeBoxSerialNumber}</td></tr>
-                    <tr><td>Firmware Version:</td><td>${cp.chargeBox.fwVersion}</td></tr>
-                    <tr><td>Firmware Update Timestamp:</td><td>${cp.chargeBox.fwUpdateTimestamp}</td></tr>
-                    <tr><td>Iccid:</td><td>${cp.chargeBox.iccid}</td></tr>
-                    <tr><td>Imsi:</td><td>${cp.chargeBox.imsi}</td></tr>
-                    <tr><td>Meter Type:</td><td>${cp.chargeBox.meterType}</td></tr>
-                    <tr><td>Meter Serial Number:</td><td>${cp.chargeBox.meterSerialNumber}</td></tr>
-                    <tr><td>Diagnostics Status:</td><td>${cp.chargeBox.diagnosticsStatus}</td></tr>
-                    <tr><td>Diagnostics Timestamp:</td><td>${cp.chargeBox.diagnosticsTimestamp}</td></tr>
-                    <tr><td>Last Hearbeat Timestamp:</td><td>${cp.chargeBox.lastHeartbeatTimestamp}</td></tr>
+                    <tr><td>Endpoint Address:</td><td><encode:forHtml value="${cp.chargeBox.endpointAddress}" /></td></tr>
+                    <tr><td>Ocpp Protocol:</td><td><encode:forHtml value="${cp.chargeBox.ocppProtocol}" /></td></tr>
+                    <tr><td>Charge Point Vendor:</td><td><encode:forHtml value="${cp.chargeBox.chargePointVendor}" /></td></tr>
+                    <tr><td>Charge Point Model:</td><td><encode:forHtml value="${cp.chargeBox.chargePointModel}" /></td></tr>
+                    <tr><td>Charge Point Serial Number:</td><td><encode:forHtml value="${cp.chargeBox.chargePointSerialNumber}" /></td></tr>
+                    <tr><td>Charge Box Serial Number:</td><td><encode:forHtml value="${cp.chargeBox.chargeBoxSerialNumber}" /></td></tr>
+                    <tr><td>Firmware Version:</td><td><encode:forHtml value="${cp.chargeBox.fwVersion}" /></td></tr>
+                    <tr><td>Firmware Update Timestamp:</td><td><encode:forHtml value="${cp.chargeBox.fwUpdateTimestamp}" /></td></tr>
+                    <tr><td>Iccid:</td><td><encode:forHtml value="${cp.chargeBox.iccid}" /></td></tr>
+                    <tr><td>Imsi:</td><td><encode:forHtml value="${cp.chargeBox.imsi}" /></td></tr>
+                    <tr><td>Meter Type:</td><td><encode:forHtml value="${cp.chargeBox.meterType}" /></td></tr>
+                    <tr><td>Meter Serial Number:</td><td><encode:forHtml value="${cp.chargeBox.meterSerialNumber}" /></td></tr>
+                    <tr><td>Diagnostics Status:</td><td><encode:forHtml value="${cp.chargeBox.diagnosticsStatus}" /></td></tr>
+                    <tr><td>Diagnostics Timestamp:</td><td><encode:forHtml value="${cp.chargeBox.diagnosticsTimestamp}" /></td></tr>
+                    <tr><td>Last Heartbeat Timestamp:</td><td><encode:forHtml value="${cp.chargeBox.lastHeartbeatTimestamp}" /></td></tr>
                     <tr>
                         <td>Insert connector status after start/stop transaction:
                         </td>

diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp
@@ -48,7 +48,7 @@
             <tbody>
             <c:forEach items="${unknownList}" var="item">
                 <tr>
-                    <td>${item.key}</td>
+                    <td><encode:forHtml value="${item.key}" /></td>
                     <td>${item.numberOfAttempts}</td>
                     <td data-sort-value="${item.lastAttemptTimestamp.millis}">${item.lastAttemptTimestamp}</td>
                     <td class="inlineWrapper">
@@ -160,4 +160,4 @@
     </div>
     </div>
 </div>
-<%@ include file="../00-footer.jsp" %>
+<%@ include file="../00-footer.jsp" %>
diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactionDetails.jsp
@@ -36,7 +36,7 @@
             <tr><td>Start Value</td><td>${details.transaction.startValue}</td></tr>
             <tr><td>Stop Date/Time</td><td>${details.transaction.stopTimestamp}</td></tr>
             <tr><td>Stop Value</td><td>${details.transaction.stopValue}</td></tr>
-            <tr><td>Stop Reason</td><td>${details.transaction.stopReason}</td></tr>
+            <tr><td>Stop Reason</td><td><encode:forHtml value="${details.transaction.stopReason}" /></td></tr>
             <tr><td>Stop Event Actor</td><td>${details.transaction.stopEventActor}</td></tr>
         </table>
     </center>
@@ -59,13 +59,13 @@
         <c:forEach items="${details.values}" var="v">
             <tr>
                 <td data-sort-value="${v.valueTimestamp.millis}">${v.valueTimestamp}</td>
-                <td>${v.value}</td>
-                <td>${v.readingContext}</td>
-                <td>${v.format}</td>
-                <td>${v.measurand}</td>
-                <td>${v.location}</td>
-                <td>${v.unit}</td>
-                <td>${v.phase}</td>
+                <td><encode:forHtml value="${v.value}" /></td>
+                <td><encode:forHtml value="${v.readingContext}" /></td>
+                <td><encode:forHtml value="${v.format}" /></td>
+                <td><encode:forHtml value="${v.measurand}" /></td>
+                <td><encode:forHtml value="${v.location}" /></td>
+                <td><encode:forHtml value="${v.unit}" /></td>
+                <td><encode:forHtml value="${v.phase}" /></td>
             </tr>
         </c:forEach>
         </tbody>

diff --git a/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp b/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp
@@ -119,7 +119,7 @@ Transactions
                 <td>${ta.startValue}</td>
                 <td data-sort-value="${ta.stopTimestamp.millis}">${ta.stopTimestampFormatted}</td>
                 <td>${ta.stopValue}</td>
-                <td>${ta.stopReason}</td>
+                <td><encode:forHtml value="${ta.stopReason}" /></td>
                 <td>
                     <c:if test="${empty ta.stopValue}">
                         <form:form action="${ctxPath}/manager/transactions/stop/${ta.id}">

diff --git a/src/main/resources/webapp/WEB-INF/views/taskResult.jsp b/src/main/resources/webapp/WEB-INF/views/taskResult.jsp
@@ -52,10 +52,10 @@
                 <td>
                     <c:choose>
                         <c:when test="${result.value.details == null}">
-                            ${result.value.response}
+                            <encode:forHtml value="${result.value.response}" />
                         </c:when>
                         <c:otherwise>
-                            ${result.value.response} (<a href="${ctxPath}/manager/operations/tasks/${taskId}/details/${result.key}/">Details</a>)
+                            <encode:forHtml value="${result.value.response}" /> (<a href="${ctxPath}/manager/operations/tasks/${taskId}/details/${result.key}/">Details</a>)
                         </c:otherwise>
                     </c:choose>
                 </td>
@@ -65,4 +65,4 @@
         </tbody>
     </table>
 </div>
-<%@ include file="00-footer.jsp" %>
+<%@ include file="00-footer.jsp" %>