spacewalk-commits March 2012

spacewalk-commits@lists.fedorahosted.org

10 participants
371 discussions

Changes to 'refs/tags/spacewalk-admin-1.8.4-1'
by StephenHerr 30 Mar '12

30 Mar '12

Tag 'spacewalk-admin-1.8.4-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-03-30 18:44 +0000 Tagging package [spacewalk-admin] version [1.8.4-1] in directory [spacewalk/admin/]. Changes since spacewalk-backend-1.8.10-1: Stephen Herr (2): 808580 - change service startup order so jabberd can finish before osa-dispatcher starts Automatic commit of package [spacewalk-admin] release [1.8.4-1]. --- rel-eng/packages/spacewalk-admin | 2 +- spacewalk/admin/spacewalk-admin.spec | 6 +++++- spacewalk/admin/spacewalk-service | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) ---

1 0

2 commits - rel-eng/packages spacewalk/admin
by StephenHerr 30 Mar '12

30 Mar '12

rel-eng/packages/spacewalk-admin | 2 +- spacewalk/admin/spacewalk-admin.spec | 6 +++++- spacewalk/admin/spacewalk-service | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) New commits: commit 1568e8a640e3a3446b0ac6276345448dd480aa59 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Mar 30 14:44:29 2012 -0400 Automatic commit of package [spacewalk-admin] release [1.8.4-1]. diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin index d9a7131..0acd044 100644 --- a/rel-eng/packages/spacewalk-admin +++ b/rel-eng/packages/spacewalk-admin @@ -1 +1 @@ -1.8.3-1 spacewalk/admin/ +1.8.4-1 spacewalk/admin/ diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec index 79a6c51..7383134 100644 --- a/spacewalk/admin/spacewalk-admin.spec +++ b/spacewalk/admin/spacewalk-admin.spec @@ -2,7 +2,7 @@ Summary: Various utility scripts and data files for RHN Satellite installations Name: spacewalk-admin URL: https://fedorahosted.org/spacewalk -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz License: GPLv2 @@ -76,6 +76,10 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/rhn/service-list %changelog +* Fri Mar 30 2012 Stephen Herr <sherr(a)redhat.com> 1.8.4-1 +- 808580 - change service startup order so jabberd can finish before osa- + dispatcher starts (sherr(a)redhat.com) + * Tue Mar 27 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.3-1 - 737972 - add man page for rhn-install-ssl-cert.pl - 737972 - add man page for rhn-deploy-ca-cert.pl commit bd6f32f5c5ff9ad7c34f4fe6f457818ae2453e56 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Mar 30 14:43:41 2012 -0400 808580 - change service startup order so jabberd can finish before osa-dispatcher starts diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service index b3d8a5e..eb56dd0 100755 --- a/spacewalk/admin/spacewalk-service +++ b/spacewalk/admin/spacewalk-service @@ -33,7 +33,7 @@ if [ -x /etc/init.d/tomcat6 -o -x /lib/systemd/system/tomcat6.service ]; then fi -SERVICES="jabberd $DB_SERVICE osa-dispatcher $TOMCAT httpd Monitoring MonitoringScout rhn-search cobblerd taskomatic" +SERVICES="jabberd $DB_SERVICE $TOMCAT httpd osa-dispatcher Monitoring MonitoringScout rhn-search cobblerd taskomatic" if [ -f /etc/rhn/service-list ] ; then . /etc/rhn/service-list fi

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.10-1'
by StephenHerr 30 Mar '12

30 Mar '12

