/hg/icedtea6: netx: handle JNLP files which use native libraries...

[omajid at icedtea.classpath.org]

changeset c09ec1d01ca3 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c09ec1d01ca3
author: Omair Majid <omajid at redhat.com>
date: Thu Jun 24 09:40:43 2010 -0400

	netx: handle JNLP files which use native libraries but do not
	indiate it

	2010-06-24 Omair Majid <omajid at redhat.com>

	 * netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments.
	    * netx/net/sourceforge/jnlp/JNLPClassLoader.java (activateJars):
	Always call activateNative. (activateNative): Search for native
	code anywhere in the jar.


diffstat:

3 files changed, 35 insertions(+), 18 deletions(-)
ChangeLog                                              |    7 +++
netx/net/sourceforge/jnlp/SecurityDesc.java            |    9 +--
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java |   37 ++++++++++------

diffs (108 lines):

diff -r a4bc545c483a -r c09ec1d01ca3 ChangeLog
--- a/ChangeLog	Thu Jun 24 00:56:40 2010 +0200
+++ b/ChangeLog	Thu Jun 24 09:40:43 2010 -0400
@@ -1,3 +1,10 @@ 2010-06-24 Andrew John Hughes  <ahughes@
+2010-06-24 Omair Majid <omajid at redhat.com>
+
+	* netx/net/sourceforge/jnlp/SecurityDesc.java: Fix comments.
+	* netx/net/sourceforge/jnlp/JNLPClassLoader.java
+	(activateJars): Always call activateNative.
+	(activateNative): Search for native code anywhere in the jar.
+
 2010-06-24 Andrew John Hughes  <ahughes at redhat.com>
 	   Matthias Klose  <doko at ubuntu.com>
 
diff -r a4bc545c483a -r c09ec1d01ca3 netx/net/sourceforge/jnlp/SecurityDesc.java
--- a/netx/net/sourceforge/jnlp/SecurityDesc.java	Thu Jun 24 00:56:40 2010 +0200
+++ b/netx/net/sourceforge/jnlp/SecurityDesc.java	Thu Jun 24 09:40:43 2010 -0400
@@ -31,12 +31,9 @@ import java.awt.AWTPermission;
  */
 public class SecurityDesc {
 
-    // todo: make sure classloader's native code support checks
-    // the security permissions
-
-    // shouldn't need to verify that native code only runs in
-    // trusted environment because the parser and/or classloader
-    // should kick it.
+    /*
+     * We do not verify security here, the classloader deals with security
+     */
 
     /** All permissions. */
     public static final Object ALL_PERMISSIONS = "All";
diff -r a4bc545c483a -r c09ec1d01ca3 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Jun 24 00:56:40 2010 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Thu Jun 24 09:40:43 2010 -0400
@@ -79,9 +79,6 @@ public class JNLPClassLoader extends URL
 
     /** map from JNLPFile url to shared classloader */
     private static Map urlToLoader = new HashMap(); // never garbage collected!
-
-    /** number of times a classloader with native code is created */
-    private static int nativeCounter = 0;
 
     /** the directory for native code */
     private File nativeDir = null; // if set, some native code exists
@@ -642,8 +639,8 @@ public class JNLPClassLoader extends URL
                             ex.printStackTrace();
                     }
 
-                    if (jar.isNative())
-                        activateNative(jar);
+                    // some programs place a native library in any jar
+                    activateNative(jar);
                 }
 
                 return null;
@@ -654,9 +651,9 @@ public class JNLPClassLoader extends URL
     }
 
     /**
-     * Enable the native code contained in a JAR by copying the
-     * native files into the filesystem.  Called in the security
-     * context of the classloader.
+     * Search for and enable any native code contained in a JAR by copying the
+     * native files into the filesystem. Called in the security context of the
+     * classloader.
      */
     protected void activateNative(JARDesc jar) {
         if (JNLPRuntime.isDebug())
@@ -669,17 +666,33 @@ public class JNLPClassLoader extends URL
         if (nativeDir == null)
             nativeDir = getNativeDir();
 
+        String[] librarySuffixes = { ".so", ".dylib", ".jnilib", ".framework", ".dll" };
+
         try {
             JarFile jarFile = new JarFile(localFile, false);
-            Enumeration entries = jarFile.entries();
+            Enumeration<JarEntry> entries = jarFile.entries();
 
             while (entries.hasMoreElements()) {
-                JarEntry e = (JarEntry) entries.nextElement();
+                JarEntry e = entries.nextElement();
 
-                if (e.isDirectory() || e.getName().indexOf('/') != -1)
+                if (e.isDirectory()) {
                     continue;
+                }
 
-                File outFile = new File(nativeDir, e.getName());
+                String name = new File(e.getName()).getName();
+                boolean isLibrary = false;
+
+                for (String suffix: librarySuffixes) {
+                    if (name.endsWith(suffix)) {
+                       isLibrary = true;
+                       break;
+                    }
+                }
+                if (!isLibrary) {
+                    continue;
+                }
+
+                File outFile = new File(nativeDir, name);
 
                 CacheUtil.streamCopy(jarFile.getInputStream(e),
                                      new FileOutputStream(outFile));