java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 6 ++++--
java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4 +++-
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit a84e9a0f2ae70cd9c0bcfc1e2de554d58f0a48ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 18:43:06 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.88-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7343578..e9688ba 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.87
+Version: 1.10.88
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 30 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.88-1
+- 855845 - escaping system name for
+ /rhn/channel/ssm/ChildSubscriptionsConfirm.do
+- 855845 - escaping system name for /rhn/channel/ssm/BaseChannelSubscribe.do
+
* Thu May 30 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.87-1
- 515003 - changing confirmprotected.jsp.confirmmsg.deux message
- making DataSourceParserTest work with PostgreSQL
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 87a255d..c8eda21 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.87-1 java/
+1.10.88-1 java/
commit f7149acf5809d39a09d2aec442d1c4c483910fc3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 18:15:13 2013 +0200
855845 - escaping system name for /rhn/channel/ssm/ChildSubscriptionsConfirm.do
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
index 305aeaf..cd987cd 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
@@ -33,7 +33,9 @@
sortable="true"
headerkey="ssmchildsubconfirm.jsp.systemName"
attr="name">
- <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>
<!-- Channels we're allowed to subscribe to -->
commit ac444b58d75a3cf0ffc081d0cd7cf1f6602c78d7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 18:14:05 2013 +0200
855845 - escaping system name for /rhn/channel/ssm/BaseChannelSubscribe.do
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
index 2ec03ea..d767ead 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
@@ -33,10 +33,12 @@
sortattr="name"
<c:if test="${current.id > 0}">
- <c:out value="<a
href=\"/rhn/channels/ChannelDetail.do?cid=${current.id}\">${current.name}</a>"
escapeXml="false" />
+ <a href="/rhn/channels/ChannelDetail.do?cid=${current.id}">
+ <c:out value="${current.name}" escapeXml="true" />
+ </a>
</c:if>
<c:if test="${current.id <= 0}">
- <c:out value="${current.name}" escapeXml="false" />
+ <c:out value="${current.name}" escapeXml="true" />
</c:if>
</rl:column>