java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java
| 3
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
| 5 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
| 3
java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
| 6 +
java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
| 5 -
java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
| 5 -
java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
| 7 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
| 3
java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
| 3
java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
| 2
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
| 5 -
java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
| 3
java/spacewalk-java.spec
| 32 +++++++++-
rel-eng/packages/spacewalk-java
| 2
14 files changed, 63 insertions(+), 21 deletions(-)
New commits:
commit 201e37bbd628a787a0daa4ace3abefc576f84d44
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 16:27:00 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.80-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 11e0021..3aa0b84 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.79
+Version: 1.10.80
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,36 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* 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
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/DiffFile.do
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/addfiles/ImportFile.do
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/ViewModifySandboxPaths.do
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/ViewModifyCentralPaths.do
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/ConfigChannelList.do
+- 855845 - escaping system name for
+ /rhn/systems/details/packages/profiles/SyncSystems.do
+- 855845 - escaping system name for /rhn/systems/details/packages/*.do pages
+- 855845 - escaping system name for
+ /rhn/systems/details/virtualization/ProvisionVirtualizationWizard.do
+- 855845 - escaping system name for /rhn/monitoring/ProbeList.do
+- 855845 - escaping system name for /rhn/systems/details/packages/Packages.do
+- 855845 - escaping system name for /rhn/activationkeys/systems/List.do
+- Open HTML Reports in a new window.
+- Only non-HTML files shall be marked as an attachement.
+- Exclude HTML file download from sitemesh.
+- Downloaded files shall be logged in debug mode.
+- Download of detailed SCAP result files.
+- Godforsaken closing <tr> node.
+- use xsd default message instead of custom one
+- man pages branding cleanup + misc branding fixes
+
* Tue May 21 2013 Grant Gainey <ggainey(a)redhat.com> 1.10.79-1
- Provide way to build Eclipse .classpath even in the absence of required jars
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 13b3903..c21755d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.79-1 java/
+1.10.80-1 java/
commit 4dcc7437b3e41a52caa0ed61ccb8955ad480136c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 15:38:08 2013 +0200
855845 - escaping system name for
/rhn/systems/details/configuration/DiffFileConfirm.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
index 936fa3e..de5bd3d 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffileconfirm.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"
%>
@@ -13,13 +14,13 @@
<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" >
<bean:message key="sdcdiffconfirm.jsp.header"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</rhn:toolbar>
<div class="page-summary">
<p>
<bean:message key="sdcdiffconfirm.jsp.summary"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</p>
</div>
commit e99de1fba7d17396f4997a3dcb2eca154f5be1de
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 14:39:34 2013 +0200
855845 - escaping system name for /rhn/systems/details/configuration/DiffFile.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
index 7742ab6..7479c85 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/difffile.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"
%>
@@ -15,13 +16,13 @@
img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
<bean:message key="sdcdifffile.jsp.header"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</rhn:toolbar>
<div class="page-summary">
<p>
<bean:message key="sdcdifffile.jsp.summary"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</p>
</div>
commit f47a33fd2434335b05da7b619589e63a38c14583
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 14:37:23 2013 +0200
855845 - escaping system name for
/rhn/systems/details/configuration/addfiles/ImportFile.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
index 2cefc84..bb13303 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/importfile.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/config-managment"
prefix="cfg" %>
@@ -15,13 +16,13 @@
img="/img/rhn-icon-system.gif"
imgAlt="system.common.systemAlt">
<bean:message key="sdcimportfile.jsp.header"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</rhn:toolbar>
<div class="page-summary">
<p>
<bean:message key="sdcimportfile.jsp.summary"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</p>
</div>
@@ -43,7 +44,7 @@
</table>
<h2><bean:message key="sdcimportfile.jsp.existing"/></h2>
<p><bean:message key="sdcimportfile.jsp.oldsummary"
- arg0="${system.name}"/></p>
+ arg0="${fn:escapeXml(system.name)}"/></p>
<rhn:list pageList="${requestScope.pageList}"
noDataText="sdcimportfile.jsp.noFiles">
commit 9f6ad210da7f0bd5e9be8ae8d9eb54f39090ad6c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 14:33:08 2013 +0200
855845 - escaping system name for
/rhn/systems/details/configuration/ViewModifySandboxPaths.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
index 25ec0f2..d307528 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilessandbox.jsp
@@ -2,6 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/config-managment"
prefix="cfg" %>
<%@ 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-bean" prefix="bean"
%>
<head>
<meta name="name" value="sdc.config.jsp.header" />
@@ -11,7 +12,7 @@
<h2><img class="h2-image"
src="${cfg:channelHeaderIcon('sandbox')}"/>
<bean:message key="sdc.config.header.overview"/></h2>
<p><bean:message key="sdc.config.file_list.sandbox_description"
- arg0="${requestScope.system.name}"
+ arg0="${fn:escapeXml(requestScope.system.name)}"
arg1="${rhn:localize('sdc.config.file_list.copy_to_global')}"/></p>
<rl:listset name="fileSet">
commit dd41b4ae25ac864d6d31b1e232a40714235b39fe
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 14:28:01 2013 +0200
855845 - escaping system name for
/rhn/systems/details/configuration/ViewModifyCentralPaths.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
index 4b7dc3f..15cf352 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/viewmodifyfilescentral.jsp
@@ -2,6 +2,7 @@
<%@ taglib
uri="http://rhn.redhat.com/tags/list" prefix="rl"
%>
<%@ taglib
uri="http://rhn.redhat.com/tags/config-managment"
prefix="cfg" %>
<%@ 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-bean" prefix="bean"
%>
<head>
<meta name="name" value="sdc.config.jsp.header" />
@@ -13,7 +14,7 @@
<bean:message key="sdc.config.header.overview"/></h2>
<p>
<bean:message key="sdc.config.file_list.central_description"
- arg0="${requestScope.system.name}"/>
+ arg0="${fn:escapeXml(requestScope.system.name)}"/>
</p>
<rl:listset name="fileSet">
commit 56b0dc6ca566eb3976fa01ddac81698cf4ecac36
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 13:30:05 2013 +0200
855845 - escaping system name for
/rhn/systems/details/configuration/ConfigChannelList.do
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java
b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java
index f008d79..f8f9c83 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/configuration/sdc/RankChannelsAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.configuration.sdc;
import com.redhat.rhn.common.localization.LocalizationService;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.config.ConfigChannel;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.server.Server;
@@ -114,7 +115,7 @@ public class RankChannelsAction extends BaseRankChannels {
LocalizationService.getInstance().getMessage("snapshots.configchannel");
SystemManager.snapshotServer(server, message);
- String[] params = {server.getName()};
+ String[] params = {StringUtil.htmlifyText(server.getName())};
getStrutsDelegate().saveMessage("sdc.config.rank.jsp.success",
params, request);
return
getStrutsDelegate().forwardParam(mapping.findForward("success"),
commit 048fd3843294b7a81d5aec625ef0485fce169815
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 13:13:29 2013 +0200
855845 - escaping system name for
/rhn/systems/details/packages/profiles/SyncSystems.do
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
index 0ac8da5..f67a0cb 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/syncsystem.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"
%>
@@ -18,8 +19,8 @@
<rhn:csrf />
<div class="page-summary">
<bean:message key="schedulesync.jsp.pagesummary"
- arg0="${requestScope.system.name}"
- arg1="${requestScope.system1.name}" />
+ arg0="${fn:escapeXml(requestScope.system.name)}"
+ arg1="${fn:escapeXml(requestScope.system1.name)}" />
</div>
<rl:list width="100%"
commit 00a4583a66393df4756b21d6a7469740f1c9bb4f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 12:01:06 2013 +0200
855845 - escaping system name for /rhn/systems/details/packages/*.do pages
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
index e0e3bd5..2aab397 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/BaseSystemPackagesConfirmAction.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.rhnpackage;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.util.DatePicker;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
@@ -219,7 +220,7 @@ public abstract class BaseSystemPackagesConfirmAction extends
RhnAction {
.formatNumber(numPackages),
pa.getId().toString(),
sid.toString(),
- server.getName()));
+ StringUtil.htmlifyText(server.getName())));
}
else {
msgs.add(ActionMessages.GLOBAL_MESSAGE,
@@ -228,7 +229,7 @@ public abstract class BaseSystemPackagesConfirmAction extends
RhnAction {
.formatNumber(numPackages),
pa.getId().toString(),
sid.toString(),
- server.getName()));
+ StringUtil.htmlifyText(server.getName())));
}
strutsDelegate.saveMessages(request, msgs);
Map params = new HashMap();
commit d91730dd6f262c535afd749cae99a4c939997c03
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 11:54:18 2013 +0200
855845 - escaping system name for
/rhn/systems/details/virtualization/ProvisionVirtualizationWizard.do
diff --git
a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
index 79a699a..4cb272c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/virtualization/provision/first.jsp
@@ -1,4 +1,5 @@
<%@ 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://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib
uri="http://struts.apache.org/tags-bean" prefix="bean"
%>
<%@ taglib
uri="http://struts.apache.org/tags-html" prefix="html"
%>
@@ -23,7 +24,7 @@ function setStep(stepName) {
<br/>
<div class="page-summary">
<p>
- <bean:message key="virtualization.provision.first.jsp.summary1"
arg0="${system.id}" arg1="${system.name}" />
+ <bean:message key="virtualization.provision.first.jsp.summary1"
arg0="${system.id}" arg1="${fn:escapeXml(system.name)}" />
</p>
</div>
commit 8bb977eaac051b87ccf5f12db716c78216dd38e1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 11:22:17 2013 +0200
855845 - escaping system name for /rhn/monitoring/ProbeList.do
diff --git a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
index 52b25c6..4a5e366 100644
--- a/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
+++ b/java/code/webapp/WEB-INF/pages/monitoring/probes.jsp
@@ -34,7 +34,7 @@
<%@ include
file="/WEB-INF/pages/common/fragments/probes/probe-state-column.jspf" %>
<rhn:column header="systemlist.jsp.system">
<A
HREF="/rhn/systems/details/probes/ProbesList.do?sid=${current.serverId}">
- ${current.serverName}
+ <c:out value="${current.serverName}" escapeXml="true"
/>
</A>
</rhn:column>
<rhn:column header="probes.index.jsp.description">
commit 144c4b4b236bd2e6a6ac6c75038ac131d4df3cd6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 09:59:01 2013 +0200
855845 - escaping system name for /rhn/systems/details/packages/Packages.do
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
index 6cd728b..ef3fa66 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageIndexAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
@@ -72,7 +73,7 @@ public class PackageIndexAction extends LookupDispatchAction {
Object[] args = new Object[3];
args[0] = pa.getId().toString();
args[1] = sid.toString();
- args[2] = server.getName();
+ args[2] = StringUtil.htmlifyText(server.getName());
msg.add(ActionMessages.GLOBAL_MESSAGE,
new ActionMessage("message.packagerefresh", args));
commit 5bf789d6049346c852570dc2e19e47c7c8268944
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 24 09:19:56 2013 +0200
855845 - escaping system name for /rhn/activationkeys/systems/List.do
diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
index 8082ec3..a0b04ad 100644
--- a/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
+++ b/java/code/webapp/WEB-INF/pages/activationkeys/systems/list.jsp
@@ -39,10 +39,12 @@
sortattr="name" filterattr="name">
<c:choose>
<c:when test = "${not empty requestScope.accessMap[current.id]}">
- <a
href="/rhn/systems/details/Overview.do?sid=${current.id}">${current.name}</a>
+ <a
href="/rhn/systems/details/Overview.do?sid=${current.id}">
+ <c:out value="${current.name}"
escapeXml="true" />
+ </a>
</c:when>
<c:otherwise>
- ${current.name}
+ <c:out value="${current.name}"
escapeXml="true" />
</c:otherwise>
</c:choose>
</rl:column>