Tag 'spacewalk-backend-1.8.10-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-03-30 17:48 +0000 Tagging package [spacewalk-backend] version [1.8.10-1] in directory [backend/]. Changes since spacewalk-backend-1.8.9-1: Milan Zazrivec (2): 804559 - not all msgs are CommunicationError objects 805012 - check channel permissions when unsubscribing a channel Stephen Herr (2): 808516 - When importing channeldumps from Sat 5.3 or older we should assume sha1 checksum type Automatic commit of package [spacewalk-backend] release [1.8.10-1]. --- backend/satellite_tools/xmlSource.py | 26 ++++++++++++++ backend/server/importlib/channelImport.py | 8 ---- backend/server/rhnChannel.py | 13 +++++-- backend/spacewalk-backend.spec | 8 +++- client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 4 +- rel-eng/packages/spacewalk-backend | 2 - 6 files changed, 48 insertions(+), 13 deletions(-) ---

1 0

2 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr 30 Mar '12

30 Mar '12

backend/satellite_tools/xmlSource.py | 26 ++++++++++++++++++++++++++ backend/server/importlib/channelImport.py | 8 -------- backend/spacewalk-backend.spec | 8 +++++++- rel-eng/packages/spacewalk-backend | 2 +- 4 files changed, 34 insertions(+), 10 deletions(-) New commits: commit 920fb76c70575c8e3b4b7454855972d7606a0124 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Mar 30 13:48:19 2012 -0400 Automatic commit of package [spacewalk-backend] release [1.8.10-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 5263b46..c7cc80f 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.9 +Version: 1.8.10 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,12 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Mar 30 2012 Stephen Herr <sherr(a)redhat.com> 1.8.10-1 +- 808516 - When importing channeldumps from Sat 5.3 or older we should assume + sha1 checksum type (sherr(a)redhat.com) +- 805012 - check channel permissions when unsubscribing a channel + (mzazrivec(a)redhat.com) + * Fri Mar 30 2012 Jan Pazdziora 1.8.9-1 - CVE-2012-1145, 800688 - check the result of parseServ operation. - Truncate data which are longer than db allows (slukasik(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index a81faa8..a36b232 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.9-1 backend/ +1.8.10-1 backend/ commit 0fb9604f7b7c01113e23718977d8f79afedcc112 Author: Stephen Herr <sherr(a)redhat.com> Date: Fri Mar 30 13:46:43 2012 -0400 808516 - When importing channeldumps from Sat 5.3 or older we should assume sha1 checksum type diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py index e3d16ff..75c645c 100644 --- a/backend/satellite_tools/xmlSource.py +++ b/backend/satellite_tools/xmlSource.py @@ -27,6 +27,9 @@ from spacewalk.common.rhnConfig import CFG from spacewalk.common.rhnTB import Traceback from spacewalk.server.importlib import importLib, backendLib +import re +RHEL234_REGEX = re.compile("rhel-[^-]*-[aew]s-(4|3|2.1)") + # Terminology used throughout this file: # Item: an atomic entity from the database's perspective. # A channel, or a package, or an erratum is an item. @@ -458,9 +461,32 @@ class ChannelItem(BaseItem): 'rhn-channel-comps-last-modified' : 'comps_last_modified', } def populateFromElements(self, obj, elements): + # bz 808516, to retain compatibility with Satellite <= 5.3 we + # need to assume sha1 checksum type unless we explicitly see + # 'rhn-null' in the xml + checksum_type_really_null = False + for element in elements: + if (not _is_string(element) + and element.name == 'rhn-channel-checksum-type'): + for subelement in element.subelements: + if (not _is_string(subelement) + and subelement.name == 'rhn-null'): + checksum_type_really_null = True + BaseItem.populateFromElements(self, obj, elements) + if obj['checksum_type'] == 'sha': obj['checksum_type'] = 'sha1' + if not obj['checksum_type'] and not checksum_type_really_null: + obj['checksum_type'] = 'sha1' + + # if using versions of rhel that doesn't use yum, set + # checksum_type to None + if (RHEL234_REGEX.match(obj['label']) + or (obj['parent_channel'] + and RHEL234_REGEX.match(obj['parent_channel']))): + obj['checksum_type'] = None + addItem(ChannelItem) class BaseChecksummedItem(BaseItem): diff --git a/backend/server/importlib/channelImport.py b/backend/server/importlib/channelImport.py index 1351f10..ff99eb6 100644 --- a/backend/server/importlib/channelImport.py +++ b/backend/server/importlib/channelImport.py @@ -20,9 +20,6 @@ from importLib import Import, InvalidArchError, \ from spacewalk.common.rhnConfig import CFG from spacewalk.satellite_tools.syncLib import log -import re -RHEL5_REGEXP = re.compile("rhel-[^-]*-(server|client)-5") - class ChannelImport(Import): def __init__(self, batch, backend): Import.__init__(self, batch, backend) @@ -58,11 +55,6 @@ class ChannelImport(Import): if not channel.has_key('receiving_updates') or channel['receiving_updates'] is None: channel['receiving_updates'] = 'N' # Yum repo checksum type - if (not channel['checksum_type'] - and (RHEL5_REGEXP.match(channel['label']) - or (channel['parent_channel'] - and RHEL5_REGEXP.match(channel['parent_channel'])))): - channel['checksum_type'] = 'sha1' if (channel['checksum_type'] and channel['checksum_type'] not in self.checksum_types): self.checksum_types[channel['checksum_type']] = None

1 0

backend/server
by Milan Zazrivec 30 Mar '12

30 Mar '12

backend/server/rhnChannel.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) New commits: commit 558dfcde3ee34429fcb1f68ee23c93f3eb8f70ed Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Mar 30 18:30:36 2012 +0200 805012 - check channel permissions when unsubscribing a channel diff --git a/backend/server/rhnChannel.py b/backend/server/rhnChannel.py index a591f51..2c9aad7 100644 --- a/backend/server/rhnChannel.py +++ b/backend/server/rhnChannel.py @@ -1787,8 +1787,17 @@ def unsubscribe_channel(server_id, channel, username, password): server_id, channel)) raise rhnFault(72, "You can not unsubscribe %s from base channel %s." % ( server_id, channel)) - # we're fine - return unsubscribe_sql(server_id, ret["id"]) + + # check specific channel subscription permissions + channel_id = ret['id'] + h = rhnSQL.prepare(_query_can_subscribe) + h.execute(cid=channel_id, username=username) + ret = h.fetchone_dict() + + if ret and ret['can_subscribe']: + return unsubscribe_sql(server_id, channel_id) + + raise rhnFault(71) # unsubscribe from all channels def unsubscribe_all_channels(server_id):

