java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp | 4 ++
java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp | 8 ++++-
java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp | 2 -
java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp | 14
+++++-----
java/spacewalk-java.spec | 11
+++++++
rel-eng/packages/spacewalk-java | 2 -
8 files changed, 31 insertions(+), 14 deletions(-)
New commits:
commit 8922a734f43ca1724566d098d88fc758e78ee87d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 17:17:14 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.81-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3aa0b84..9ae8621 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.80
+Version: 1.10.81
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri May 24 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.81-1
+- 855845 - escaping system name for /rhn/systems/entitlements/FlexGuests.do
+- 855845 - escaping system name for /rhn/systems/entitlements/PhysicalHosts.do
+- 855845 - escaping system name for /rhn/systems/VirtualSystemsList.do
+- 855845 - escaping system name for
+ /rhn/systems/DuplicateSystemsDeleteConfirm.do
+- 855845 - escaping system name for /rhn/systems/SystemCurrency.do
+- 855845 - escaping system name for /rhn/systems/DuplicateIPList.do
+
* Fri May 24 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.80-1
- 855845 - escaping system name for
/rhn/systems/details/configuration/DiffFileConfirm.do
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c21755d..740124e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.80-1 java/
+1.10.81-1 java/
commit d8481ad925652114ed5c2a319e48c6b74eb09274
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:52:15 2013 +0200
855845 - escaping system name for /rhn/systems/entitlements/FlexGuests.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
index 54670e1..b2b41a9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/flexguests.jsp
@@ -92,7 +92,7 @@
<bean:message key="sdc.details.overview.unknown"/>
</c:when>
<c:otherwise>
- <c:out value="${current.name}</a>" escapeXml="false"
/>
+ <c:out value="${current.name}" escapeXml="true" />
</c:otherwise>
</c:choose>
commit b25d655cef5021a17bc9149e5c566325cb9d1212
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:49:34 2013 +0200
855845 - escaping system name for /rhn/systems/entitlements/PhysicalHosts.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
index 5bd14fa..9ce55e1 100644
--- a/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/entitlements/physicalhosts.jsp
@@ -37,13 +37,17 @@
<rl:column bound="false"
sortable="false"
headerkey="physicalhosts.jsp.guestsystem">
- <a
href="/rhn/systems/details/Overview.do?sid=${current.guestId}">${current.guestName}</a>
+ <a
href="/rhn/systems/details/Overview.do?sid=${current.guestId}">
+ <c:out value="${current.guestName}" escapeXml="true"
/>
+ </a>
</rl:column>
<rl:column bound="false" sortable="false"
headerkey="guestslimited.jsp.hostsystem">
<c:choose>
<c:when test="${empty current.hostId}">unknown</c:when>
<c:otherwise>
- <a
href="/rhn/systems/details/Overview.do?sid=${current.hostId}">${current.hostName}</a>
+ <a
href="/rhn/systems/details/Overview.do?sid=${current.hostId}">
+ <c:out value="${current.hostName}"
escapeXml="true" />
+ </a>
</c:otherwise>
</c:choose>
</rl:column>
commit 813fc38f9d6b249270aeb4aafd6a1214d1688ba3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:43:54 2013 +0200
855845 - escaping system name for /rhn/systems/VirtualSystemsList.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
index 55c77f0..d4bfc38 100644
--- a/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/virtuallist.jsp
@@ -41,7 +41,7 @@
<img src="/img/channel_parent_node.gif" />
<bean:message key="virtuallist.jsp.host"/>:
<a
href="/rhn/systems/details/Overview.do?sid=${current.hostSystemId}">
- ${current.serverName}
+ <c:out value="${current.serverName}" escapeXml="true"
/>
</a>
<bean:message key="virtuallist.jsp.hoststatus"
arg0="${current.countActiveInstances}"
arg1="${current.countTotalInstances}"/>
<c:if test="${current.virtEntitlement != null}">
@@ -53,7 +53,9 @@
<rhn:column header="virtuallist.jsp.name" colspan="4">
<img src="/img/channel_parent_node.gif" />
<bean:message key="virtuallist.jsp.host"/>:
- <span style="color:
#808080">${current.serverName}</span>
+ <span style="color: #808080">
+ <c:out value="${current.serverName}" escapeXml="true"
/>
+ </span>
</rhn:column>
</c:when>
<c:otherwise>
@@ -62,15 +64,15 @@
<img src="/img/channel_child_node.gif" />
<c:choose>
<c:when test="${current.virtualSystemId == null}">
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true"
/>
</c:when>
<c:when test="${current.accessible}">
<a
href="/rhn/systems/details/Overview.do?sid=${current.virtualSystemId}">
- ${current.serverName}
+ <c:out value="${current.serverName}"
escapeXml="true" />
</a>
</c:when>
<c:otherwise>
- ${current.serverName}
+ <c:out value="${current.serverName}"
escapeXml="true" />
</c:otherwise>
</c:choose>
</rhn:column>
@@ -81,7 +83,7 @@
</rhn:column>
<rhn:column header="virtuallist.jsp.state">
- ${current.stateName}
+ <c:out value="${current.serverName}" escapeXml="true"
/>
</rhn:column>
<rhn:column header="virtuallist.jsp.channel">
commit 855efb801c8aa0facbf21eee1a18bf9267ed346b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:38:53 2013 +0200
855845 - escaping system name for /rhn/systems/DuplicateSystemsDeleteConfirm.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 238867d..2444850 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -97,7 +97,7 @@
<bean:message key="sdc.details.overview.unknown"/>
</c:when>
<c:otherwise>
- <c:out value="${current.name}</a>" escapeXml="true"
/>
+ <c:out value="${current.name}" escapeXml="true" />
</c:otherwise>
</c:choose>
</rl:non-expandable>
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
index 9c6cb96..3abf1de 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystemsdelete.jsp
@@ -32,7 +32,9 @@
headerkey="systemlist.jsp.system"
sortattr="name"
defaultsort="asc">
- <c:out value="<a
href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">${current.name}</a>"
escapeXml="false" />
+ <a
href="/rhn/systems/details/Overview.do?sid=${current.id}">
+ <c:out value="${current.name}" escapeXml="true"
/>
+ </a>
</rl:column>
<rl:column sortable="false"
attr="lastCheckin"
commit 72e12cab6536bafeec192084827b03fabd079f40
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:36:05 2013 +0200
855845 - escaping system name for /rhn/systems/SystemCurrency.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
index a3e6d6a..b40949a 100644
--- a/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/systemcurrency.jsp
@@ -44,7 +44,7 @@
<bean:message key="sdc.details.overview.unknown"/>
</c:when>
<c:otherwise>
- <c:out value="${current.name}</a>"
escapeXml="false" />
+ <c:out value="${current.name}"
escapeXml="true" />
</c:otherwise>
</c:choose>
</rl:column>
commit 5b281f1905cae84e18fa014c451aec521e757dde
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:34:38 2013 +0200
855845 - escaping system name for /rhn/systems/DuplicateIPList.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
index 83c4be5..238867d 100644
--- a/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/duplicate/duplicatesystems.jsp
@@ -97,7 +97,7 @@
<bean:message key="sdc.details.overview.unknown"/>
</c:when>
<c:otherwise>
- <c:out value="${current.name}</a>" escapeXml="false"
/>
+ <c:out value="${current.name}</a>" escapeXml="true"
/>
</c:otherwise>
</c:choose>
</rl:non-expandable>