3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java | 6 +-
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 21 ++++++----
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 2
java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 2
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 8 +--
6 files changed, 24 insertions(+), 17 deletions(-)
New commits:
commit 0b9d56bce3eec96f11b6e6bad3a37bc396b6abde
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 18 13:15:59 2009 +0100
sha256 changes for taskomatic
includes message digests fix
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
index 1ee0db6..1055480 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
@@ -42,13 +42,13 @@ public class CompressingDigestOutputWriter extends OutputStream implements
* @param stream The stream to compress
* @param checksumtype checksum type
*/
- public CompressingDigestOutputWriter(OutputStream stream, String checksumtype) {
+ public CompressingDigestOutputWriter(OutputStream stream, String checksumAlgo) {
try {
compressedDigestStream = new DigestOutputStream(stream,
- MessageDigest.getInstance(checksumtype));
+ MessageDigest.getInstance(checksumAlgo));
compressedStream = new GZIPOutputStream(compressedDigestStream);
uncompressedDigestStream = new DigestOutputStream(compressedStream,
- MessageDigest.getInstance(checksumtype));
+ MessageDigest.getInstance(checksumAlgo));
}
catch (NoSuchAlgorithmException nsae) {
// XXX fatal runtime exception
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
index 9594bd9..46160c3 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java
@@ -183,7 +183,7 @@ public class PrimaryXmlWriter extends RepomdWriter {
handler.endElement("version");
attr.clear();
- attr.addAttribute("type", "md5");
+ attr.addAttribute("type", sanitize(pkgId, pkgDto.getChecksumType()));
attr.addAttribute("pkgid", "YES");
handler.startElement("checksum", attr);
handler.addCharacters(sanitize(pkgId, pkgDto.getChecksum()));
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index 22c4f82..dab4af4 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -108,13 +108,19 @@ public class RepositoryWriter {
log.info("Checksum Type Value" + this.checksumtype);
+ // available digests: MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
+ String checksum_algo = this.checksumtype;
+ if (checksum_algo.toUpperCase().startsWith("SHA")) {
+ checksum_algo = this.checksumtype.substring(0, 3) + "-" + this.checksumtype.substring(3);
+ }
+
try {
primaryFile = new CompressingDigestOutputWriter(
- new FileOutputStream(prefix + PRIMARY_FILE), this.checksumtype);
+ new FileOutputStream(prefix + PRIMARY_FILE), checksum_algo);
filelistsFile = new CompressingDigestOutputWriter(
- new FileOutputStream(prefix + FILELISTS_FILE), this.checksumtype);
+ new FileOutputStream(prefix + FILELISTS_FILE), checksum_algo);
otherFile = new CompressingDigestOutputWriter(new FileOutputStream(
- prefix + OTHER_FILE), this.checksumtype);
+ prefix + OTHER_FILE), checksum_algo);
}
catch (IOException e) {
throw new RepomdRuntimeException(e);
@@ -181,9 +187,9 @@ public class RepositoryWriter {
'"');
log.info("Checksum Type Value for generate updateinfo" + this.checksumtype);
RepomdIndexData updateinfoData = generateUpdateinfo(channel, prefix,
- this.checksumtype);
+ checksum_algo);
- RepomdIndexData groupsData = loadCompsFile(channel);
+ RepomdIndexData groupsData = loadCompsFile(channel, checksum_algo);
//Set the type so yum can read and perform checksum
primaryData.setType(this.checksumtype);
@@ -234,9 +240,10 @@ public class RepositoryWriter {
/**
*
* @param channel channel indo
+ * @param checksumAlgo checksum algorithm
* @return repomd index for given channel
*/
- private RepomdIndexData loadCompsFile(Channel channel) {
+ private RepomdIndexData loadCompsFile(Channel channel, String checksumAlgo) {
String relativeFilename;
String compsMount = Config.get().getString(ConfigDefaults.MOUNT_POINT);
@@ -262,7 +269,7 @@ public class RepositoryWriter {
DigestInputStream digestStream;
try {
digestStream = new DigestInputStream(stream, MessageDigest
- .getInstance(this.checksumtype));
+ .getInstance(checksumAlgo));
}
catch (NoSuchAlgorithmException nsae) {
throw new RepomdRuntimeException(nsae);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
index 572015c..966720e 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
@@ -179,7 +179,7 @@ public class UpdateInfoWriter extends RepomdWriter {
pkg.getFilename()));
attr.clear();
- attr.addAttribute("type", "md5");
+ attr.addAttribute("type", sanitize(pkgId, pkg.getChecksum().getChecksumType().getLabel()));
handler.startElement("sum", attr);
handler.addCharacters(sanitize(pkgId, pkg.getChecksum().getChecksum()));
handler.endElement("sum");
commit ee863d14a19b69d0f48ce26319d40e633229c909
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Dec 17 12:15:03 2009 +0100
adding checksum type for rhn/errata/details/Packages.do page
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
index e558316..c09739b 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp
@@ -28,7 +28,7 @@
</c:if>
<c:forEach items="${current.packages}" var="pack">
- <tt>${pack.checksum}</tt>
+ <tt>${pack.checksumType}:${pack.checksum}</tt>
<a href="/rhn/software/packages/Details.do?pid=${pack.id}">
<c:out value="${pack.name}"/>
</a>
commit 53588c74b8008183156aed922fe8b433c6826aad
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 11 16:57:52 2009 +0100
displaying checkum type on rhn/software/packages/Details.do page
diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
index d4aa452..48bc1bc 100644
--- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
@@ -68,10 +68,10 @@
</tr>
<tr>
- <th><bean:message key="package.jsp.md5sum"/>:</th>
- <td><c:out value="${pack.checksum}" /></td>
- </tr>
-
+ <th><c:out value="${pack.checksum.checksumType.description}"/>:</th>
+ <td><c:out value="${pack.checksum.checksum}" /></td>
+ </tr>
+
<tr>
<th><bean:message key="package.jsp.path"/>:</th>
<td><c:out value="${pack.path}" /></td>
14 years, 4 months
Changes to 'refs/tags/yum-rhn-plugin-0.8.1-1'
by Miroslav Suchý
Tag 'yum-rhn-plugin-0.8.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-18 09:40 +0000
Tagging package [yum-rhn-plugin] version [0.8.1-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since spacewalk-backend-0.8.13-1:
Miroslav Suchý (2):
548448 - when we are doing rollback, bypass dependecy resolution
Automatic commit of package [yum-rhn-plugin] release [0.8.1-1].
---
client/rhel/yum-rhn-plugin/actions/packages.py | 46 ++++++++++++++++++++++---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 ++-
rel-eng/packages/yum-rhn-plugin | 2 -
3 files changed, 47 insertions(+), 7 deletions(-)
---
14 years, 4 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 6 +++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 6853129e36e7503ea7f56f0a32f7a5e15085dae1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Dec 18 10:40:04 2009 +0100
Automatic commit of package [yum-rhn-plugin] release [0.8.1-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 51accb4..66c9fb7 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 0.8.0
+Version: 0.8.1
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Dec 18 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.8.1-1
+- 504295 - retrieve and use debug level from rhncli, pass it to yum
+- 548448 - when we are doing rollback, bypass dependecy resolution
+
* Tue Dec 1 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.8-1
- 437822 - python dependecy is not picked up automatically
- 437822 - when persistent enable/disable of rhn repo is requested, do it in rhnplugin.conf
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index f4109a2..3d3671d 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-0.7.8-1 client/rhel/yum-rhn-plugin/
+0.8.1-1 client/rhel/yum-rhn-plugin/
14 years, 4 months
client/rhel
by Miroslav Suchý
client/rhel/yum-rhn-plugin/actions/packages.py | 46 ++++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
New commits:
commit 721fb1e282395f1c8f9719f45c24c5382805cac6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Dec 18 10:21:02 2009 +0100
548448 - when we are doing rollback, bypass dependecy resolution
diff --git a/client/rhel/yum-rhn-plugin/actions/packages.py b/client/rhel/yum-rhn-plugin/actions/packages.py
index 3aeffe2..9be06ea 100644
--- a/client/rhel/yum-rhn-plugin/actions/packages.py
+++ b/client/rhel/yum-rhn-plugin/actions/packages.py
@@ -204,6 +204,22 @@ class YumAction(yum.YumBase):
return ()
def add_transaction_data(self, transaction_data):
+ """ Add packages to transaction.
+ transaction_data is in format:
+ { 'packages' : [
+ [['name', '1.0.0', '1', '', ''], 'e'], ...
+ # name, versio, rel., epoch, arch, flag
+ ]}
+ where flag can be:
+ i - install
+ u - update
+ e - remove
+ r - rollback
+ Note: install and update will check for dependecies and
+ obsoletes and will install them if needed.
+ Rollback do not check anything and will assume that state
+ to which we are rolling back should be correct.
+ """
for pkgtup, action in transaction_data['packages']:
pkgkeys = {
'name' : pkgtup[0],
@@ -215,10 +231,19 @@ class YumAction(yum.YumBase):
pkgkeys['arch'] = pkgtup[4]
else:
pkgtup.append('')
+ pkgkeys['arch'] = None
if action == 'u':
self.update(**pkgkeys)
elif action == 'i':
self.install(**pkgkeys)
+ elif action == 'r':
+ # we are doing rollback, we want exact version
+ # no dependecy check
+ pkgs = self.pkgSack.searchNevra(name=pkgkeys['name'],
+ epoch=pkgkeys['epoch'], arch=pkgkeys['arch'],
+ ver=pkgkeys['version'], rel=pkgkeys['release'])
+ for po in pkgs:
+ self.tsInfo.addInstall(po)
elif action == 'e':
package_tup = _yum_package_tup(pkgtup)
packages = self.getInstalledPkgObject(package_tup)
@@ -256,7 +281,7 @@ def remove(package_list):
transaction_data = __make_transaction(package_list, 'e')
- return runTransaction(transaction_data)
+ return _runTransaction(transaction_data)
def update(package_list):
"""We have been told that we should retrieve/install packages"""
@@ -268,11 +293,11 @@ def update(package_list):
transaction_data = __make_transaction(package_list, 'i')
- return runTransaction(transaction_data)
+ return _runTransaction(transaction_data)
def __make_transaction(package_list, action):
"""
- Build transaction Data like runTransaction would expect.
+ Build transaction Data like _runTransaction would expect.
This is a list of ((n,v,r,e,a), m) where m is either e, i, or u
"""
@@ -297,12 +322,23 @@ class RunTransactionCommand:
def execute(self, yum_base):
yum_base.add_transaction_data(self.transaction_data)
-def runTransaction(transaction_data):
+def _runTransaction(transaction_data)
""" Run a tranaction on a group of packages. """
-
command = RunTransactionCommand(transaction_data)
return _run_yum_action(command)
+def runTransaction(transaction_data):
+ """ Run a transaction on a group of packages.
+ This was historicaly meant as generic call, but
+ is only called for rollback.
+ Therefore we change all actions "i" (install) to
+ "r" (rollback) where we will not check dependencies and obsoletes.
+ """
+ for index, data in enumerate(transaction_data['packages']):
+ if data[1] == 'i':
+ transaction_data['packages'][index][1] = 'r'
+ return _runTransaction(transaction_data)
+
class FullUpdateCommand:
def execute(self, yum_base):
14 years, 4 months
Changes to 'refs/tags/spacewalk-backend-0.8.13-1'
by Michael Mraka
Tag 'spacewalk-backend-0.8.13-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2009-12-17 09:53 +0000
Tagging package [spacewalk-backend] version [0.8.13-1] in directory [backend/].
Changes since spacewalk-java-0.8.3-1:
Jan Pazdziora (14):
The webapp.conf is not used anywhere.
Removal of webapp.conf makes PXT::ApacheHandler::TransHandler unused, removing.
The package_download Style does not seem to be used anywhere, removing.
download_packages.pxt was in the second rhn-tab-url in both channel_detail.xmls, and not referenced from anywhere else, removing.
Removal of download_packages.pxt makes rhn-download and download unused, removing.
Removal of download_packages.pxt makes rhn-download-package-list and download_package_list unused, removing.
rhn-download-package not used anywhere, removing, as well as download_package.
Removal of download_packages.pxt made rhn:download_packages_cb and download_packages_cb unused, removing.
Removal of download made rhn:clear_set_cb and clear_set_cb unused, removing.
rhn:errata_editor:errata_edit_cb not used, removing, as well as errata_edit_cb.
Removal of download_packages.pxt made rhn-must-select-archs and must_select_archs unused, removing.
Removal of download_package_list made available_package_arches unused, removing.
Removal of download_package made latest_package_by_name unused, removing.
Removal of $errata_data made get_advisory_types unused, removing.
Justin Sherrill (4):
changing mock request to default to a POST request
making selinux not required for server.config.createOrUpdate() api call, also adding selinux_ctx to the documentation
adding channel.software.regenerateYumCache() api call
528833 - fixing issue where updates would fail when registered using an activation key of a disabled user
Michael Mraka (5):
modified to fit sha256 schema changes
old export has md5sum key
fixed UnboundLocalError: local variable 'checksum' referenced before assignment
satellite-sync - sha256 changes for kickstart import
Automatic commit of package [spacewalk-backend] release [0.8.13-1].
---
backend/satellite_tools/satsync.py | 12
backend/server/handlers/xmlrpc/registration.py | 6
backend/server/importlib/backendOracle.py | 4
backend/server/importlib/kickstartImport.py | 13
backend/server/rhnUser.py | 5
backend/spacewalk-backend.spec | 6
backend/upload_server/handlers/package_push/package_push.py | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java | 23 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java | 5
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 3
java/code/src/com/redhat/rhn/testing/RhnMockHttpServletRequest.java | 18
java/code/webapp/WEB-INF/nav/channel_detail.xml | 1
java/conf/httpd/webapp.conf | 110 ----
rel-eng/packages/spacewalk-backend | 2
web/conf/rhn_web.conf | 2
web/html/nav/channel_detail.xml | 1
web/html/network/software/channels/download_packages.pxt | 71 ---
web/modules/pxt/PXT/ApacheHandler.pm | 29 -
web/modules/rhn/RHN/DB/AppInstall/Session.pm | 4
web/modules/rhn/RHN/DB/Channel.pm | 16
web/modules/rhn/RHN/DB/Errata.pm | 6
web/modules/rhn/RHN/DB/Package.pm | 80 ---
web/modules/sniglets/Sniglets/Downloads.pm | 27 -
web/modules/sniglets/Sniglets/ErrataEditor.pm | 221 ----------
web/modules/sniglets/Sniglets/ListView/Style.pm | 34 -
web/modules/sniglets/Sniglets/Packages.pm | 121 -----
web/modules/sniglets/Sniglets/Sets.pm | 20
27 files changed, 87 insertions(+), 757 deletions(-)
---
14 years, 4 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit d50ff7b4dfe3f0f830809a42e30b8a54f704c8ef
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 17 10:53:19 2009 +0100
Automatic commit of package [spacewalk-backend] release [0.8.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 44ef889..61e41aa 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -8,7 +8,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 0.8.12
+Version: 0.8.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -593,6 +593,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Dec 17 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.13-1
+- fixed kickastart import for sha256 exports
+- 528833 - fixed using an activation key of a disabled user
+
* Wed Dec 16 2009 Michael Mraka <michael.mraka(a)redhat.com> 0.8.12-1
- fixed satellite-sync of pre-sha256 exports
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 4def629..4b7e771 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-0.8.12-1 backend/
+0.8.13-1 backend/
14 years, 4 months
4 commits - backend/satellite_tools backend/server backend/upload_server web/modules
by Michael Mraka
backend/satellite_tools/satsync.py | 12 ++++++-----
backend/server/importlib/backendOracle.py | 4 +--
backend/server/importlib/kickstartImport.py | 13 ++++++++++++
backend/upload_server/handlers/package_push/package_push.py | 4 +--
web/modules/rhn/RHN/DB/AppInstall/Session.pm | 4 +--
5 files changed, 26 insertions(+), 11 deletions(-)
New commits:
commit c36ea4a58aab2a12e3808a10b7c683b7a5a8f6f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Dec 17 10:18:34 2009 +0100
satellite-sync - sha256 changes for kickstart import
diff --git a/backend/server/importlib/backendOracle.py b/backend/server/importlib/backendOracle.py
index d97b625..8f47846 100644
--- a/backend/server/importlib/backendOracle.py
+++ b/backend/server/importlib/backendOracle.py
@@ -473,11 +473,11 @@ class OracleBackend(Backend):
fields = {
'kstree_id' : DBint(),
'relative_filename' : DBstring(256),
- 'md5sum' : DBstring(64),
+ 'checksum_id' : DBint(),
'file_size' : DBint(),
'last_modified' : DBdateTime()
},
- pk = ['kstree_id', 'relative_filename'],
+ pk = ['kstree_id', 'relative_filename', 'checksum_id'],
attribute = 'files',
map = {
'relative_filename' : 'relative_path',
diff --git a/backend/server/importlib/kickstartImport.py b/backend/server/importlib/kickstartImport.py
index 36d1efc..9fdcf1f 100644
--- a/backend/server/importlib/kickstartImport.py
+++ b/backend/server/importlib/kickstartImport.py
@@ -27,6 +27,7 @@ class KickstartableTreeImport(Import):
self.kstree_types = {}
self.ks_install_types = {}
+ self.checksums = {}
def preprocess(self):
# Processes the batch to a form more suitable for database
@@ -46,11 +47,20 @@ class KickstartableTreeImport(Import):
ks_install_label = ent['install_type_label']
ks_install_name = ent['install_type_name']
self.ks_install_types[ks_install_label] = ks_install_name
+ for f in ent['files']:
+ if 'md5sum' in f: # old pre-sha256 export
+ checksum = ('md5', f['md5sum'])
+ else:
+ checksum = (f['checksum_type'], f['checksum'])
+ f['checksum'] = checksum
+ if checksum not in self.checksums:
+ self.checksums[checksum] = None
def fix(self):
self.backend.lookup_kstree_types(self.kstree_types)
self.backend.lookup_ks_install_types(self.ks_install_types)
self.backend.lookupChannels(self.channels)
+ self.backend.lookupChecksums(self.checksums)
for ent in self.batch:
if ent.ignored:
@@ -65,6 +75,9 @@ class KickstartableTreeImport(Import):
ks_install_label = ent['install_type_label']
ent['kstree_type'] = self.kstree_types[kstree_type_label]
ent['install_type'] = self.ks_install_types[ks_install_label]
+ for f in ent['files']:
+ f['checksum_id'] = self.checksums[f['checksum']]
+
def submit(self):
self.backend.processKickstartTrees(self.batch)
commit ca22d7dc41edfc7f7531c36d12a58e9657809c6a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 16 16:39:58 2009 +0100
fixed UnboundLocalError: local variable 'checksum' referenced before assignment
Traceback (most recent call last):
File "/usr/share/rhn/server/apacheUploadServer.py", line 107, in _wrapper
ret = function(req)
File "/usr/share/rhn/upload_server/handlers/package_push/package_push.py", line 118,
+in handler
checksum = (header.checksum_type(),
UnboundLocalError: local variable 'checksum' referenced before assignment
diff --git a/backend/upload_server/handlers/package_push/package_push.py b/backend/upload_server/handlers/package_push/package_push.py
index f18c4b9..03840d3 100644
--- a/backend/upload_server/handlers/package_push/package_push.py
+++ b/backend/upload_server/handlers/package_push/package_push.py
@@ -27,7 +27,7 @@ from rhn import rpclib
from common import CFG, log_debug, log_error, rhnFault, rhnFlags
from server import rhnPackageUpload, rhnSQL, basePackageUpload
-from spacewalk.common import checksum
+from spacewalk.common.checksum import getFileChecksum
class PackagePush(basePackageUpload.BasePackageUpload):
def __init__(self, req):
@@ -116,7 +116,7 @@ class PackagePush(basePackageUpload.BasePackageUpload):
# Sanity check - removed, the package path can no longer be determined
# without the header
checksum = (header.checksum_type(),
- checksum.getFileChecksum(header.checksum_type(), file=temp_stream))
+ getFileChecksum(header.checksum_type(), file=temp_stream))
self.rel_package_path = rhnPackageUpload.relative_path_from_header(
header, org_id=self.org_id, checksum=checksum)
self.package_path = os.path.join(CFG.MOUNT_POINT,
commit 211dc74310a70eb4c2c61ecd80b790d752218615
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 16 15:05:32 2009 +0100
old export has md5sum key
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 38a50d9..ca92549 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -849,7 +849,7 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
def _diff_packages(self):
package_collection = sync_handlers.ShortPackageCollection()
nvrea_keys = ['name', 'epoch', 'version', \
- 'release', 'arch', 'checksum']
+ 'release', 'arch', 'checksum', 'checksum_type']
h = rhnSQL.prepare(self._query_compare_packages)
missing_channel_packages = {}
@@ -876,6 +876,9 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
package = package_collection.get_package(pid, p_timestamp)
assert package is not None
nevra = {}
+ if 'md5sum' in package: # old pre-sha256 export
+ package['checksum_type'] = 'md5'
+ package['checksum'] = package['md5sum']
for t in nvrea_keys:
nevra[t] = package[t] or ""
@@ -885,14 +888,13 @@ Please contact your RHN representative""" % (generation, sat_cert.generation))
else:
nevra['org_id'] = package['org_id']
- params = nevra.copy()
- params['checksum_type'] = nevra['checksum'][0]
- params['checksum'] = nevra['checksum'][1]
- apply(h.execute, (), params)
+ apply(h.execute, (), nevra)
row = h.fetchone_dict()
# Update the progress bar
pb.addTo(1)
pb.printIncrement()
+ # make checksum tuple (type, string)
+ package['checksum'] = (package['checksum_type'], package['checksum'])
self._process_package(pid, package, l_timestamp, row,
m_channel_packages, m_fs_packages, source=0)
pb.printComplete()
commit 131184357ec6a098bf547ce122c9abdc46674e68
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Dec 16 14:58:17 2009 +0100
modified to fit sha256 schema changes
diff --git a/web/modules/rhn/RHN/DB/AppInstall/Session.pm b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
index 39db401..7c4e7c4 100644
--- a/web/modules/rhn/RHN/DB/AppInstall/Session.pm
+++ b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
@@ -30,7 +30,7 @@ my %valid_fields = (id => 0,
app_instance => { isa => 'RHN::AppInstall::Instance',
optional => 1 },
instance_id => 0,
- md5sum => 0,
+ checksum_id => 0,
process_name => { type => SCALAR },
step_number => { type => SCALAR | UNDEF,
default => -1 },
@@ -69,7 +69,7 @@ sub sequence { return 'rhn_appinst_session_id_seq' }
my %db_fields = (id => 1,
instance_id => 1,
- md5sum => 1,
+ checksum_id => 1,
process_name => 1,
step_number => 1,
user_id => 1,
14 years, 4 months
11 commits - java/code web/html web/modules
by Jan Pazdziora
java/code/webapp/WEB-INF/nav/channel_detail.xml | 1
web/html/nav/channel_detail.xml | 1
web/html/network/software/channels/download_packages.pxt | 71 ----
web/modules/rhn/RHN/DB/Channel.pm | 16 -
web/modules/rhn/RHN/DB/Errata.pm | 6
web/modules/rhn/RHN/DB/Package.pm | 80 -----
web/modules/sniglets/Sniglets/Downloads.pm | 27 -
web/modules/sniglets/Sniglets/ErrataEditor.pm | 221 ---------------
web/modules/sniglets/Sniglets/Packages.pm | 121 --------
web/modules/sniglets/Sniglets/Sets.pm | 20 -
10 files changed, 564 deletions(-)
New commits:
commit 6b50c7e127f28fe0239b4a3d883160868b998465
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:50:27 2009 +0100
Removal of $errata_data made get_advisory_types unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Errata.pm b/web/modules/rhn/RHN/DB/Errata.pm
index 39642c2..bec1f1d 100644
--- a/web/modules/rhn/RHN/DB/Errata.pm
+++ b/web/modules/rhn/RHN/DB/Errata.pm
@@ -1072,12 +1072,6 @@ EOQ
return @ret;
}
-sub get_advisory_types {
- my $class = shift;
-
- return ( [ "Bug Fix Advisory" ], [ "Product Enhancement Advisory" ], [ "Security Advisory" ] );
-}
-
sub get_product_types {
my $dbh = RHN::DB->connect;
my $query = "SELECT DISTINCT(product) FROM rhnErrata";
commit b90792c898b1c557e40384dd20d5c8e319287c29
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:48:21 2009 +0100
Removal of download_package made latest_package_by_name unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 65d11ba..6ed04ef 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1659,22 +1659,6 @@ EOQ
return ($pid, $path);
}
-sub latest_package_by_name {
- my $self = shift;
- my $name = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CP.package_id
- FROM rhnChannelNewestPackage CP
- WHERE CP.channel_id = :cid
- AND CP.name_id = LOOKUP_PACKAGE_NAME(:name)
-EOQ
-
- $sth->execute_h(cid => $self->id, name => $name);
- return map { @$_ } $sth->fullfetch;
-}
-
sub latest_package_like {
my $class = shift;
my $cid = shift;
commit 8abd734ebce8db79d3dd50454150e5d8652d938c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:45:50 2009 +0100
Removal of download_package_list made available_package_arches unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 382b6e1..ed7f33d 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -917,86 +917,6 @@ EOQ
return @res;
}
-sub available_package_arches {
- my $class = shift;
- my $org_id = shift;
- my $set = shift;
- my $cid = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth;
-
- my $filter_str = '';
- my $channel_str = '';
-
- my $org = RHN::Org->lookup(-id => $org_id);
-
- my %addl_params = (org_id => $org_id);
-
- if ($org->server_count > 0) {
- $filter_str = <<EOQ;
-
- AND
- EXISTS (
- SELECT 1
- FROM rhnServer S
- WHERE S.org_id = :org_id
- AND EXISTS (
- SELECT 1
- FROM rhnServerPackageArchCompat SPAC
- WHERE SPAC.server_arch_id = S.server_arch_id
- AND SPAC.package_arch_id = P.package_arch_id
- )
- )
-
-
-EOQ
- }
-
- if ($cid) {
- $channel_str = 'AND CP.channel_id = :cid';
- $addl_params{cid} = $cid;
- }
-
- $sth = $dbh->prepare(<<EOS);
-SELECT P.id, PA.name, PN.name || '-' || PEVR.evr.as_vre_simple(), P.path
- FROM rhnPackageArch PA,
- rhnPackageName PN,
- rhnPackageEVR PEVR,
- rhnPackage P
- WHERE P.id = :id
- AND P.name_id = PN.id
- AND P.evr_id = PEVR.id
- AND EXISTS (
- SELECT 1
- FROM rhnChannelPackage CP,
- rhnChannelPermissions CPerm
- WHERE CPerm.org_id = :org_id
- AND CPerm.channel_id = CP.channel_id
- AND CP.package_id = P.id
- $channel_str
- )
- $filter_str
- AND PA.id = P.package_arch_id
-EOS
-
- my @ret;
- foreach my $evr ($set->contents) {
- $sth->execute_h(id => $evr, %addl_params);
-
- my @arches;
- my $package_name = '';
- while (my ($id, $arch, $pkg_name, $path) = $sth->fetchrow) {
- $package_name = $pkg_name;
- push @arches, [ $id, $arch, $path ];
- }
-
- push @ret, [ $package_name, [ @arches ] ];
- }
-
- return @ret;
-}
-
sub source_rpm_path {
my $self = shift;
commit f731f9d097619230bd94e62ff8c45e1aac0a19ec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:43:39 2009 +0100
Removal of download_packages.pxt made rhn-must-select-archs and must_select_archs unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 527f304..126bf64 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag('rhn-unknown-package-nvre' => \&unknown_package_nvre);
- $pxt->register_tag('rhn-must-select-archs', \&must_select_archs, 2);
$pxt->register_tag('rhn-upload-answerfile-form' => \&upload_answerfile_form);
$pxt->register_tag('rhn-package-raw-pkgmap' => \&raw_pkgmap);
@@ -91,17 +90,6 @@ sub lookup_package_nvre {
return $nvre;
}
-sub must_select_archs {
- my $pxt = shift;
- my %params = @_;
-
- my $hidden_vals = $pxt->pnotes('hidden_vals');
-
- return $hidden_vals unless $pxt->pnotes('must_select_archs');
-
- return $params{__block__} . $hidden_vals;
-}
-
sub package_dependencies {
my $pxt = shift;
my %params = @_;
commit 6d2024dc93824ddbc99d662b8f4cd475c9ab72aa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:40:48 2009 +0100
rhn:errata_editor:errata_edit_cb not used, removing, as well as errata_edit_cb.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 590a7c6..0a4c1ee 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -38,7 +38,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_editor:errata_edit_cb' => \&errata_edit_cb);
$pxt->register_callback('rhn:errata_editor:errata_publish_cb' => \&errata_publish_cb);
$pxt->register_callback('rhn:errata_editor:verify_errata_packages_in_channels' => \&verify_errata_packages_in_channels);
$pxt->register_callback('rhn:errata_editor:select_channels_cb' => \&select_channels_cb);
@@ -50,226 +49,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:delete_errata_cb' => \&delete_errata_cb);
}
-my @errata_fields = qw/id org_id synopsis advisory_name advisory_rel advisory_type product buglist
- topic description solution keywords refers_to notes/;
-
-my $errata_data = {
- id => {display => 0,
- edit => 0 },
- advisory_name => {display => 'Advisory',
- edit => 'text',
- size => 20,
- maxlength => 27,
- required => 1 },
- advisory_rel => {display => 'Advisory Release',
- edit => 'text',
- size => 4,
- maxlength => 4,
- required => 1,
- default => '1' },
- advisory_type => {display => 'Advisory Type',
- edit => 'select',
- required => 1,
- options => [ RHN::Errata->get_advisory_types ],
- values => [ RHN::Errata->get_advisory_types ] },
- product => {display => 'Product',
- edit => 'text',
- size => 30,
- maxlength => 64,
- required => 1 },
- description => {display => 'Description',
- edit => 'textarea',
- rows => 6,
- cols => 80,
- maxlength => 4000,
- required => 1 },
- synopsis => {display => 'Synopsis',
- edit => 'text',
- size => 60,
- maxlength => 4000,
- required => 1 },
- topic => {display => 'Topic',
- edit => 'textarea',
- rows => 6,
- cols => 80,
- maxlength => 4000,
- required => 1 },
- solution => {display => 'Solution',
- edit => 'textarea',
- rows => 6,
- cols => 80,
- maxlength => 4000,
- required => 1 },
- refers_to => {display => 'References',
- edit => 'textarea',
- rows => 6,
- cols => 40,
- maxlength => 4000 },
- notes => {display => 'Notes',
- edit => 'textarea',
- rows => 6,
- cols => 40,
- maxlength => 4000 },
- keywords => {display => 'Keywords',
- edit => 'text',
- size => 40 },
- buglist => {display => 'Bugs',
- edit => 'special' },
- org_id => {display => 0,
- edit => 0 } };
-
-
-sub errata_edit_cb {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid') || 0;
-
- my $errata;
-
- if ($eid) {
- throw "user '" . $pxt->user->id . "' does not own errata '$eid'"
- unless $pxt->user->verify_errata_admin($eid);
-
- $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
- }
-
- my $now = RHN::Date->now->short_date;
-
- unless ($eid) {
- $errata = RHN::ErrataTmp->create_errata;
- $errata->org_id($pxt->user->org_id);
- $errata->advisory_name($pxt->dirty_param('errata_advisory_name'));
- $errata->advisory_rel($pxt->dirty_param('errata_advisory_rel'));
- $errata->issue_date($now);
- }
-
- my @errors;
- my @add_bug; #data for a new bug - must be done after commit in the case of a new errata
- my @update_bugs; #data for old bugs
- my @keywords = (); #keywords
-
- foreach my $field (@errata_fields) {
- my $data = $errata_data->{$field};
-
- next unless $data->{edit};
-
- my $value = $pxt->dirty_param("errata_$field") || '';
- $value =~ s/^\s+//;
- $value =~ s/\s+$//;
-
- if ($data->{required} && !($value)) {
- push @errors, "Required field '$field' is empty.";
- next;
- }
-
- if ($data->{maxlength} and (length($value) > $data->{maxlength})) {
- push @errors, sprintf(q(The %s was %d charactars long. Maximum length is %d characters.),
- $data->{display}, length($value), $data->{maxlength});
- next;
- }
-
- if ($field eq 'keywords') {
- @keywords = split /\s*,\s*/, $value;
- }
- elsif ($field eq 'buglist') {
-
- foreach my $bug (RHN::Utils->parameterize([ $errata->bugs_fixed ], 'id', 'summary')) { #see if old bugs changed
- my $new_id = $pxt->dirty_param('errata_buglist_' . $bug->{id} . '_id');
- my $new_summary = $pxt->dirty_param('errata_buglist_' . $bug->{id} . '_summary') || '';
-
- if ($new_id =~ /\D/) {
- push @errors, "Bug ID's must be numeric";
- next;
- }
-
- unless (($bug->{id} == $new_id) && (($bug->{summary} || '') eq $new_summary)) {
- push @update_bugs, [ $bug->{id}, $new_id, $new_summary ];
- }
- }
-
- if (my $bug_id = $pxt->dirty_param('errata_buglist__id') || '') { #check for a new bug
-
- if ($bug_id =~ /^\d+$/) {
- my $bug_summary = $pxt->dirty_param('errata_buglist__summary') || '';
- @add_bug = ($bug_id, $bug_summary);
- }
- else {
- push @errors, "Bug ID's must be numeric";
- }
- }
-
- }
- elsif ($field eq 'advisory_name') {
- unless ($pxt->user->is('rhn_superuser')) {
- if ($value =~ /^(RH)/i) {
- push @errors, "An errata advisory cannot begin with '<strong>$1</strong>'";
- }
- }
- $errata->advisory_name($value);
- }
- else {
- $errata->$field($value);
- }
- }
-
- unless (@errors) {
- $errata->advisory($errata->advisory_name . '-' . $errata->advisory_rel);
- $errata->update_date($now);
- eval {
- $errata->commit;
-
- if (@add_bug) {
- $errata->add_bug(@add_bug);
- }
-
- foreach my $bug (@update_bugs) {
- $errata->update_bug( @{$bug} );
- }
-
- $errata->set_keywords(@keywords);
- };
- if ($@) {
- if (ref $@ and catchable($@)) {
- my $E = $@;
-
- if ($E->constraint_value eq 'RHN_ERRATA_ADVISORY_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory label already exists');
- return;
- }
- elsif ($E->constraint_value eq 'RHN_ERRATA_ADVISORY_NAME_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory name already exists');
- return;
- }
- elsif ($E->constraint_value eq 'RHN_ERRATATMP_ADVISORY_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory label already exists');
- return;
- }
- elsif ($E->constraint_value eq 'RHN_ERRATATMP_ADVISORY_NAME_UQ') {
- $pxt->push_message(local_alert => 'An Errata with this advisory name already exists');
- return;
- }
- else {
- throw $E;
- }
- }
- else {
- die $@;
- }
- }
-
- }
-
- foreach (@errors) {
- $pxt->push_message(local_alert => $_);
- }
-
- unless (@errors) {
- $pxt->redirect($pxt->uri . '?eid=' . $errata->id);
- }
-
- return;
-}
-
sub errata_publish_cb {
my $pxt = shift;
commit 56f60df3f9035b9ecb618a6b6ab35890cb719b2e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:38:54 2009 +0100
Removal of download made rhn:clear_set_cb and clear_set_cb unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Sets.pm b/web/modules/sniglets/Sniglets/Sets.pm
index c320bf7..a4672e9 100644
--- a/web/modules/sniglets/Sniglets/Sets.pm
+++ b/web/modules/sniglets/Sniglets/Sets.pm
@@ -30,13 +30,6 @@ sub register_tags {
$pxt->register_tag('rhn-set-totals' => \&set_totals);
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:clear_set_cb', \&clear_set_cb);
-}
-
sub set_totals {
my $pxt = shift;
my %params = @_;
@@ -65,17 +58,4 @@ sub set_totals {
return $block;
}
-sub clear_set_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->pnotes('set_to_clear') || $pxt->dirty_param('selection');
- my $set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
-
- throw "No valid set!" unless $set;
- $set->empty;
- $set->commit;
-
- $pxt->redirect($pxt->param('set_clear_redirect') || $pxt->uri);
-}
-
1;
commit 755dc96b3df12fe4313f85eecbc03afe4eb7f22b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:37:40 2009 +0100
Removal of download_packages.pxt made rhn:download_packages_cb and download_packages_cb unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 914d9bf..527f304 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -53,8 +53,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:download_packages_cb' => \&download_packages_cb);
-
$pxt->register_callback('rhn:sscd_confirm_package_upgrades' => \&sscd_confirm_package_upgrades_cb);
$pxt->register_callback('rhn:sscd_confirm_package_installations' => \&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_installations' => \&sscd_confirm_package_installations_cb);
@@ -104,12 +102,6 @@ sub must_select_archs {
return $params{__block__} . $hidden_vals;
}
-sub download_packages_cb {
- my $pxt = shift;
-
-# $pxt->redirect('/network/packagelist/download_packages.pxt');
-}
-
sub package_dependencies {
my $pxt = shift;
my %params = @_;
commit fd7774f88c74b33a347fda54181ab304050f527d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:29:05 2009 +0100
rhn-download-package not used anywhere, removing, as well as download_package.
diff --git a/web/modules/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 4030d5e..61f033b 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -32,7 +32,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag('rhn-ftp-download', \&ftp_download, 4);
- $pxt->register_tag('rhn-download-package', \&download_package, 1);
}
# non-tag access to RHN download links
@@ -43,32 +42,6 @@ sub rhn_download_url {
return ftp_download($params{pxt}, (-location => $params{location}, -path => $params{path}, __block__ => $params{label}));
}
-sub download_package {
- my $pxt = shift;
- my %params = validate(@_, { channel => 1, name => 1, __block__ => 1 });
-
- my $cid = RHN::Channel->channel_id_by_label($params{channel});
- my $channel = RHN::Channel->lookup(-id => $cid);
-
- my @pkg_ids = map { $channel->latest_package_by_name($_) } split /,\s*/, $params{name};
-
- my $ret;
- my $expires = time + PXT::Config->get('download_url_lifetime');
-
- for my $pkg_id (@pkg_ids) {
- my $pkg = RHN::Package->lookup(-id => $pkg_id);
- my $user_id = $pxt->user ? $pxt->user->id : 0;
- my $uri = RHN::TokenGen::Generator->generate_url($user_id, 0, $pkg->path, "/download", "local", $expires, $pxt->ssl_available);
-
- my $copy = $params{__block__};
- $ret .= PXT::Utils->perform_substitutions($copy,
- { nvre => PXT::HTML->link($uri, join(".", $pkg->nvre, $pkg->arch_label, "rpm")),
- channel => $channel->name, md5sum => $pkg->md5sum });
- }
-
- return $ret;
-}
-
sub ftp_download {
my $pxt = shift;
my %params = validate(@_, { path => 1, location => { default => "local" },
commit 3e53e17b4eca401510fc38db64ce1d1df86b750b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:27:54 2009 +0100
Removal of download_packages.pxt makes rhn-download-package-list and download_package_list unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index b3258ed..914d9bf 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag('rhn-unknown-package-nvre' => \&unknown_package_nvre);
- $pxt->register_tag('rhn-download-package-list' => \&download_package_list);
$pxt->register_tag('rhn-must-select-archs', \&must_select_archs, 2);
$pxt->register_tag('rhn-upload-answerfile-form' => \&upload_answerfile_form);
@@ -105,69 +104,6 @@ sub must_select_archs {
return $params{__block__} . $hidden_vals;
}
-sub download_package_list {
- my $pxt = shift;
- my %params = @_;
-
- my $package_set = RHN::Set->lookup(-label => 'package_downloadable_list', -uid => $pxt->user->id);
- my $cid = $pxt->param('cid');
-
- my @available_pkg_arches = RHN::Package->available_package_arches($pxt->user->org_id, $package_set, $cid);
-
- my $hidden_vals = '';
- my $block = $params{__block__};
- my $ret = '';
-
- my $counter = 0;
- my $prefix = "/pub/";
-
- my @files;
- foreach my $package_info (@available_pkg_arches) {
- my $num_arches = @{$package_info->[1]};
- my $current = '';
-
- if ($num_arches > 1) {
- $current = $block;
-
- if ($counter % 2) {
- $current =~ s/{color}/#eeeeee/gism;
- } else {
- $current =~ s/{color}/white/gism;
- }
-
- $current =~ s/\{package_nvre\}/$package_info->[0]/ism;
- my $checkboxes = '';
- my @checkboxes;
- foreach my $arch_pkg (@{$package_info->[1]}) {
- next unless $arch_pkg->[2];
- push @files, "$prefix$arch_pkg->[2]";
- push @checkboxes, "<input type=\"checkbox\" name=\"filename\" value=\"$prefix$arch_pkg->[2]\" /> $arch_pkg->[1]";
- $checkboxes[-1] .= PXT::HTML->hidden(-name => "filename_full", -value => $prefix . $arch_pkg->[2]);
- }
- $checkboxes = join ("    ", @checkboxes);
- $current =~ s/\{package_checkboxes\}/$checkboxes/ism;
-
- $counter++;
- }
- else {
- if ($package_info->[1]->[0]->[2]) {
- push @files, "$prefix$package_info->[1]->[0]->[2]";
- $hidden_vals .= "<input type=\"hidden\" name=\"filename\" value=\"$prefix$package_info->[1]->[0]->[2]\" />\n";
- $hidden_vals .= PXT::HTML->hidden(-name => "filename_full", -value => $prefix . $package_info->[1]->[0]->[2]);
- }
- }
- $ret .= $current;
- }
-
- my $computed_md5 = Digest::MD5::md5_hex(join(":", sort @files));
- $pxt->pnotes('computed_md5' => $computed_md5);
-
-# return "<pre>Available packages:\n".Data::Dumper->Dump([(@available_pkg_arches)])."</pre>";
- $pxt->pnotes(must_select_archs => 1) if ($counter > 0);
- $pxt->pnotes(hidden_vals => $hidden_vals);
- return $ret;
-}
-
sub download_packages_cb {
my $pxt = shift;
commit 673b6c3cb99b2bb0b153114af1f784d9979a5aeb
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:25:58 2009 +0100
Removal of download_packages.pxt makes rhn-download and download unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 4aacf1c..b3258ed 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -43,7 +43,6 @@ sub register_tags {
$pxt->register_tag('rhn-unknown-package-nvre' => \&unknown_package_nvre);
$pxt->register_tag('rhn-download-package-list' => \&download_package_list);
- $pxt->register_tag('rhn-download', \&download, 2);
$pxt->register_tag('rhn-must-select-archs', \&must_select_archs, 2);
$pxt->register_tag('rhn-upload-answerfile-form' => \&upload_answerfile_form);
@@ -106,42 +105,6 @@ sub must_select_archs {
return $params{__block__} . $hidden_vals;
}
-sub download {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $url = PXT::Config->get("download_url") || "/cgi-bin/download.pl/rhn-packages.tar";
-
- my $redirect = $pxt->derelative_url("/network/software/packages/download_complete.pxt");
-
- $redirect .= "?pxt_trap=rhn%3aclear_set_cb&selection=package_installable_list";
-
- my $hidden_package_vars = '';
- my $download_packages = $pxt->pnotes('download_packages');
- my $optional_packages = $pxt->pnotes('optional_packages');
-
- $download_packages = [ ] unless (ref $download_packages eq 'ARRAY');
- $optional_packages = [ ] unless (ref $optional_packages eq 'ARRAY');
-
- foreach my $file (@{$download_packages}) {
- $hidden_package_vars .= PXT::HTML->hidden(-name => 'filename', -value => $file);
- }
-
- foreach my $file (@{$optional_packages}, @{$download_packages}) {
- $hidden_package_vars .= PXT::HTML->hidden(-name => 'filename_full', -value => $file);
- }
-
- $block =~ s/\{token\}/RHN::SessionSwap->encode_data(time, $pxt->pnotes('computed_md5'))/egi;
- $block =~ s/\{redirect\}/$redirect/egi;
- $block =~ s/\{download_url\}/$url/gi;
- $block =~ s/\{hidden_package_vars\}/$hidden_package_vars/gi;
-
- return $block;
-}
-
-
sub download_package_list {
my $pxt = shift;
my %params = @_;
commit 5138b924a9d47475527ca90470ba0bc75eb55001
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:23:18 2009 +0100
download_packages.pxt was in the second rhn-tab-url in both channel_detail.xmls, and not referenced from anywhere else, removing.
diff --git a/java/code/webapp/WEB-INF/nav/channel_detail.xml b/java/code/webapp/WEB-INF/nav/channel_detail.xml
index a80964b..9d34309 100644
--- a/java/code/webapp/WEB-INF/nav/channel_detail.xml
+++ b/java/code/webapp/WEB-INF/nav/channel_detail.xml
@@ -16,7 +16,6 @@
</rhn-tab>
<rhn-tab name="Packages">
<rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/download_packages.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Patches" acl="channel_packaging_type(sysv-solaris)">
<rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
diff --git a/web/html/nav/channel_detail.xml b/web/html/nav/channel_detail.xml
index b207119..0a92216 100644
--- a/web/html/nav/channel_detail.xml
+++ b/web/html/nav/channel_detail.xml
@@ -15,7 +15,6 @@
</rhn-tab>
<rhn-tab name="Packages">
<rhn-tab-url>/rhn/channels/ChannelPackages.do</rhn-tab-url>
- <rhn-tab-url>/network/software/channels/download_packages.pxt</rhn-tab-url>
</rhn-tab>
<rhn-tab name="Patches" acl="channel_packaging_type(sysv-solaris)">
<rhn-tab-url>/network/software/channels/patches.pxt</rhn-tab-url>
diff --git a/web/html/network/software/channels/download_packages.pxt b/web/html/network/software/channels/download_packages.pxt
deleted file mode 100644
index fa6339c..0000000
--- a/web/html/network/software/channels/download_packages.pxt
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf8"?>
-<pxt-passthrough>
- <pxt-use class="Grail::Frame" />
- <pxt-use class="Sniglets::Packages" />
- <pxt-use class="Sniglets::Users" />
- <pxt-use class="Sniglets::Channel" />
- <pxt-use class="Sniglets::HTML" />
-
- <grail-canvas-template base="/templates/c.pxt" mode="main_canvas">
-
-<rhn-channel-details>
- <h1><img src="/img/rhn-icon-channels.gif" /> {channel_name} <rhn-help href="s1-sm-channels-packages.jsp#s4-sm-channel-details-packages" /></h1>
-</rhn-channel-details>
-
- <rhn-navi-nav prefix="channel_details" depth="0" file="/nav/channel_detail.xml" style="contentnav" />
-
- <h2><img src="/img/rhn-icon-packages.gif" /> Download Packages</h2>
-
-<rhn-download>
- <pxt-form method="post" action="{download_url}">
-
- <div class="page-summary">
- <p>To begin the download process, click the button at the bottom of the page. You will be presented with a dialog box that allows you to choose the directory to which you wish to save the <strong>rhn-packages.tar</strong> file.</p>
-
- <p>To extract the packages once the download is complete, run the following from the commandline:</p>
-
- <strong>
- <code>tar -xvf rhn-packages.tar</code>
- </strong>
-
- <p>The packages you have selected will be in the newly created <code>rhn-packages/</code> directory beneath your current directory.</p>
-
- </div>
-
-<rhn-must-select-archs>
- <hr />
-
- <p>
- <strong>Note:</strong>   Some of the packages you have selected have multiple architectures that may be relevant to your registered systems. To select the desired architecture for the packages to be downloaded, check the desired architecture(s).
- </p>
-
- <table width="96%" cellspacing="0" cellpadding="0" class="list" align="center">
- <tr valign="center">
- <th>Package Name</th>
- <th>Arches Available</th>
- </tr>
-
-<rhn-download-package-list>
- <tr bgcolor="{color}">
- <td>{package_nvre}</td>
- <td>{package_checkboxes}</td>
- </tr>
-</rhn-download-package-list>
- </table>
-
-</rhn-must-select-archs>
-
- <br />
- <br />
-
- <input type="submit" name="download_system_packages" value="Download Selected Packages Now!" />
- <input type="hidden" name="pxt:trap" value="rhn:download_packages_cb" />
- <input type="hidden" name="token" value="{token}" />
-
- </pxt-form>
-
-</rhn-download>
-
- </grail-canvas-template>
-</pxt-passthrough>
-
14 years, 4 months
3 commits - java/conf web/modules
by Jan Pazdziora
java/conf/httpd/webapp.conf | 110 ------------------------
web/modules/pxt/PXT/ApacheHandler.pm | 29 ------
web/modules/sniglets/Sniglets/ListView/Style.pm | 34 -------
3 files changed, 173 deletions(-)
New commits:
commit e727f50edbc2bf49a755c5dd321484f920d8253f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 17:20:42 2009 +0100
The package_download Style does not seem to be used anywhere, removing.
diff --git a/web/modules/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm
index 22effba..0de160c 100644
--- a/web/modules/sniglets/Sniglets/ListView/Style.pm
+++ b/web/modules/sniglets/Sniglets/ListView/Style.pm
@@ -344,38 +344,4 @@ EOQ
return $ret;
}
-package Sniglets::ListView::Style::package_download;
-
-use base qw/Sniglets::ListView::Style::standard/;
-
-sub empty_list_wrapper {
-
- return <<EOQ;
- <div align="right">
- <hr />
-
- <form method="post" action="/cgi-bin/download.pl/rhn-packages.tar">
- <input type="submit" name="download_system_packages" value="Download Selected Packages Now!" />
- <input type="hidden" name="token" value="{token}" />
- <input type="hidden" name="pxt:trap" value="rhn:download_packages_cb" />
-{hidden_package_vars}
- </form>
- </div>
-EOQ
-}
-
-# <input type="hidden" name="pxt:trap" value="rhn:download_packages_cb" />
-
-
-sub footer {
- my $self = shift;
-
- my $ret =<<EOQ;
-</table>
-{hidden_package_vars}
-EOQ
-
- return $ret;
-}
-
1;
commit 7717ffbe22463e7759ee580b31501d4276e4babf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 16:59:21 2009 +0100
Removal of webapp.conf makes PXT::ApacheHandler::TransHandler unused, removing.
diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index d61113f..d68c800 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.pm
@@ -758,34 +758,5 @@ sub profiling_markpoint {
$last_profile_pt = $now;
}
-package PXT::ApacheHandler::TransHandler;
-use Apache2::Const qw/:common REDIRECT M_GET/;
-
-sub handler {
- my $r = shift;
-
- if ($r->uri =~ m(^/download/)) {
- my $path_info = $r->uri;
-
- # is this one of those bizarre user agents that mishandles
- # redirects and keeps growing the request string? typically seen
- # from LeechGet (which also sometimes apparently masquerades
- # itself). so, check to see if http: or https: occurs three times
- # in the request and truncate to 512 bytes.
-
- if ($path_info =~ /https?:.*https?:.*https?/) {
- Apache->log_error("Detected long download request line; altering logging");
- $r->the_request(substr($path_info, 0, 256));
- }
-
- $path_info =~ s(^/download)();
- $r->filename($r->document_root . "/download");
- $r->pnotes(download_path_info => $path_info);
- return OK;
- }
-
- return DECLINED;
-}
-
1;
commit 461567b69f28d26e9c3038223fafaa664bf0f654
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Dec 16 16:52:36 2009 +0100
The webapp.conf is not used anywhere.
diff --git a/java/conf/httpd/webapp.conf b/java/conf/httpd/webapp.conf
deleted file mode 100644
index 09716ba..0000000
--- a/java/conf/httpd/webapp.conf
+++ /dev/null
@@ -1,110 +0,0 @@
-Listen 81
-
-Alias /WEBRPC "/var/www/html/rpc"
-
-<IfDefine HAVE_PAF>
-LoadModule proxy_add_forward_module modules/mod_paf.so
-</IfDefine>
-
-<VirtualHost _default_:81>
- ProxyRequests On
- # ProxyVia On
- # ProxyPass / http://www.devel.rhns.redhat.com/
-</VirtualHost>
-
-AddType text/pxt .pxt
-
-PerlTaintCheck Off
-PerlWarn On
-
-PerlModule Apache::StatINC
-PerlSetVar StatINC_Debug 9
-PerlInitHandler Apache::StatINC
-PerlFixupHandler Apache::SizeLimit
-
-PerlPassEnv ORACLE_HOME NLS_LANG
-
-# PerlModule Apache::DProf
-
-PerlRequire /etc/httpd/conf/startup.pl
-PerlFreshRestart Off
-
-ErrorDocument 403 /errors/permission.pxt
-ErrorDocument 404 /errors/404.pxt
-ErrorDocument 413 /errors/413.pxt
-ErrorDocument 500 /errors/500.pxt
-
-PerlSetVar pxt_make_vile on
-
-<Files *.pxt>
- SetHandler perl-script
- PerlHandler PXT::ApacheHandler
-</Files>
-
-PerlTransHandler PXT::ApacheHandler::TransHandler
-
-#<Directory /var/www/html/skipjack/RedHat/RPMS>
-# PerlModule Sniglets::Kickstart
-# PerlAccessHandler Sniglets::Kickstart::ftp_download_access_handler
-#</Directory>
-
-#<Files /var/www/html/skipjack/RedHat/base/comps>
-# PerlModule Sniglets::Kickstart
-# PerlAccessHandler Sniglets::Kickstart::ftp_download_access_handler
-#</Files>
-
-
-
-#LoadModule status_xml_module modules/mod_status_xml.so
-#ExtendedStatus On
-
-#<Location /server-status-xml>
-# StatusXMLStyleSheet /scoreboard.xsl
-# SetHandler server-status-xml
-#</Location>
-
-<IfDefine PERLDB>
- <Perl>
- use Apache::DB ();
- Apache::DB->init;
- </Perl>
-
- <Location />
- PerlFixupHandler Apache::DB
- </Location>
-</IfDefine>
-
-<IfDefine HAVE_JK>
- JkWorkersFile /etc/httpd/conf/workers.properties
- JkLogLevel info
- JkLogFile /var/log/httpd/mod_jk.log
- JkMount /rhn/* ajp13
- JkMount /rhn ajp13
- JkMount /*.do ajp13
- JkMount /*.jsp ajp13
- JkHTTPSIndicator HTTPS
-</IfDefine>
-
-PerlSetVar allow_pxt_personalities 1
-
-<Files *.pxi>
- Order allow,deny
- Deny from all
- Satisfy All
-</Files>
-
-RedirectMatch ^/renew/.* http://rhn.redhat.com
-
-RedirectMatch ^/index\.html$ @INDEX_REDIRECT_MATCH@
-RedirectMatch ^/rhn/?$ @RHN_ROOT_REDIRECT_MATCH@
-
-# Send people who ask for /index.html to /index.pxt instead
-
-RewriteEngine on
-
-# This rule handles incoming kickstart file requests from
-# machines actually performing a kickstart. This rule
-# processes the incoming URL and converts it into something
-# slightly more Struts friendly.
-RewriteRule /kickstart/ks([-a-zA-Z0-9\._/]*)$ /rhn/kickstart/DownloadFile.do?ksurl=$1 [PT]
-RewriteRule /rpc/api /rhn/rpc/api [PT]
14 years, 4 months
backend/server
by Justin Sherrill
backend/server/handlers/xmlrpc/registration.py | 6 ++++++
backend/server/rhnUser.py | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
New commits:
commit c861917c9ed92410a83143d08f8b5f28efe1ec1f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Dec 16 17:24:31 2009 -0500
528833 - fixing issue where updates would fail when registered using an activation key of a disabled user
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py
index 4910c6a..0e21c82 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -184,6 +184,12 @@ class Registration(rhnHandler):
log_error("User password check failed", username)
raise rhnFault(2)
+ if rhnUser.is_user_disabled(username):
+ msg = _("""
+ %s Account has been deactivated on this server.
+ Please contact your Org administrator for more help.""")
+ raise rhnFault(1, msg % user, explain=0)
+
return user
def create_system(self, user, profile_name, release_version,
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 43c459d..0f4ef05 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -426,11 +426,6 @@ def search(user):
userid = get_user_id(user)
if not userid: # no user found
return None
- if is_user_disabled(user):
- msg = _("""
- %s Account has been deactivated on this server.
- Please contact your Org administrator for more help.""")
- raise rhnFault(1, msg % user, explain=0)
ret = User(user, "")
if not ret.reload(userid) == 0:
# something horked during reloading entry from database
14 years, 4 months