1 0

client/rhel
by Milan Zazrivec 30 Mar '12

30 Mar '12

client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 661f8f4189dbbcfda7f46abeff916cb9e6ee54e6 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Mar 30 16:06:35 2012 +0200 804559 - not all msgs are CommunicationError objects Some of the error messages being propagated are just ordinary strings. diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py index be06576..80872d6 100644 --- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py +++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py @@ -43,7 +43,9 @@ def systemExit(code, msgs=None): if type(msgs) not in [type([]), type(())]: msgs = (msgs, ) for msg in msgs: - sys.stderr.write(rhncli.utf8_encode(msg.value) + "\n") + if hasattr(msg, 'value'): + msg = msg.value + sys.stderr.write(rhncli.utf8_encode(msg) + "\n") sys.exit(code) # quick check to see if you are a super-user.

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.9-1'
by Jan Pazdziora 30 Mar '12

30 Mar '12

Tag 'spacewalk-backend-1.8.9-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-30 13:59 +0000 Tagging package [spacewalk-backend] version [1.8.9-1] in directory [backend/]. Changes since spacewalk-schema-1.8.13-1: Jan Pazdziora (2): CVE-2012-1145, 800688 - check the result of parseServ operation. Automatic commit of package [spacewalk-backend] release [1.8.9-1]. Johannes Renner (2): Add lib directory to checkstyle classpath Fix checkstyle error (invalid use of the {@inheritDoc} tag) Milan Zazrivec (1): 804559 - correct string catenation Simon Lukasik (1): New web page -- details of the xccdf:rule-result --- backend/spacewalk-backend.spec | 6 backend/wsgi/wsgiHandler.py | 2 client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 2 java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 12 + java/code/src/com/redhat/rhn/domain/action/scap/ScapActionDetails.java | 2 java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 83 ++++++++++ java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java | 42 +++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 27 +++ java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 15 + java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 53 ++++++ java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 18 +- java/code/webapp/WEB-INF/struts-config.xml | 9 + java/spacewalk-java.spec | 2 rel-eng/packages/spacewalk-backend | 2 14 files changed, 260 insertions(+), 15 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 30 Mar '12

