spacewalk-commits July 2012

spacewalk-commits@lists.fedorahosted.org

10 participants
233 discussions

Changes to 'refs/tags/rhnclient-0.18-1'
by Michael Mraka 31 Jul '12

31 Jul '12

Tag 'rhnclient-0.18-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-07-31 14:36 +0000 Tagging package [rhnclient] version [0.18-1] in directory [client/solaris/rhnclient/]. Changes since osad-5.11.4-1: Michael Mraka (1): Automatic commit of package [rhnclient] release [0.18-1]. --- client/solaris/rhnclient/rhnclient.spec | 5 ++++- client/solaris/rhnclient/setup.py | 2 +- rel-eng/packages/rhnclient | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

client/solaris rel-eng/packages
by Michael Mraka 31 Jul '12

31 Jul '12

client/solaris/rhnclient/rhnclient.spec | 5 ++++- client/solaris/rhnclient/setup.py | 2 +- rel-eng/packages/rhnclient | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit 69cea2fcd1f5d3b3a529c49b1e221b087a3da393 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:36:45 2012 +0200 Automatic commit of package [rhnclient] release [0.18-1]. diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec index 1def4bc..ab21975 100644 --- a/client/solaris/rhnclient/rhnclient.spec +++ b/client/solaris/rhnclient/rhnclient.spec @@ -5,7 +5,7 @@ Summary: Red Hat Network Client Utilities and Libraries Name: rhnclient Source0: %{name}-%{version}.tar.gz -Version: 0.17 +Version: 0.18 Release: 1 License: GPLv2 Group: Development/Libraries @@ -64,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT #%doc ChangeLog COPYING README TODO %changelog +* Tue Jul 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 0.18-1 +- removed unused argument oemInfo + * Tue Jul 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 0.17-1 - Add missing space to log message diff --git a/client/solaris/rhnclient/setup.py b/client/solaris/rhnclient/setup.py index c3d1cdc..00ba417 100644 --- a/client/solaris/rhnclient/setup.py +++ b/client/solaris/rhnclient/setup.py @@ -6,7 +6,7 @@ from distutils.core import setup setup(name = "rhnclient", - version = "0.17", + version = "0.18", description = "Red Hat Network Client Utilities and Libraries", long_description = """\ Red Hat Network Client Utilities diff --git a/rel-eng/packages/rhnclient b/rel-eng/packages/rhnclient index bf2c83d..30d4378 100644 --- a/rel-eng/packages/rhnclient +++ b/rel-eng/packages/rhnclient @@ -1 +1 @@ -0.17-1 client/solaris/rhnclient/ +0.18-1 client/solaris/rhnclient/

1 0

Changes to 'refs/tags/osad-5.11.4-1'
by Michael Mraka 31 Jul '12

31 Jul '12

Tag 'osad-5.11.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-07-31 14:36 +0000 Tagging package [osad] version [5.11.4-1] in directory [client/tools/osad/]. Changes since spacewalk-backend-1.8.58-1: Michael Mraka (1): Automatic commit of package [osad] release [5.11.4-1]. --- client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

client/tools rel-eng/packages
by Michael Mraka 31 Jul '12

31 Jul '12

client/tools/osad/osad.spec | 5 ++++- rel-eng/packages/osad | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 32fc046ffa776b75af731f89bbceed8a38d01492 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:36:10 2012 +0200 Automatic commit of package [osad] release [5.11.4-1]. diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index d2cef61..1a4bdef 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.3 +Version: 5.11.4 Release: 1%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -298,6 +298,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {} %endif %changelog +* Tue Jul 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.11.4-1 +- 844603 - removed PyXML dependency + * Mon Jul 30 2012 Michael Mraka <michael.mraka(a)redhat.com> 5.11.3-1 - there's no elsif macro diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad index 173346d..bef9cbf 100644 --- a/rel-eng/packages/osad +++ b/rel-eng/packages/osad @@ -1 +1 @@ -5.11.3-1 client/tools/osad/ +5.11.4-1 client/tools/osad/

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.58-1'
by Michael Mraka 31 Jul '12

31 Jul '12

