java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
| 15 ++++++----
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
| 7 +++-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
| 7 +++-
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
| 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
| 3 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
| 6 ++--
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
| 13 ++++----
java/spacewalk-java.spec
| 12 +++++++-
rel-eng/packages/spacewalk-java
| 2 -
9 files changed, 44 insertions(+), 23 deletions(-)
New commits:
commit 9a0e59f632da66a44d0e50f92850c0c3e739dc93
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 14:24:00 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.102-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3d92bfe..6129b52 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.101
+Version: 1.10.102
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jun 24 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.102-1
+- 855845 - escaping system name for message.syncpackages message
+- 855845 - escaping system name for
+ /rhn/systems/details/packages/profiles/CompareSystems.do
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/DeployFileConfirm.do
+- 855845 - escaping system name for /rhn/configuration/channel/TargetSystems.do
+- 855845 - escaping system name on inactive-systems yourrhn pane
+- fix (virt) system icons on system group pages
+
* Thu Jun 20 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.101-1
- Fix syntax. Sentences start with capital letter.
- 975083 - typo fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bac4d35..e59b546 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.101-1 java/
+1.10.102-1 java/
commit c7632a642155dca0ebd52cf5877de7299b03f3e3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 13:57:44 2013 +0200
855845 - escaping system name for message.syncpackages message
You have successfully scheduled a package profile sync for <> from <>.
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
index 88be04e..9e6fa34 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.profile;
import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
@@ -77,9 +78,10 @@ public class MissingPackageAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(ProfileManager.lookupByIdAndOrg(prid,
- requestContext.getCurrentUser().getOrg()).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(ProfileManager.lookupByIdAndOrg(prid,
+ requestContext.getCurrentUser().getOrg()).getName()));
createMessage(requestContext.getRequest(), "message.syncpackages",
args);
}
@@ -96,9 +98,10 @@ public class MissingPackageAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(SystemManager.lookupByIdAndUser(sid1,
- requestContext.getCurrentUser()).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(SystemManager.lookupByIdAndUser(sid1,
+ requestContext.getCurrentUser()).getName()));
createMessage(requestContext.getRequest(), "message.syncpackages",
args);
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
index 255c3ef..32f9430 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.profile;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.rhnpackage.MissingPackagesException;
import com.redhat.rhn.domain.user.User;
@@ -85,8 +86,10 @@ public class SyncProfilesAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(ProfileManager.lookupByIdAndOrg(prid,
user.getOrg()).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(
+ ProfileManager.lookupByIdAndOrg(prid,
user.getOrg()).getName()));
createMessage(request, "message.syncpackages", args);
}
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
index bbee874..739236c 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.profile;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.rhnpackage.MissingPackagesException;
import com.redhat.rhn.domain.user.User;
@@ -85,8 +86,10 @@ public class SyncSystemsProfilesAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(SystemManager.lookupByIdAndUser(sid1, user).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(
+ SystemManager.lookupByIdAndUser(sid1, user).getName()));
createMessage(request, "message.syncpackages", args);
}
commit f99503d81dc268d9c2e54e6184999a462bed8618
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 12:00:33 2013 +0200
855845 - escaping system name for
/rhn/systems/details/packages/profiles/CompareSystems.do
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
index f6f7aa5..b9777a8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
@@ -1,5 +1,6 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
@@ -11,7 +12,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2><img src="/img/rhn-icon-packages.gif" />
- <bean:message key="compare.jsp.compareto"
arg0="${requestScope.systemname}" />
+ <bean:message key="compare.jsp.compareto"
arg0="${fn:escapeXml(requestScope.systemname)}" />
</h2>
<div class="page-summary">
@@ -32,7 +33,7 @@
disabled="${not current.selectable}"/>
<rl:column headerkey="compare.jsp.package"
bound="false" filterattr="name">
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true" />
</rl:column>
<rl:column headerkey="packagelist.jsp.packagearch"
bound="false">
@@ -43,12 +44,12 @@
${current.system.evr}
</rl:column>
- <rl:column headertext="${requestScope.systemname}"
bound="false">
+ <rl:column headertext="${fn:escapeXml(requestScope.systemname)}"
bound="false">
${current.other.evr}
</rl:column>
<rl:column headerkey="compare.jsp.difference"
bound="false">
- ${current.comparison}
+ <c:out value="${current.comparison}" escapeXml="true" />
</rl:column>
</rl:list>
@@ -59,7 +60,7 @@
<rhn:submitted/>
<hr />
<html:submit property="dispatch">
- <bean:message key="compare.jsp.syncpackageto"
arg0="${requestScope.systemname}"/>
+ <bean:message key="compare.jsp.syncpackageto"
arg0="${fn:escapeXml(requestScope.systemname)}"/>
</html:submit>
</div>
</rhn:require>
@@ -68,7 +69,7 @@
<div align="left">
<hr />
<strong><bean:message
key="compare.jsp.noprovisioning"
- arg0="${system.name}"
arg1="${param.sid}"/></strong>
+ arg0="${fn:escapeXml(system.name)}"
arg1="${param.sid}"/></strong>
</div>
</rhn:require>
</c:if>
commit 42607fd44bf09116663bc8530096f61740c53658
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:47:08 2013 +0200
855845 - escaping system name for
/rhn/systems/details/configuration/DeployFileConfirm.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
index d723ff6..9690d68 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
@@ -1,5 +1,6 @@
<%@ taglib
uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://java.sun.com/jsp/jstl/core" prefix="c"
%>
+<%@ taglib
uri="http://java.sun.com/jsp/jstl/functions"
prefix="fn" %>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
@@ -12,14 +13,13 @@
<%@ include
file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" >
- <bean:message key="sdcdeployconfirm.jsp.header"
- arg0="${system.name}"/>
+ <bean:message key="sdcdeployconfirm.jsp.header"/>
</rhn:toolbar>
<div class="page-summary">
<p>
<bean:message key="sdcdeployconfirm.jsp.summary"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</p>
</div>
commit 33636b499e226e2a12d50e7ac0318f8a41142509
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:34:42 2013 +0200
855845 - escaping system name for /rhn/configuration/channel/TargetSystems.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
index bfef8c1..29eda33 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
@@ -34,7 +34,8 @@
<rhn:set value="${current.id}"/>
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
- <img alt="" src="/img/rhn-listicon-system.gif" />
${current.name}
+ <img alt="" src="/img/rhn-listicon-system.gif" />
+ <c:out value="${current.name}" escapeXml="true" />
</rhn:column>
</rhn:listdisplay>
</rhn:list>
commit c32bf7fd2ad83fa88245d74ed8e464d018a15c01
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:29:30 2013 +0200
855845 - escaping system name on inactive-systems yourrhn pane
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
index 6017871..2f3a07b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
@@ -18,7 +18,7 @@
<rhn:column header="inactivelist.jsp.header"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
<img src="/img/icon_checkin.gif" alt="<bean:message
key="system-legend.jsp.notcheckingin"/>" />
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true" />
</rhn:column>
<rhn:column header="emptyspace.jsp">