/hg/icedtea-web: 2 new changesets
dbhole at icedtea.classpath.org
dbhole at icedtea.classpath.org
Wed Jul 20 07:39:39 PDT 2011
changeset a9061a71cfc7 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=a9061a71cfc7
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Jul 15 15:44:56 2011 -0400
RH718164, CVE-2011-2513: Home directory path disclosure to untrusted
applications
changeset 7dd63058c234 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7dd63058c234
author: Deepak Bhole <dbhole at redhat.com>
date: Fri Jul 15 16:02:00 2011 -0400
RH718170, CVE-2011-2514: Java Web Start security warning dialog
manipulation
diffstat:
ChangeLog | 27 +
NEWS | 5 +
netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java | 157 +++++++++++
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 27 +-
netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 4 +
netx/net/sourceforge/jnlp/services/XExtendedService.java | 6 +-
netx/net/sourceforge/jnlp/services/XFileContents.java | 3 +-
netx/net/sourceforge/jnlp/util/UrlUtils.java | 53 +++
8 files changed, 268 insertions(+), 14 deletions(-)
diffs (411 lines):
diff -r 4267bb156f08 -r 7dd63058c234 ChangeLog
--- a/ChangeLog Tue Jul 19 12:14:35 2011 -0400
+++ b/ChangeLog Fri Jul 15 16:02:00 2011 -0400
@@ -128,6 +128,33 @@
(clean_tests_reports): new goal to remove report styles directory and
indexs html files.
+2011-07-14 Omair Majid <omajid at redhat.com>
+
+ RH718170, CVE-2011-2514: Java Web Start security warning dialog
+ manipulation
+ * netx/net/sourceforge/jnlp/services/XExtendedService.java
+ (openFile): Create XContents based on a copy of the File object to prevent
+ overloaded File classes from mangling the name.
+ (XFileContents): Create a separate copy of File object for local use.
+
+2011-07-14 Omair Majid <omajid at redhat.com>
+
+ RH718164, CVE-2011-2513: Home directory path disclosure to untrusted
+ applications
+ * netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java: New file.
+ * netx/net/sourceforge/jnlp/util/UrlUtils.java: New file.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+ jarLocationSecurityMap now contains originating urls, not cache urls.
+ (initializeResources): Add remote url to map instead of local url.
+ (activateJars): Add remote url to the classloader's urls. Add mapping for
+ remote to local url. Put remote url in jarLocationSecurityMap.
+ (loadClass): Add remote url to the classloader's urls. Add mapping for
+ remote to local url.
+ (getCodeSourceSecurity): Update javadoc to note that the url must be
+ remote.
+ * netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
+ (initialize): Set the callback for URLJarFile.
+
2011-06-14 Andrew Su <asu at redhat.com>
* netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java:
diff -r 4267bb156f08 -r 7dd63058c234 NEWS
--- a/NEWS Tue Jul 19 12:14:35 2011 -0400
+++ b/NEWS Fri Jul 15 16:02:00 2011 -0400
@@ -8,6 +8,11 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
+New in release 1.2 (2011-XX-XX):
+* Security updates:
+ - RH718164, CVE-2011-2513: Home directory path disclosure to untrusted applications
+ - RH718170, CVE-2011-2514: Java Web Start security warning dialog manipulation
+
New in release 1.1 (2011-XX-XX):
* Security updates
- S6983554, CVE-2010-4450: Launcher incorrect processing of empty library path entries
diff -r 4267bb156f08 -r 7dd63058c234 netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/runtime/CachedJarFileCallback.java Fri Jul 15 16:02:00 2011 -0400
@@ -0,0 +1,157 @@
+/* CachedJarFileCallback.java
+ Copyright (C) 2011 Red Hat, Inc.
+ Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.runtime;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.jar.JarFile;
+
+import net.sourceforge.jnlp.util.UrlUtils;
+
+import sun.net.www.protocol.jar.URLJarFile;
+import sun.net.www.protocol.jar.URLJarFileCallBack;
+
+/**
+ * Invoked by URLJarFile to get a JarFile corresponding to a URL.
+ *
+ * Large parts of this class are based on JarFileFactory and URLJarFile.
+ */
+final class CachedJarFileCallback implements URLJarFileCallBack {
+
+ private static final CachedJarFileCallback INSTANCE = new CachedJarFileCallback();
+
+ public synchronized static CachedJarFileCallback getInstance() {
+ return INSTANCE;
+ }
+
+ /* our managed cache */
+ private final Map<URL, URL> mapping;
+
+ private CachedJarFileCallback() {
+ mapping = new ConcurrentHashMap<URL, URL>();
+ }
+
+ protected void addMapping(URL remoteUrl, URL localUrl) {
+ mapping.put(remoteUrl, localUrl);
+ }
+
+ @Override
+ public JarFile retrieve(URL url) throws IOException {
+ URL localUrl = mapping.get(url);
+
+ if (localUrl == null) {
+ /*
+ * If the jar url is not known, treat it as it would be treated in
+ * general by URLJarFile.
+ */
+ return cacheJarFile(url);
+ }
+
+ if (UrlUtils.isLocalFile(localUrl)) {
+ // if it is known to us, just return the cached file
+ return new JarFile(localUrl.getPath());
+ } else {
+ // throw new IllegalStateException("a non-local file in cache");
+ return null;
+ }
+
+ }
+
+ /*
+ * This method is a copy of URLJarFile.retrieve() without the callback check.
+ */
+ private JarFile cacheJarFile(URL url) throws IOException {
+ JarFile result = null;
+
+ final int BUF_SIZE = 2048;
+
+ /* get the stream before asserting privileges */
+ final InputStream in = url.openConnection().getInputStream();
+
+ try {
+ result =
+ AccessController.doPrivileged(new PrivilegedExceptionAction<JarFile>() {
+ @Override
+ public JarFile run() throws IOException {
+ OutputStream out = null;
+ File tmpFile = null;
+ try {
+ tmpFile = File.createTempFile("jar_cache", null);
+ tmpFile.deleteOnExit();
+ out = new FileOutputStream(tmpFile);
+ int read = 0;
+ byte[] buf = new byte[BUF_SIZE];
+ while ((read = in.read(buf)) != -1) {
+ out.write(buf, 0, read);
+ }
+ out.close();
+ out = null;
+ return new URLJarFile(tmpFile, null);
+ } catch (IOException e) {
+ if (tmpFile != null) {
+ tmpFile.delete();
+ }
+ throw e;
+ } finally {
+ if (in != null) {
+ in.close();
+ }
+ if (out != null) {
+ out.close();
+ }
+ }
+ }
+ });
+ } catch (PrivilegedActionException pae) {
+ throw (IOException) pae.getException();
+ }
+
+ return result;
+ }
+
+}
diff -r 4267bb156f08 -r 7dd63058c234 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Tue Jul 19 12:14:35 2011 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Jul 15 16:02:00 2011 -0400
@@ -147,7 +147,7 @@
/** File entries in the jar files available to this classloader */
private TreeSet<String> jarEntries = new TreeSet<String>();
- /** Map of specific codesources to securitydesc */
+ /** Map of specific original (remote) CodeSource Urls to securitydesc */
private HashMap<URL, SecurityDesc> jarLocationSecurityMap =
new HashMap<URL, SecurityDesc>();
@@ -509,7 +509,7 @@
}
}
- jarLocationSecurityMap.put(location, jarSecurity);
+ jarLocationSecurityMap.put(jarDesc.getLocation(), jarSecurity);
} catch (MalformedURLException mfe) {
System.err.println(mfe.getMessage());
}
@@ -731,7 +731,10 @@
try {
URL fileURL = new URL("file://" + extractedJarLocation);
- addURL(fileURL);
+ // there is no remote URL for this, so lets fake one
+ URL fakeRemote = new URL(jar.getLocation().toString() + "!" + je.getName());
+ CachedJarFileCallback.getInstance().addMapping(fakeRemote, fileURL);
+ addURL(fakeRemote);
SecurityDesc jarSecurity = file.getSecurity();
@@ -752,7 +755,7 @@
codebase.getHost());
}
- jarLocationSecurityMap.put(fileURL, jarSecurity);
+ jarLocationSecurityMap.put(fakeRemote, jarSecurity);
} catch (MalformedURLException mfue) {
if (JNLPRuntime.isDebug())
@@ -767,17 +770,21 @@
}
- addURL(location);
+ addURL(jar.getLocation());
// there is currently no mechanism to cache files per
// instance.. so only index cached files
if (localFile != null) {
+ CachedJarFileCallback.getInstance().addMapping(jar.getLocation(), localFile.toURL());
+
JarFile jarFile = new JarFile(localFile.getAbsolutePath());
Manifest mf = jarFile.getManifest();
classpaths.addAll(getClassPathsFromManifest(mf, jar.getLocation().getPath()));
JarIndex index = JarIndex.getJarIndex(jarFile, null);
if (index != null)
jarIndexes.add(index);
+ } else {
+ CachedJarFileCallback.getInstance().addMapping(jar.getLocation(), jar.getLocation());
}
if (JNLPRuntime.isDebug())
@@ -1098,11 +1105,9 @@
);
URL remoteURL = desc.getLocation();
-
- URL u = tracker.getCacheURL(remoteURL);
- if (u != null) {
- addURL(u);
- }
+ URL cachedUrl = tracker.getCacheURL(remoteURL);
+ addURL(remoteURL);
+ CachedJarFileCallback.getInstance().addMapping(remoteURL, cachedUrl);
}
/**
@@ -1295,7 +1300,7 @@
/**
* Returns the security descriptor for given code source URL
*
- * @param source The code source
+ * @param source the origin (remote) url of the code
* @return The SecurityDescriptor for that source
*/
diff -r 4267bb156f08 -r 7dd63058c234 netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Tue Jul 19 12:14:35 2011 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java Fri Jul 15 16:02:00 2011 -0400
@@ -35,6 +35,8 @@
import javax.swing.UIManager;
import javax.swing.text.html.parser.ParserDelegator;
+import sun.net.www.protocol.jar.URLJarFile;
+
import net.sourceforge.jnlp.*;
import net.sourceforge.jnlp.browser.BrowserAwareProxySelector;
import net.sourceforge.jnlp.cache.*;
@@ -237,6 +239,8 @@
Security.setProperty("package.access",
Security.getProperty("package.access")+",net.sourceforge.jnlp");
+ URLJarFile.setCallBack(CachedJarFileCallback.getInstance());
+
initialized = true;
}
diff -r 4267bb156f08 -r 7dd63058c234 netx/net/sourceforge/jnlp/services/XExtendedService.java
--- a/netx/net/sourceforge/jnlp/services/XExtendedService.java Tue Jul 19 12:14:35 2011 -0400
+++ b/netx/net/sourceforge/jnlp/services/XExtendedService.java Fri Jul 15 16:02:00 2011 -0400
@@ -34,10 +34,12 @@
public FileContents openFile(File file) throws IOException {
+ File secureFile = new File(file.getPath());
+
/* FIXME: this opens a file with read/write mode, not just read or write */
- if (ServiceUtil.checkAccess(AccessType.READ_FILE, new Object[] { file.getAbsolutePath() })) {
+ if (ServiceUtil.checkAccess(AccessType.READ_FILE, new Object[] { secureFile.getAbsolutePath() })) {
return (FileContents) ServiceUtil.createPrivilegedProxy(FileContents.class,
- new XFileContents(file));
+ new XFileContents(secureFile));
} else {
return null;
}
diff -r 4267bb156f08 -r 7dd63058c234 netx/net/sourceforge/jnlp/services/XFileContents.java
--- a/netx/net/sourceforge/jnlp/services/XFileContents.java Tue Jul 19 12:14:35 2011 -0400
+++ b/netx/net/sourceforge/jnlp/services/XFileContents.java Fri Jul 15 16:02:00 2011 -0400
@@ -34,7 +34,8 @@
* Create a file contents implementation for the file.
*/
protected XFileContents(File file) {
- this.file = file;
+ // create a safe copy
+ this.file = new File(file.getPath());
}
/**
diff -r 4267bb156f08 -r 7dd63058c234 netx/net/sourceforge/jnlp/util/UrlUtils.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Fri Jul 15 16:02:00 2011 -0400
@@ -0,0 +1,53 @@
+/* UrlUtils.java
+ Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING. If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version.
+*/
+
+package net.sourceforge.jnlp.util;
+
+import java.net.URL;
+
+public class UrlUtils {
+
+ public static boolean isLocalFile(URL url) {
+
+ if (url.getProtocol().equals("file") &&
+ (url.getAuthority() == null || url.getAuthority().equals("")) &&
+ (url.getHost() == null || url.getHost().equals(("")))) {
+ return true;
+ }
+ return false;
+ }
+}
More information about the distro-pkg-dev
mailing list