Author: rjung
Date: Thu Aug 31 14:02:49 2017
New Revision: 1806794
URL: http://svn.apache.org/viewvc?rev=1806794&view=rev
Log:
Show connector cipher list in the manager web
application in the correct cipher order.
Modified:
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
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=1806794&r1=1806793&r2=1806794&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Aug
31 14:02:49 2017
@@ -22,12 +22,14 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
@@ -562,8 +564,8 @@ public class ManagerServlet extends Http
StringManager smClient) {
writer.println(smClient.getString(
"managerServlet.sslConnectorCiphers"));
- Map<String,Set<String>> connectorCiphers = getConnectorCiphers();
- for (Map.Entry<String,Set<String>> entry :
connectorCiphers.entrySet()) {
+ Map<String,List<String>> connectorCiphers = getConnectorCiphers();
+ for (Map.Entry<String,List<String>> entry :
connectorCiphers.entrySet()) {
writer.println(entry.getKey());
for (String cipher : entry.getValue()) {
writer.print(" ");
@@ -1683,8 +1685,8 @@ public class ManagerServlet extends Http
}
- protected Map<String,Set<String>> getConnectorCiphers() {
- Map<String,Set<String>> result = new HashMap<>();
+ protected Map<String,List<String>> getConnectorCiphers() {
+ Map<String,List<String>> result = new HashMap<>();
Engine e = (Engine) host.getParent();
Service s = e.getService();
@@ -1694,15 +1696,12 @@ public class ManagerServlet extends Http
SSLHostConfig[] sslHostConfigs =
connector.getProtocolHandler().findSslHostConfigs();
for (SSLHostConfig sslHostConfig : sslHostConfigs) {
String name = connector.toString() + "-" +
sslHostConfig.getHostName();
- Set<String> cipherList = new HashSet<>();
- String[] cipherNames = sslHostConfig.getEnabledCiphers();
- for (String cipherName : cipherNames) {
- cipherList.add(cipherName);
- }
- result.put(name, cipherList);
+ /* Add cipher list, keep order but remove duplicates */
+ result.put(name, new ArrayList<>(new LinkedHashSet<>(
+ Arrays.asList(sslHostConfig.getEnabledCiphers()))));
}
} else {
- Set<String> cipherList = new HashSet<>();
+ ArrayList cipherList = new ArrayList<String>(1);
cipherList.add(sm.getString("managerServlet.notSslConnector"));
result.put(connector.toString(), cipherList);
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1806794&r1=1806793&r2=1806794&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Aug 31 14:02:49 2017
@@ -144,6 +144,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Web applications">
+ <changelog>
+ <fix>
+ Show connector cipher list in the manager web application in the
+ correct cipher order. (rjung)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Tribes">
<changelog>
<fix>
Modified: tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp?rev=1806794&r1=1806793&r2=1806794&view=diff
==============================================================================
--- tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp (original)
+++ tomcat/trunk/webapps/manager/WEB-INF/jsp/connectorCiphers.jsp Thu Aug 31
14:02:49 2017
@@ -18,13 +18,13 @@
<%@page session="false" contentType="text/html; charset=ISO-8859-1" %>
<%@page import="java.util.Map" %>
<%@page import="java.util.Map.Entry" %>
-<%@page import="java.util.Set" %>
+<%@page import="java.util.List" %>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en">
-<% Map<String,Set<String>> cipherList = (Map<String,Set<String>>)
request.getAttribute("cipherList");
+<% Map<String,List<String>> cipherList = (Map<String,List<String>>)
request.getAttribute("cipherList");
%>
<head>
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1"/>
@@ -48,7 +48,7 @@
</thead>
<tbody>
<%
- for (Map.Entry<String, Set<String>> entry : cipherList.entrySet()) {
+ for (Map.Entry<String, List<String>> entry : cipherList.entrySet()) {
%>
<tr>
<td><%=entry.getKey()%></td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
