Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#2669 Fixed XSS vulnerabilities in graphical view components: #3042

Merged
merged 2 commits into from
Nov 6, 2024
Merged

#2669 Fixed XSS vulnerabilities in graphical view components: #3042

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ef7711
#2669 Fixed XSS vulnerabilities in graphical view components:
Limraj Oct 29, 2024
0f52419
#2669 Fixed XSS vulnerabilities in graphical view components:
Limraj Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/snippet/alarmList.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<c:if test="${!hideTimestampColumn}"><td><spring:message code="common.time"/></td></c:if>
<td><spring:message code="events.msg"/></td>
<c:if test="${!hideInactivityColumn}"><td><spring:message code="common.inactiveTime"/></td></c:if>
<c:if test="${isEventAssignEnabled and !hideAssigneeColumn}"><td><sst:i18n key="common.assignee"/></td></c:if>
<c:if test="${isEventAssignEnabled and !hideAssigneeColumn}"><td><spring:message code="common.assignee"/></td></c:if>
<c:if test="${!hideAckColumn}"> <td>&nbsp;</td></c:if>
</tr>
<c:if test="${empty events}"><tr><td colspan="6"><b><spring:message code="events.emptyList"/></b></td></tr></c:if>
Expand Down
14 changes: 7 additions & 7 deletions WebContent/WEB-INF/snippet/basicContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<%@ include file="/WEB-INF/snippet/common.jsp" %>
<c:set var="content"><%--
--%><c:choose><%--
--%><c:when test="${displayPointName}">${pointComponent.name}:&nbsp;<b>${mango:htmlText(point, pointValue)}</b></c:when><%--
--%><c:when test="${displayPointName}"><c:out value="${pointComponent.name}"/>:&nbsp;<b>${mango:htmlText(point, pointValue)}</b></c:when><%--
--%><c:otherwise>${mango:htmlText(point, pointValue)}</c:otherwise><%--
--%></c:choose><%--
--%></c:set>
Expand All @@ -28,26 +28,26 @@
<c:when test='${!empty viewComponent}'>
<c:choose>
<c:when test='${empty viewComponent.bkgdColorOverride}'>
<span class="simpleRenderer"/>${content}</span>
<span class="simpleRenderer"/><c:out value="${content}" /></span>
</c:when>
<c:when test='${viewComponent.bkgdColorOverride == "transparent"}'>
<span class="simpleRenderer" style="background:transparent;border:0;"/>${content}</span>
<span class="simpleRenderer" style="background:transparent;border:0;"/><c:out value="${content}"/></span>
</c:when>
<c:otherwise>
<span class="simpleRenderer" style="background-color:${viewComponent.bkgdColorOverride};"/>${content}</span>
<span class="simpleRenderer" style="background-color:${viewComponent.bkgdColorOverride};"/><c:out value="${content}" /></span>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test='${empty pointComponent.bkgdColorOverride}'>
<span class="simpleRenderer"/>${content}</span>
<span class="simpleRenderer"/><c:out value="${content}" /></span>
</c:when>
<c:when test='${pointComponent.bkgdColorOverride == "transparent"}'>
<span class="simpleRenderer" style="background:transparent;border:0;"/>${content}</span>
<span class="simpleRenderer" style="background:transparent;border:0;"/><c:out value="${content}" /></span>
</c:when>
<c:otherwise>
<span class="simpleRenderer" style="background-color:${pointComponent.bkgdColorOverride};"/>${content}</span>
<span class="simpleRenderer" style="background-color:${pointComponent.bkgdColorOverride};"/><c:out value="${content}" /></span>
</c:otherwise>
</c:choose>
</c:otherwise>
Expand Down
4 changes: 2 additions & 2 deletions WebContent/WEB-INF/snippet/compoundInfoContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
This snippet supports all data types.
--%>
<%@ include file="/WEB-INF/jsp/include/tech.jsp" %>
<b>${compoundComponent.name}</b><br/>
<b><c:out value="${compoundComponent.name}"/></b><br/>
<c:forEach items="${childData}" var="child">
<c:if test="${!empty child.point}">
&nbsp;&nbsp;&nbsp;
<c:if test="${!empty sessionUser}">
<tag:img png="icon_comp" title="watchlist.pointDetails" style="display:inline"
onclick="window.location='data_point_details.shtm?dpid=${child.point.id}'"/>
</c:if>
${child.name}: <span class="infoData">${mango:htmlText(child.point, child.pointValue)}</span><br/>
<c:out value="${child.name}"/>: <span class="infoData">${mango:htmlText(child.point, child.pointValue)}</span><br/>
</c:if>
</c:forEach>
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/snippet/infoContent.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<tag:img png="icon_comp" title="watchlist.pointDetails" style="display:inline"
onclick="window.location='data_point_details.shtm?dpid=${point.id}'"/>
</c:if>
<b>${pointComponent.name}</b><br/>
<b><c:out value="${pointComponent.name}"/></b><br/>

<c:if test="${!empty point}">
&nbsp;&nbsp;&nbsp;<spring:message code="common.value"/>:
Expand Down
2 changes: 1 addition & 1 deletion WebContent/WEB-INF/tags/displayView.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<c:otherwise><c:set var="bkgd">background:${vc.backgroundColour};</c:set></c:otherwise>
</c:choose>
<div id="c${vc.id}Controls" class="controlContent" style="left:5px;top:5px;${bkgd}">
<b>${vc.name}</b><br/>
<b><c:out value="${vc.name}"/></b><br/>
<c:forEach items="${vc.childComponents}" var="child">
<c:if test="${child.viewComponent.visible && child.viewComponent.id != vc.leadComponent.id}">
<tag:pointComponent vc="${child.viewComponent}"/>
Expand Down
Loading