30 Mar '12

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 9109084a5b9a4f09147cc130907084912059803b Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 30 15:59:34 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.9-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 0eaeaaa..5263b46 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.8 +Version: 1.8.9 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Mar 30 2012 Jan Pazdziora 1.8.9-1 +- CVE-2012-1145, 800688 - check the result of parseServ operation. +- Truncate data which are longer than db allows (slukasik(a)redhat.com) + * Thu Mar 29 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.8-1 - Store also @idref of xccdf:rule-result element (slukasik(a)redhat.com) - We want to store all idents per rule-result (slukasik(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index e69fed4..a81faa8 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.8-1 backend/ +1.8.9-1 backend/

1 0

backend/wsgi
by Jan Pazdziora 30 Mar '12

30 Mar '12

backend/wsgi/wsgiHandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bd7ad3667f2388ae9929d1dfc03c49545e17384c Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 30 15:58:45 2012 +0200 CVE-2012-1145, 800688 - check the result of parseServ operation. diff --git a/backend/wsgi/wsgiHandler.py b/backend/wsgi/wsgiHandler.py index a8e7c4a..6296fba 100644 --- a/backend/wsgi/wsgiHandler.py +++ b/backend/wsgi/wsgiHandler.py @@ -36,7 +36,7 @@ def handle(environ, start_response, server, component_type, servertype="spacewal parseServ = get_handle(servertype, "HeaderParserHandler") ret = parseServ(req) - if len(req.output) > 0: + if len(req.output) > 0 or ret != 0: if not req.sent_header: req.send_http_header(status=ret) return req.output

1 0

2 commits - java/code java/spacewalk-java.spec
by Tomas Lestach 30 Mar '12

30 Mar '12

java/code/src/com/redhat/rhn/domain/action/scap/ScapActionDetails.java | 2 +- java/spacewalk-java.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 1608dcf63390c62b2acf62476ba8040a7b9d799a Author: Johannes Renner <jrenner(a)suse.de> Date: Thu Mar 29 16:10:13 2012 +0200 Fix checkstyle error (invalid use of the {@inheritDoc} tag) diff --git a/java/code/src/com/redhat/rhn/domain/action/scap/ScapActionDetails.java b/java/code/src/com/redhat/rhn/domain/action/scap/ScapActionDetails.java index 7c34c49..885da51 100644 --- a/java/code/src/com/redhat/rhn/domain/action/scap/ScapActionDetails.java +++ b/java/code/src/com/redhat/rhn/domain/action/scap/ScapActionDetails.java @@ -28,7 +28,7 @@ public class ScapActionDetails extends ActionChild { private byte[] parameters; /** - * {@inheritDoc} + * Default constructor. */ public ScapActionDetails() { super(); commit 894008bb9d1dd94b8c3677bfe01c57812c75e881 Author: Johannes Renner <jrenner(a)suse.de> Date: Fri Mar 30 10:26:25 2012 +0200 Add lib directory to checkstyle classpath diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 2fc7361..7ae7c45 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -327,7 +327,7 @@ ant -Dprefix=$RPM_BUILD_ROOT init-install compile %if 0%{?run_checkstyle} echo "Running checkstyle on java main sources" -export CLASSPATH="build/classes" +export CLASSPATH="build/classes:build/build-lib/*" export BASE_OPTIONS="-Djavadoc.method.scope=public \ -Djavadoc.type.scope=package \ -Djavadoc.var.scope=package \

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2012