Author: markt Date: Wed Sep 12 19:47:54 2018 New Revision: 1840747 URL: http://svn.apache.org/viewvc?rev=1840747&view=rev Log: Additional fix for BZ 62712
Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1840747&r1=1840746&r2=1840747&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Wed Sep 12 19:47:54 2018 @@ -1857,17 +1857,22 @@ public class ManagerServlet extends Http for (SSLHostConfig sslHostConfig : sslHostConfigs) { String name = connector.toString() + "-" + sslHostConfig.getHostName(); List<String> certList = new ArrayList<>(); - SSLContext sslContext = - sslHostConfig.getCertificates().iterator().next().getSslContext(); - X509Certificate[] certs = sslContext.getAcceptedIssuers(); - if (certs == null) { - certList.add(sm.getString("managerServlet.certsNotAvailable")); - } else if (certs.length == 0) { - certList.add(sm.getString("managerServlet.trustedCertsNotConfigured")); - } else { - for (Certificate cert : certs) { - certList.add(cert.toString()); + if (sslHostConfig.getOpenSslContext().longValue() == 0) { + // Not set. Must be JSSE based. + SSLContext sslContext = + sslHostConfig.getCertificates().iterator().next().getSslContext(); + X509Certificate[] certs = sslContext.getAcceptedIssuers(); + if (certs == null) { + certList.add(sm.getString("managerServlet.certsNotAvailable")); + } else if (certs.length == 0) { + certList.add(sm.getString("managerServlet.trustedCertsNotConfigured")); + } else { + for (Certificate cert : certs) { + certList.add(cert.toString()); + } } + } else { + certList.add(sm.getString("managerServlet.certsNotAvailable")); } result.put(name, certList); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org