Tag 'spacewalk-backend-1.8.58-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-07-31 14:34 +0000 Tagging package [spacewalk-backend] version [1.8.58-1] in directory [backend/]. Changes since spacewalk-java-1.8.120-1: Michael Mraka (5): 844603 - removed broken unused unittests 844603 - removed PyXML dependency 844603 - removed PyXML from comment 844603 - removed PyXML dependency Automatic commit of package [spacewalk-backend] release [1.8.58-1]. --- backend/satellite_tools/test/testxmlparser.py | 51 ------------------ backend/satellite_tools/test/testxmlwriter.py | 71 -------------------------- backend/satellite_tools/xmlSource.py | 6 +- backend/spacewalk-backend.spec | 6 +- client/tools/osad/osad.spec | 3 - rel-eng/packages/spacewalk-backend | 2 6 files changed, 8 insertions(+), 131 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 31 Jul '12

31 Jul '12

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 895dfe7f03ce0b39bf6283e466ac5717b2deaca3 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:34:47 2012 +0200 Automatic commit of package [spacewalk-backend] release [1.8.58-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index d67fc80..598a896 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.57 +Version: 1.8.58 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -647,6 +647,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Jul 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.58-1 +- 844603 - removed PyXML dependency + * Tue Jul 31 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.57-1 - upload_server is now pylint-able - fixed pylint errors / warnings diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 9234a7e..ed0420d 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.57-1 backend/ +1.8.58-1 backend/

1 0

4 commits - backend/satellite_tools backend/spacewalk-backend.spec client/tools
by Michael Mraka 31 Jul '12

31 Jul '12

backend/satellite_tools/test/testxmlparser.py | 51 ------------------ backend/satellite_tools/test/testxmlwriter.py | 71 -------------------------- backend/satellite_tools/xmlSource.py | 6 +- backend/spacewalk-backend.spec | 1 client/tools/osad/osad.spec | 3 - 5 files changed, 3 insertions(+), 129 deletions(-) New commits: commit c184f39a3b35a7cb9048be5b68f00de6a3013aad Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:31:21 2012 +0200 844603 - removed PyXML dependency diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec index 148a0ef..d2cef61 100644 --- a/client/tools/osad/osad.spec +++ b/client/tools/osad/osad.spec @@ -29,9 +29,6 @@ Requires: python-hashlib %endif %if 0%{?suse_version} >= 1140 Requires: python-xml -%else -# This should have been required by rhnlib -Requires: PyXML %endif Conflicts: osa-dispatcher < %{version}-%{release} Conflicts: osa-dispatcher > %{version}-%{release} commit 49a45aa24bd44fbe6f304642f8cfe69e5d3d9ae2 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:24:20 2012 +0200 844603 - removed PyXML from comment diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py index 75c645c..a585e88 100644 --- a/backend/satellite_tools/xmlSource.py +++ b/backend/satellite_tools/xmlSource.py @@ -57,18 +57,18 @@ class IncompatibleVersionError(ParseException): self.stream_version = stream_version self.parser_version = parser_version -# PyXML parser exception wrappers +# XML parser exception wrappers # Exposed functionality for the next three include: # getColumnNumber(), getLineNumber(), and _msg (or just str(e)) class RecoverableParseException(SAXParseException): - """exception wrapper for a critical, but possibly recoverable, PyXML parser + """exception wrapper for a critical, but possibly recoverable, XML parser error. """ pass class FatalParseException(SAXParseException): - """exception wrapper for a critical PyXML parser error. + """exception wrapper for a critical XML parser error. """ pass commit 7071fefc1fa4b9bf7b0dcfc891c952fab5d74b43 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:21:49 2012 +0200 844603 - removed PyXML dependency diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2b9235a..d67fc80 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -243,7 +243,6 @@ Requires: spacewalk-certs-tools Requires: spacewalk-admin >= 0.1.1-0 Requires: python-gzipstream Requires: python-hashlib -Requires: PyXML Requires: mod_ssl Requires: %{name}-xml-export-libs Requires: cobbler >= 2.0.0 commit 3e695ebe108b372b3c89ab1db5a6cb224622a84b Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Jul 31 16:19:12 2012 +0200 844603 - removed broken unused unittests these look to be the only files which require obsoleted PyXML diff --git a/backend/satellite_tools/test/testxmlparser.py b/backend/satellite_tools/test/testxmlparser.py deleted file mode 100644 index 1627734..0000000 --- a/backend/satellite_tools/test/testxmlparser.py +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# -import string -from xml.sax import make_parser, saxutils -from xml.sax.handler import feature_namespaces -from xml.unicode.utf8_iso import utf8_to_code - -parser = make_parser(feature_namespaces) - -chars = [] - -def utf8_to_string(charlist): - ret = [] - while charlist: - c, charlist = utf8_to_code(1, charlist) - ret.append(c) - return string.join(ret, "") - -class Handler(saxutils.DefaultHandler): - def startElement(self, element, attrs): - print "Start: %s" % element - - def endElement(self, element): - print "End: %s" % element - - def characters(self, data): - global chars - chars.append(data) - -f = open("/tmp/document.xml") -h = Handler() -parser.setContentHandler(h) - -parser.parse(f) - -chars = string.join(chars, "") -chars = utf8_to_string(chars) -print len(chars) -print chars diff --git a/backend/satellite_tools/test/testxmlwriter.py b/backend/satellite_tools/test/testxmlwriter.py deleted file mode 100644 index e2920e4..0000000 --- a/backend/satellite_tools/test/testxmlwriter.py +++ /dev/null @@ -1,71 +0,0 @@ -# -# Copyright (c) 2008 Red Hat, Inc. -# -# This software is licensed to you under the GNU General Public License, -# version 2 (GPLv2). There is NO WARRANTY for this software, express or -# implied, including the implied warranties of MERCHANTABILITY or FITNESS -# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2 -# along with this software; if not, see -# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt. -# -# Red Hat trademarks are not licensed under GPLv2. No permission is -# granted to use or replicate Red Hat trademarks that are incorporated -# in this software or its documentation. -# -import string -from xml.sax.saxutils import escape -from xml.unicode.utf8_iso import code_to_utf8 -import xml.sax.writer - -def my_escape(data, entities={}): - print "My own escape function" - data = escape(data, entities) - data = string.join(map(lambda x: code_to_utf8(1, x), data), "") - return data - -setattr(xml.sax.writer, 'escape', my_escape) - -class XML_writer(xml.sax.writer.XmlWriter): - def __init__(self, fp, standalone=None, dtdinfo=None, syntax=None, - linelength=None, encoding='iso-8859-1'): - xml.sax.writer.XmlWriter.__init__(self, fp, standalone=standalone, - dtdinfo=dtdinfo, syntax=syntax, linelength=linelength, - encoding=encoding) - self._stack = [] - - def startElement(self, tag, attrs={}): - xml.sax.writer.XmlWriter.startElement(self, tag, attrs) - self._stack.append(tag) - - def characters(self, data, start=0, length=None): - if length is None: - length = len(data) - # Close the open tag if necessary - xml.sax.writer.XmlWriter.characters(self, data, start, length) - - def endElement(self, tag): - xml.sax.writer.XmlWriter.endElement(self, tag) - self._stack.pop() - - def endDocument(self): - while self._stack: - tag = self._stack[-1] - self.endElement(tag) - -f = open("/tmp/document.xml", "w+") -w = XML_writer(f, encoding='utf-8') - -w.startDocument() -w.startElement("rhn-satellite", {"version" : 1}) -w.startElement("rhn-channels") -w.startElement("rhn-channel", { - 'label' : 'redhat-linux-i386-7.2', - 'arch' : 'i386', -}) -s = "0123456789 ©" * 100 -w.characters(s) -w.endElement("rhn-channel") -w.endElement("rhn-channels") -w.endElement("rhn-satellite") -w.endDocument() -f.close()

1 0

Changes to 'refs/tags/spacewalk-java-1.8.120-1'
by Tomáš Kašpárek 31 Jul '12

31 Jul '12

Tag 'spacewalk-java-1.8.120-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2012-07-31 14:04 +0000 Tagging package [spacewalk-java] version [1.8.120-1] in directory [java/]. Changes since spacewalk-backend-1.8.57-1: Tomas Kasparek (2): 838618 - Allowing some API calls to be called from another organizations Automatic commit of package [spacewalk-java] release [1.8.120-1]. --- java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 46 +++++++++- java/spacewalk-java.spec | 5 - rel-eng/packages/spacewalk-java | 2 3 files changed, 47 insertions(+), 6 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek 31 Jul '12

31 Jul '12

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 6d320d2e5735d11cbbbf00ddd2b368a739149650 Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Jul 31 16:04:18 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.120-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 5eb7f69..6e273c3 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -23,7 +23,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.119 +Version: 1.8.120 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -614,6 +614,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Tue Jul 31 2012 Tomas Kasparek <tkasparek(a)redhat.com> 1.8.120-1 +- 838618 - Allowing some API calls to be called from another organizations + * Mon Jul 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.119-1 - remove usage of cert_admin user role - remove usage of rhn_support user role diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index b9c2566..3af79cf 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.119-1 java/ +1.8.120-1 java/

1 0

java/code
by Tomáš Kašpárek 31 Jul '12

31 Jul '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 46 +++++++++- 1 file changed, 42 insertions(+), 4 deletions(-) New commits: commit 2588078268d806a98a6d3fe8d54e9e110efb3e3a Author: Tomas Kasparek <tkasparek(a)redhat.com> Date: Tue Jul 31 15:59:05 2012 +0200 838618 - Allowing some API calls to be called from another organizations Allowing errata.getDetails and errata.listPackages to be called if the errata is reachable via any shared channel from organizanion that does not own the errata. diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java index 9a90b32..efd756a 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java @@ -217,7 +217,7 @@ public class ErrataHandler extends BaseHandler { // just want to make sure the caller is logged in. User loggedInUser = getLoggedInUser(sessionKey); - Errata errata = lookupErrata(advisoryName, loggedInUser.getOrg()); + Errata errata = lookupErrataReadOnly(advisoryName, loggedInUser.getOrg()); Map errataMap = new HashMap(); @@ -700,7 +700,7 @@ public class ErrataHandler extends BaseHandler { throws FaultException { // Get the logged in user User loggedInUser = getLoggedInUser(sessionKey); - Errata errata = lookupErrata(advisoryName, loggedInUser.getOrg()); + Errata errata = lookupErrataReadOnly(advisoryName, loggedInUser.getOrg()); List<Map> toRet = new ArrayList<Map>(); for (PackageDto dto : PackageManager.listPackageDtosForErrata(errata)) { @@ -846,14 +846,52 @@ public class ErrataHandler extends BaseHandler { * need to make sure here that everything is checked correclty */ if (errata.getOrg() != null && !errata.getOrg().equals(org)) { - throw new FaultException(-209, "no_such_errata", - "The errata " + advisoryName + " cannot be found."); + throw new FaultException(-209, "no_rights_to_access", + "You don't have rights to access " + advisoryName + " errata."); } return errata; } /** + * Private helper method to lookup an errata and throw a Fault exception if it isn't + * found + * @param advisoryName The advisory name for the erratum you're looking for + * @return Returns the errata or a Fault Exception + * @throws FaultException Occurs when the erratum is not found + */ + private Errata lookupErrataReadOnly(String advisoryName, Org org) + throws FaultException { + Errata errata = ErrataManager.lookupByAdvisory(advisoryName); + + /* + * ErrataManager.lookupByAdvisory() could return null, so we need to check + * and throw a no_such_errata exception if the errata was not found. + */ + if (errata == null) { + throw new FaultException(-208, "no_such_errata", + "The errata " + advisoryName + " cannot be found."); + } + /** + * errata with org_id of null are public, but ones with an org id of !null are not + * need to make sure here that everything is checked correclty + */ + + if (errata.getOrg() == null || errata.getOrg().equals(org)) { + return errata; + } + Set<Channel> errataChannels = errata.getChannels(); + List orgChannels = org.getAccessibleChannels(); + for (Channel channel : errataChannels) { + if (orgChannels.contains(channel)) { + return errata; + } + } + throw new FaultException(-209, "no_rights_to_access", + "You don't have rights to access " + advisoryName + " errata."); + } + + /** * Clones a list of errata into a specified channel * * @param sessionKey The sessionKey containing the logged in user

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits July 2012