/hg/icedtea-web: Added more debugging outputs (especially paths ...

[jvanek at icedtea.classpath.org]

changeset 7a483b55fa92 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=7a483b55fa92
author: Jiri Vanek <jvanek at redhat.com>
date: Wed May 23 18:33:29 2012 +0200

	Added more debugging outputs (especially paths to keystores) for JNLPClassLoader and CertificateUtils


diffstat:

 ChangeLog                                                |  13 +++++++++++++
 netx/net/sourceforge/jnlp/resources/Messages.properties  |   4 +++-
 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java   |   7 ++++++-
 netx/net/sourceforge/jnlp/security/CertificateUtils.java |   3 ++-
 netx/net/sourceforge/jnlp/security/KeyStores.java        |  15 +++++++++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)

diffs (117 lines):

diff -r 1f1e62fd9d23 -r 7a483b55fa92 ChangeLog
--- a/ChangeLog	Wed May 23 18:22:43 2012 +0200
+++ b/ChangeLog	Wed May 23 18:33:29 2012 +0200
@@ -1,3 +1,16 @@
+2012-05-23 Jiri Vanek  <jvanek at redhat.com>
+
+	Added more debugging outputs
+	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java:
+	(getCodeSourceSecurity): added output message when no SecurityDesc is found
+	for some url/resource
+	* netx/net/sourceforge/jnlp/resources/Messages.properties: added LNoSecInstance
+	and LCertFoundIn values
+	* netx/net/sourceforge/jnlp/security/KeyStores.java: (getPathToKeystore):
+	new method, able to search for file used for creating of KeyStore if possible
+	* netx/net/sourceforge/jnlp/security/CertificateUtils.java: (inKeyStores)
+	using getPathToKeystore for debug output
+
 2012-05-23  Jiri Vanek  <jvanek at redhat.com>
 
 	* netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: (getPermissions):
diff -r 1f1e62fd9d23 -r 7a483b55fa92 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed May 23 18:22:43 2012 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Wed May 23 18:33:29 2012 +0200
@@ -81,7 +81,9 @@
 LSignedAppJarUsingUnsignedJar=Signed application using unsigned jars.
 LSignedAppJarUsingUnsignedJarInfo=The main application jar is signed, but some of the jars it is using aren't.
 LSignedJNLPFileDidNotMatch=The signed JNLP file did not match the launching JNLP file.
-
+LNoSecInstance=Error: No security instance for {0}. The application may have trouble continuing
+LCertFoundIn={0} found in cacerts ({1})
+ 
 JNotApplet=File is not an applet.
 JNotApplication=File is not an application.
 JNotComponent=File is not a component.
diff -r 1f1e62fd9d23 -r 7a483b55fa92 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed May 23 18:22:43 2012 +0200
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java	Wed May 23 18:33:29 2012 +0200
@@ -1754,7 +1754,12 @@
      */
 
     protected SecurityDesc getCodeSourceSecurity(URL source) {
-        return jarLocationSecurityMap.get(source);
+        SecurityDesc sec=jarLocationSecurityMap.get(source);
+        if (sec == null){
+            System.out.println(Translator.R("LNoSecInstance",source.toString()));
+        }
+        return sec;
+
     }
 
     /**
diff -r 1f1e62fd9d23 -r 7a483b55fa92 netx/net/sourceforge/jnlp/security/CertificateUtils.java
--- a/netx/net/sourceforge/jnlp/security/CertificateUtils.java	Wed May 23 18:22:43 2012 +0200
+++ b/netx/net/sourceforge/jnlp/security/CertificateUtils.java	Wed May 23 18:33:29 2012 +0200
@@ -60,6 +60,7 @@
 import java.util.Random;
 
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.runtime.Translator;
 import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
 import sun.security.provider.X509Factory;
 
@@ -173,7 +174,7 @@
 
                     if (c.equals(keyStores[i].getCertificate(alias))) {
                         if (JNLPRuntime.isDebug()) {
-                            System.out.println(c.getSubjectX500Principal().getName() + " found in cacerts");
+                            System.out.println(Translator.R("LCertFoundIn", c.getSubjectX500Principal().getName(), KeyStores.getPathToKeystore(keyStores[i].hashCode())));
                         }
 
                         return true;
diff -r 1f1e62fd9d23 -r 7a483b55fa92 netx/net/sourceforge/jnlp/security/KeyStores.java
--- a/netx/net/sourceforge/jnlp/security/KeyStores.java	Wed May 23 18:22:43 2012 +0200
+++ b/netx/net/sourceforge/jnlp/security/KeyStores.java	Wed May 23 18:33:29 2012 +0200
@@ -47,7 +47,9 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 import net.sourceforge.jnlp.config.DeploymentConfiguration;
@@ -75,6 +77,8 @@
         CLIENT_CERTS,
     }
 
+    public static final Map<Integer,String> keystoresPaths=new HashMap<Integer, String>();
+
     private static DeploymentConfiguration config = null;
 
     private static final String KEYSTORE_TYPE = "JKS";
@@ -133,12 +137,23 @@
         KeyStore ks = null;
         try {
             ks = createKeyStoreFromFile(new File(location), create, DEFAULT_PASSWORD);
+            //hashcode is used instead of instance so when no references are left
+            //to keystore, then this will not be blocker for garbage collection
+            keystoresPaths.put(ks.hashCode(),location);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return ks;
     }
 
+    public static String getPathToKeystore(int k) {
+        String s = keystoresPaths.get(k);
+        if (s == null) {
+            return "unknown keystore location";
+        }
+        return s;
+    }
+
     /**
      * Returns an array of KeyStore that contain certificates that are trusted.
      * The KeyStores contain certificates from different sources.