[Swift-commit] cog r3449

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3449 | hategan | 2012-08-08 20:37:44 -0500 (Wed, 08 Aug 2012) | 1 line

if no relevant trusted CA can be found for forwarding, log a list of the ones that are known
------------------------------------------------------------------------
Index: modules/provider-ssh/src/org/globus/cog/abstraction/impl/ssh/execution/ProxyForwardingManager.java
===================================================================
--- modules/provider-ssh/src/org/globus/cog/abstraction/impl/ssh/execution/ProxyForwardingManager.java	(revision 3448)
+++ modules/provider-ssh/src/org/globus/cog/abstraction/impl/ssh/execution/ProxyForwardingManager.java	(working copy)
@@ -22,6 +22,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.log4j.Logger;
 import org.globus.cog.abstraction.impl.common.task.InvalidSecurityContextException;
 import org.globus.cog.abstraction.impl.ssh.ConnectionID;
 import org.globus.cog.abstraction.impl.ssh.SSHChannel;
@@ -48,6 +49,8 @@
  * 
  */
 public class ProxyForwardingManager {
+    public static final Logger logger = Logger.getLogger(ProxyForwardingManager.class);
+    
     public static final long TIME_MARGIN = 10000;
     public static final String PROXY_PREFIX = "sshproxy";
     public static final String CA_PREFIX = "sshCAcert";
@@ -164,6 +167,12 @@
                 
                 X509Certificate caCert = tc.getCertificate(userCert.getIssuerDN().getName());
                 if (caCert == null) {
+                    logger.info("Cannot find root CA certificate for proxy");
+                    logger.info("DNs of trusted certificates:");
+                    X509Certificate[] roots = tc.getCertificates();
+                    for (X509Certificate root : roots) {
+                        logger.info("\t" + root.getSubjectDN());
+                    }
                     throw new InvalidSecurityContextException("Failed to find root CA certificate (" + userCert.getIssuerDN().getName() + ")");
                 }