java/buildconf/LICENSE.txt | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java | 40
++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java | 10 +-
java/spacewalk-java.spec | 11 ++
rel-eng/packages/spacewalk-java | 2
5 files changed, 57 insertions(+), 8 deletions(-)
New commits:
commit 86d610bc2fe57feae08facbaa7d18e03b50a2a93
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 5 19:21:18 2011 +0100
Automatic commit of package [spacewalk-java] release [1.3.35-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b175bb4..d03bc3c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.34
+Version: 1.3.35
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -456,6 +456,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Jan 05 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.35-1
+- 663490 - identify, when package is too large to download via API
+ (tlestach(a)redhat.com)
+- temporary allow 2010 and 2011 headers (tlestach(a)redhat.com)
+- 667432 - don't untie host from guests during host migration
+ (mzazrivec(a)redhat.com)
+- 661212 - setting probe suite name for ProbeSuiteListProbes.do
+ (tlestach(a)redhat.com)
+
* Mon Jan 03 2011 Jan Pazdziora 1.3.34-1
- display also error parameters when throwing InvalidKickstartTreeException
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 42388d2..e9444be 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.3.34-1 java/
+1.3.35-1 java/
commit 01a9849819ac3afc8039f166dbbfc6d6d7e65edc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 5 18:22:00 2011 +0100
663490 - identify, when package is too large to download via API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java
new file mode 100644
index 0000000..4e51c5a
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/PackageDownloadException.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2011 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.
+ */
+package com.redhat.rhn.frontend.xmlrpc;
+
+import com.redhat.rhn.FaultException;
+import com.redhat.rhn.common.localization.LocalizationService;
+
+
+/**
+ * PackageDownloadException
+ * @version $Rev$
+ */
+public class PackageDownloadException extends FaultException {
+
+ /**
+ * Comment for <code>serialVersionUID</code>
+ */
+ private static final long serialVersionUID = 3263555157532178035L;
+
+ /**
+ *
+ * @param label message label
+ */
+ public PackageDownloadException(String label) {
+ super(2302, "packageDownload",
LocalizationService.getInstance().getMessage(
+ label));
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
index 7349dda..51cc185 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/packages/PackagesHandler.java
@@ -18,7 +18,6 @@ import com.redhat.rhn.FaultException;
import com.redhat.rhn.common.conf.Config;
import com.redhat.rhn.common.conf.ConfigDefaults;
import com.redhat.rhn.common.db.datasource.DataResult;
-import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.domain.rhnpackage.Package;
import com.redhat.rhn.domain.rhnpackage.PackageArch;
import com.redhat.rhn.domain.rhnpackage.PackageFactory;
@@ -28,6 +27,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.InvalidPackageArchException;
import com.redhat.rhn.frontend.xmlrpc.NoSuchPackageException;
import com.redhat.rhn.frontend.xmlrpc.NoSuchUserException;
+import com.redhat.rhn.frontend.xmlrpc.PackageDownloadException;
import com.redhat.rhn.frontend.xmlrpc.PermissionCheckFailureException;
import com.redhat.rhn.frontend.xmlrpc.RhnXmlRpcServer;
import com.redhat.rhn.manager.download.DownloadManager;
@@ -56,6 +56,7 @@ import java.util.Map;
public class PackagesHandler extends BaseHandler {
private static Logger logger = Logger.getLogger(PackagesHandler.class);
+ private static float freeMemCoeff = 0.9f;
/**
* Get Details - Retrieves the details for a given package
@@ -554,15 +555,14 @@ public class PackagesHandler extends BaseHandler {
pkg.getPath();
File file = new File(path);
- if (file.length() > Integer.MAX_VALUE) {
- throw new IOException(LocalizationService.getInstance().getMessage(
- "api.package.download.toolarge"));
+ if (file.length() > freeMemCoeff * Runtime.getRuntime().freeMemory()) {
+ throw new
PackageDownloadException("api.package.download.toolarge");
}
byte[] toReturn = new byte[(int) file.length()];
BufferedInputStream br = new BufferedInputStream(new FileInputStream(file));
if (br.read(toReturn) != file.length()) {
- throw new IOException("api.package.download.ioerror");
+ throw new
PackageDownloadException("api.package.download.ioerror");
}
return toReturn;
}
commit ee69779dc9fc80066594283e8cc27e06117b9690
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Jan 5 18:48:41 2011 +0100
temporary allow 2010 and 2011 headers
diff --git a/java/buildconf/LICENSE.txt b/java/buildconf/LICENSE.txt
index 42c95db..db0c51f 100644
--- a/java/buildconf/LICENSE.txt
+++ b/java/buildconf/LICENSE.txt
@@ -1,5 +1,5 @@
^/\*\*$
-^ \* Copyright \(c\) (200\d--)?2010 Red Hat, Inc.$
+^ \* Copyright \(c\) (200\d--)?201[01] 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$