2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/security/PermissionException.java | 2 +-
java/code/src/com/redhat/rhn/common/util/StringUtil.java | 2 +-
java/code/webapp/WEB-INF/struts-config.xml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 739614b3b5eaec0a034cc6f4876e887dfb101ae1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 29 16:54:56 2012 +0200
allow complex kickstart variables containing severel '='
diff --git a/java/code/src/com/redhat/rhn/common/util/StringUtil.java b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
index 6e75b8c..a7c3b3b 100644
--- a/java/code/src/com/redhat/rhn/common/util/StringUtil.java
+++ b/java/code/src/com/redhat/rhn/common/util/StringUtil.java
@@ -713,7 +713,7 @@ public class StringUtil {
while (token.hasMoreElements()) {
String option = token.nextToken();
if (!StringUtils.isBlank(option)) { //Skip blank lines
- String[] args = option.split("=");
+ String[] args = option.split("=", 2);
if (args.length != 2) {
ValidatorException.raiseException(errorKey, option);
}
commit d2635be3204f12e5f08ba6ea10545dd4e45ab79a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Aug 29 11:24:51 2012 +0200
851519 - display a reasonable error message on the permission error page
diff --git a/java/code/src/com/redhat/rhn/common/security/PermissionException.java b/java/code/src/com/redhat/rhn/common/security/PermissionException.java
index c09fc15..b3500d3 100644
--- a/java/code/src/com/redhat/rhn/common/security/PermissionException.java
+++ b/java/code/src/com/redhat/rhn/common/security/PermissionException.java
@@ -68,7 +68,7 @@ public class PermissionException extends RhnRuntimeException {
*/
public PermissionException(Role role) {
this("You do not have permissions to " +
- "perform this action. You need to have atleast a " + role.getName() +
+ "perform this action. You need to have at least a " + role.getName() +
" role to perform this action");
// begin member variable initialization
}
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index 4cef9f2..3dad82e 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -1223,7 +1223,7 @@
path="/WEB-INF/pages/common/errors/badparam.jsp" key="date"
handler="com.redhat.rhn.common.errors.BadParameterExceptionHandler"/>
<exception type="com.redhat.rhn.common.security.PermissionException"
- path="/WEB-INF/pages/common/errors/permission.jsp" key="date"
+ path="/WEB-INF/pages/common/errors/permission.jsp" key="frontend.actions.channels.manager.add.permsfailure"
handler="com.redhat.rhn.common.errors.PermissionExceptionHandler"/>
<exception type="com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException"
path="/WEB-INF/pages/common/errors/nosuchpkg.jsp" key="date"
11 years, 8 months
Changes to 'refs/tags/osad-5.11.5-1'
by Jan Pazdziora
Tag 'osad-5.11.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-08-29 07:26 +0000
Tagging package [osad] version [5.11.5-1] in directory [client/tools/osad/].
Changes since rhnmd-5.3.11-1:
Jan Pazdziora (3):
Allow osa-dispatcher to read /etc/passwd, it seems to be needed by the generic python modules.
We cannot use PIDFile as variable in ExecStart.
Automatic commit of package [osad] release [5.11.5-1].
Stephen Herr (1):
Fixing test KickstartScheduleCommandTest.testProfileArches
---
client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te.fedora17 | 1
client/tools/osad/osa-dispatcher.service | 2
client/tools/osad/osad.spec | 10 ++
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 34 +++++-----
rel-eng/packages/osad | 2
5 files changed, 31 insertions(+), 18 deletions(-)
---
11 years, 8 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 7 ++++++-
rel-eng/packages/osad | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit e81e2a1f70863d83c0beed229d502a52c33e6f27
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 29 09:26:02 2012 +0200
Automatic commit of package [osad] release [5.11.5-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index aa2ffba..e6b3313 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -16,7 +16,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.11.4
+Version: 5.11.5
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -301,6 +301,11 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
%endif
%changelog
+* Wed Aug 29 2012 Jan Pazdziora 5.11.5-1
+- We cannot use PIDFile as variable in ExecStart.
+- Allow osa-dispatcher to read /etc/passwd, it seems to be needed by the
+ generic python modules.
+
* Tue Jul 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.11.4-1
- 844603 - removed PyXML dependency
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index bef9cbf..02bb63a 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.11.4-1 client/tools/osad/
+5.11.5-1 client/tools/osad/
11 years, 8 months
client/tools
by Jan Pazdziora
client/tools/osad/osa-dispatcher.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 01ee9e6e9f263a04deddf76b1c7cafed33395769
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 29 09:24:58 2012 +0200
We cannot use PIDFile as variable in ExecStart.
Addressing
osa-dispatcher[21278]: Usage: osa-dispatcher [options]
osa-dispatcher[21278]: osa-dispatcher: error: --pid-file option requires an argument
systemd[1]: osa-dispatcher.service: main process exited, code=exited, status=2
diff --git a/client/tools/osad/osa-dispatcher.service b/client/tools/osad/osa-dispatcher.service
index 92958e7..e6c1ce2 100644
--- a/client/tools/osad/osa-dispatcher.service
+++ b/client/tools/osad/osa-dispatcher.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
[Service]
EnvironmentFile=-/etc/sysconfig/osa-dispatcher
PIDFile=/var/run/osa-dispatcher.pid
-ExecStart=/usr/sbin/osa-dispatcher --pid-file $PIDFile
+ExecStart=/usr/sbin/osa-dispatcher --pid-file /var/run/osa-dispatcher.pid
[Install]
WantedBy=multi-user.target
11 years, 8 months
client/tools
by Jan Pazdziora
client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te.fedora17 | 1 +
client/tools/osad/osad.spec | 3 +++
2 files changed, 4 insertions(+)
New commits:
commit d43587899dc2da721e7d1cdea9f11203731dd520
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 28 14:54:28 2012 +0200
Allow osa-dispatcher to read /etc/passwd, it seems to be needed by the generic python modules.
Addressing
File "/usr/lib64/python2.7/site.py", line 567, in <module>
main()
File "/usr/lib64/python2.7/site.py", line 549, in main
known_paths = addusersitepackages(known_paths)
File "/usr/lib64/python2.7/site.py", line 278, in addusersitepackages
user_site = getusersitepackages()
File "/usr/lib64/python2.7/site.py", line 253, in getusersitepackages
user_base = getuserbase() # this will also set USER_BASE
File "/usr/lib64/python2.7/site.py", line 243, in getuserbase
USER_BASE = get_config_var('userbase')
File "/usr/lib64/python2.7/sysconfig.py", line 521, in get_config_var
return get_config_vars().get(name)
File "/usr/lib64/python2.7/sysconfig.py", line 425, in get_config_vars
_CONFIG_VARS['userbase'] = _getuserbase()
File "/usr/lib64/python2.7/sysconfig.py", line 183, in _getuserbase
return env_base if env_base else joinuser("~", ".local")
File "/usr/lib64/python2.7/sysconfig.py", line 169, in joinuser
return os.path.expanduser(os.path.join(*args))
File "/usr/lib64/python2.7/posixpath.py", line 260, in expanduser
userhome = pwd.getpwuid(os.getuid()).pw_dir
KeyError: 'getpwuid(): uid not found: 0'
and
avc: denied { read } for pid=20899 comm="osa-dispatcher" name="passwd" dev="dm-1" ino=1836807 scontext=system_u:system_r:osa_dispatcher_t:s0 tcontext=system_u:object_r:passwd_file_t:s0 tclass=file
diff --git a/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te.fedora17 b/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te.fedora17
new file mode 100644
index 0000000..445c11e
--- /dev/null
+++ b/client/tools/osad/osa-dispatcher-selinux/osa-dispatcher.te.fedora17
@@ -0,0 +1 @@
+auth_read_passwd(osa_dispatcher_t)
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 1a4bdef..aa2ffba 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -126,6 +126,9 @@ make -f Makefile.osad all
%if 0%{?include_selinux_package}
%{__perl} -i -pe 'BEGIN { $VER = join ".", grep /^\d+$/, split /\./, "%{version}.%{release}"; } s!\@\@VERSION\@\@!$VER!g;' osa-dispatcher-selinux/%{modulename}.te
+%if 0%{?fedora} >= 17
+cat osa-dispatcher-selinux/%{modulename}.te.fedora17 >> osa-dispatcher-selinux/%{modulename}.te
+%endif
for selinuxvariant in %{selinux_variants}
do
make -C osa-dispatcher-selinux NAME=${selinuxvariant} -f /usr/share/selinux/devel/Makefile
11 years, 8 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java | 34 +++++-----
1 file changed, 19 insertions(+), 15 deletions(-)
New commits:
commit 2253c6185b777c9648b96311ae2f94b6a942b65a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Aug 28 16:33:34 2012 -0400
Fixing test KickstartScheduleCommandTest.testProfileArches
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
index 7341041..0a2e67d 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/test/KickstartScheduleCommandTest.java
@@ -28,6 +28,7 @@ import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.kickstart.KickstartInstallType;
import com.redhat.rhn.domain.kickstart.KickstartSession;
+import com.redhat.rhn.domain.kickstart.KickstartVirtualizationType;
import com.redhat.rhn.domain.kickstart.test.KickstartDataTest;
import com.redhat.rhn.domain.kickstart.test.KickstartSessionTest;
import com.redhat.rhn.domain.rhnpackage.Package;
@@ -69,6 +70,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
/**
* {@inheritDoc}
*/
+ @Override
public void setUp() throws Exception {
super.setUp();
@@ -82,7 +84,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
ksdata.setKernelParams("someparam=asdf");
ksdata.getTree().setChannel(server.getBaseChannel());
KickstartSession ksession = KickstartSessionTest.
- createKickstartSession(ksdata, user);
+ createKickstartSession(ksdata, user);
ksession.setNewServer(server);
ksession.setOldServer(server);
TestUtils.saveAndFlush(ksession);
@@ -93,7 +95,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
if (err != null) {
fail("Got this error instead of success, key: " + err.getKey() + " msg: " +
LocalizationService.getInstance().
- getMessage(err.getKey(), err.getValues()));
+ getMessage(err.getKey(), err.getValues()));
}
assertNotNull(cmd.getKickstartSession());
}
@@ -118,7 +120,9 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
*/
public void testProfileArches() throws Exception {
KickstartData x86ks = KickstartDataTest.
- createKickstartWithChannel(user.getOrg());
+ createKickstartWithChannel(user.getOrg());
+ x86ks.getKickstartDefaults().setVirtualizationType(
+ KickstartVirtualizationType.none());
x86ks.getChannel().setChannelArch(ChannelFactory.lookupArchByName("x86_64"));
TestUtils.saveAndFlush(x86ks.getChannel());
TestUtils.saveAndFlush(x86ks);
@@ -152,7 +156,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
public void testCommandExisting() throws Exception {
profileType = KickstartScheduleCommand.TARGET_PROFILE_TYPE_EXISTING;
KickstartScheduleCommand cmd = testCommandExecution(
- server, ksdata, profileType,
+ server, ksdata, profileType,
otherServerId, profileId);
assertNotNull(cmd.getCreatedProfile());
}
@@ -209,8 +213,8 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
KickstartFactory.saveKickstartData(ksdata);
KickstartAction kickstartAction = ActionManager.
- scheduleKickstartAction(this.ksdata, this.user,
- server, new Date(), "extraoptions", "localhost");
+ scheduleKickstartAction(this.ksdata, this.user,
+ server, new Date(), "extraoptions", "localhost");
ActionFactory.save(kickstartAction);
flushAndEvict(kickstartAction);
assertNotNull(kickstartAction.getId());
@@ -222,7 +226,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
public void testKickstartProfiles() throws Exception {
KickstartScheduleCommand cmd = new
- KickstartScheduleCommand(this.server.getId(), this.user);
+ KickstartScheduleCommand(this.server.getId(), this.user);
assertNotNull(cmd.getKickstartProfiles());
}
@@ -251,7 +255,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
KickstartScheduleCommand cmd = testCommandExecution(
server, ksdata, profileType, otherServerId, profileId);
ActivationKey key = ActivationKeyFactory.
- lookupByKickstartSession(cmd.getKickstartSession());
+ lookupByKickstartSession(cmd.getKickstartSession());
assertEquals(1, 1);
}
@@ -285,7 +289,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
KickstartScheduleCommand cmd = testCommandExecution(
server, ksdata, profileType, otherServerId, profileId);
ActivationKey key = ActivationKeyFactory.
- lookupByKickstartSession(cmd.getKickstartSession());
+ lookupByKickstartSession(cmd.getKickstartSession());
assertTrue(key.getChannels().size() == 2);
Iterator i = key.getChannels().iterator();
boolean found = false;
@@ -319,7 +323,7 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
PackageManagerTest.addPackageToChannel("auto-kickstart-TestBootImage", c);
Package p = PackageManagerTest.
- addPackageToChannel("up2date", c);
+ addPackageToChannel("up2date", c);
PackageEvr pevr = PackageEvrFactory.lookupOrCreatePackageEvr("0",
KickstartScheduleCommand.UP2DATE_VERSION, "0");
p.setPackageEvr(pevr);
@@ -331,14 +335,14 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
private static KickstartScheduleCommand testCommandExecution(
Server server, KickstartData ksdata, String profileType,
Long otherServerId, Long profileId)
- throws Exception {
+ throws Exception {
User user = server.getCreator();
user.addRole(RoleFactory.ORG_ADMIN);
Channel c = server.getBaseChannel();
KickstartScheduleCommand cmd = new
- KickstartScheduleCommand(server.getId(), ksdata.getId(),
- user, new Date(), "rhn.webdev.redhat.com");
+ KickstartScheduleCommand(server.getId(), ksdata.getId(),
+ user, new Date(), "rhn.webdev.redhat.com");
PackageManagerTest.addPackageToSystemAndChannel(
ConfigDefaults.get().getKickstartPackageName(), server, c);
@@ -349,8 +353,8 @@ public class KickstartScheduleCommandTest extends BaseKickstartCommandTestCase {
ValidatorError ve = cmd.store();
assertEquals(ve.getKey(), "kickstart.schedule.noup2date");
PackageManagerTest.
- addUp2dateToSystemAndChannel(user, server,
- KickstartScheduleCommand.UP2DATE_VERSION, c);
+ addUp2dateToSystemAndChannel(user, server,
+ KickstartScheduleCommand.UP2DATE_VERSION, c);
assertCmdSuccess(cmd);
assertCmdSuccess(cmd);
11 years, 8 months
Changes to 'refs/tags/rhnmd-5.3.11-1'
by Tomáš Kašpárek
Tag 'rhnmd-5.3.11-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2012-08-28 15:33 +0000
Tagging package [rhnmd] version [5.3.11-1] in directory [monitoring/rhnmd/].
Changes since spacewalk-remote-utils-1.8.4-1:
Tomas Kasparek (2):
852386 - Independent SElinux policy for rhel5
Automatic commit of package [rhnmd] release [5.3.11-1].
---
monitoring/rhnmd/rhnmd.spec | 10 +++++++++-
rel-eng/packages/rhnmd | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
---
11 years, 8 months
monitoring/rhnmd rel-eng/packages
by Tomáš Kašpárek
monitoring/rhnmd/rhnmd.spec | 6 +++++-
rel-eng/packages/rhnmd | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 439eaa70a31dc87e643d6227acbf8a9be0b01dd8
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Aug 28 17:33:17 2012 +0200
Automatic commit of package [rhnmd] release [5.3.11-1].
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 9ddfd88..3028179 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -8,7 +8,7 @@ Summary: Red Hat Network Monitoring Daemon
Name: rhnmd
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.3.10
+Version: 5.3.11
Release: 1%{?dist}
License: GPLv2
BuildArch: noarch
@@ -119,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Tue Aug 28 2012 Tomas Kasparek <tkasparek(a)redhat.com> 5.3.11-1
+- 852386 - Independent SElinux policy for rhel5
+- %%defattr is not needed since rpm 4.4
+
* Fri Oct 07 2011 Jan Pazdziora 5.3.10-1
- 594647 - label rhnmd's files upon installation.
diff --git a/rel-eng/packages/rhnmd b/rel-eng/packages/rhnmd
index 690ed4d..ce85e09 100644
--- a/rel-eng/packages/rhnmd
+++ b/rel-eng/packages/rhnmd
@@ -1 +1 @@
-5.3.10-1 monitoring/rhnmd/
+5.3.11-1 monitoring/rhnmd/
11 years, 8 months
monitoring/rhnmd
by Tomáš Kašpárek
monitoring/rhnmd/rhnmd.spec | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 0c39b9ff8081f804c68ce17575e49b28768e0f21
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Aug 28 16:49:22 2012 +0200
852386 - Independent SElinux policy for rhel5
Added if with policy for rhel5 (differs from other systems).
diff --git a/monitoring/rhnmd/rhnmd.spec b/monitoring/rhnmd/rhnmd.spec
index 81e4b93..9ddfd88 100644
--- a/monitoring/rhnmd/rhnmd.spec
+++ b/monitoring/rhnmd/rhnmd.spec
@@ -91,7 +91,11 @@ fi
%endif
/sbin/chkconfig --add rhnmd
/usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/nocpulse-identity' || :
+%if 0%{?rhel} && "%rhel" < "6"
+/usr/sbin/semanage fcontext -a -t sshd_key_t '/var/lib/nocpulse/\.ssh/authorized_keys' || :
+%else
/usr/sbin/semanage fcontext -a -t ssh_home_t '/var/lib/nocpulse/\.ssh/authorized_keys' || :
+%endif
/sbin/restorecon -rvv /var/lib/nocpulse || :
%preun
11 years, 8 months
Changes to 'refs/tags/spacewalk-remote-utils-1.8.4-1'
by Jan Pazdziora
Tag 'spacewalk-remote-utils-1.8.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-08-28 11:33 +0000
Tagging package [spacewalk-remote-utils] version [1.8.4-1] in directory [client/tools/spacewalk-remote-utils/].
Changes since spacewalk-java-1.8.136-1:
Jan Pazdziora (2):
Fixing the License rpm header to match the COPYING information.
Automatic commit of package [spacewalk-remote-utils] release [1.8.4-1].
Tomas Lestach (1):
fix ContentSourceFilter.findBySourceId to return list of ContentSourceFilter objects
---
client/tools/spacewalk-remote-utils/spacewalk-remote-utils.spec | 7 +++++--
java/code/src/com/redhat/rhn/domain/channel/ContentSourceFilter.hbm.xml | 3 +--
rel-eng/packages/spacewalk-remote-utils | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
---
11 years, 8 months