Added warning when RSA cert not valid for server domain was found. JM-968

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7057 b35dd754-fafc-0310-a699-88a17e54d16e

src/i18n/wildfire_i18n_cs_CZ.properties

@@ -2124,3 +2124,4 @@ stun.settings.primaryport = Prim\u00e1rn\u00ed port
 stun.settings.secondaryport = Sekund\u00e1rn\u00ed
 stun.settings.enabled = Povoleno
 stun.settings.change = Zm\u011bna 
+index.certificate-warning=Found RSA certificate that is not valid for the server domain.
\ No newline at end of file

src/i18n/wildfire_i18n_de.properties

@@ -2115,4 +2115,5 @@ upgrade.database.interbase_db=Warning: automatic upgrades of Interbase are not s
 timezone.choose=Choose Time Zone
 setup.sidebar.profile=Profile Settings
 sidebar.profile-settings=Profile Settings
-sidebar.profile-settings.descr=Click to configure user and group profile settings
\ No newline at end of file
+sidebar.profile-settings.descr=Click to configure user and group profile settings
+index.certificate-warning=Found RSA certificate that is not valid for the server domain.
\ No newline at end of file

src/i18n/wildfire_i18n_en.properties

@@ -215,6 +215,10 @@
 ##      Added key: 'setup.finished.wait'
 ##      Added section 'mediaproxy.*'
 ##      Added section 'stun.*'
+##
+## 3.2.1
+##      Added key: 'index.certificate-warning'
+
 
 # Wildfire
 
@@ -726,6 +730,7 @@ index.properties=Server Properties
 index.uptime=Server Uptime:
 index.version=Version:
 index.home=Wildfire Home:
+index.certificate-warning=Found RSA certificate that is not valid for the server domain.
 index.server_name=Server Name:
 index.server_port=Server Ports
 index.server_ip=IP:Port, Security:

src/i18n/wildfire_i18n_es.properties

@@ -2121,4 +2121,5 @@ stun.settings.secondaryaddress = Direcci\u00f3n Secundaria
 stun.settings.primaryport = Puerto Primario
 stun.settings.secondaryport = Puerto Secundario
 stun.settings.enabled = Habilitado
-stun.settings.change = Cambiar
\ No newline at end of file
+stun.settings.change = Cambiar
+index.certificate-warning=Se ha encontrado un certificado RSA que no es v\u00e1lido para el dominio del servidor.
\ No newline at end of file

src/i18n/wildfire_i18n_nl.properties

@@ -2118,4 +2118,5 @@ user.read_only=Not allowed: the user account system is read-only.
 timezone.choose=Choose Time Zone
 setup.sidebar.profile=Profile Settings
 sidebar.profile-settings=Profile Settings
-sidebar.profile-settings.descr=Click to configure user and group profile settings
\ No newline at end of file
+sidebar.profile-settings.descr=Click to configure user and group profile settings
+index.certificate-warning=Found RSA certificate that is not valid for the server domain.
\ No newline at end of file

src/i18n/wildfire_i18n_pl_PL.properties

@@ -2087,4 +2087,5 @@ user.summary.last-logout=Last Logout
 user.read_only=Not allowed: the user account system is read-only.
 setup.sidebar.profile=Profile Settings
 sidebar.profile-settings=Profile Settings
-sidebar.profile-settings.descr=Click to configure user and group profile settings
\ No newline at end of file
+sidebar.profile-settings.descr=Click to configure user and group profile settings
+index.certificate-warning=Found RSA certificate that is not valid for the server domain.
\ No newline at end of file

src/web/index.jsp

@@ -30,6 +30,8 @@
 <%@ page import="org.jivesoftware.wildfire.session.ClientSession" %>
 <%@ page import="org.jivesoftware.util.LocaleUtils" %>
 <%@ page import="org.jivesoftware.wildfire.container.AdminConsolePlugin" %>
+<%@ page import="org.jivesoftware.util.CertificateManager" %>
+<%@ page import="org.jivesoftware.wildfire.net.SSLConfig" %>
 
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
@@ -176,6 +178,9 @@
             <fmt:message key="index.server_name" />
         </td>
         <td class="c2">
+            <% if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), XMPPServer.getInstance().getServerInfo().getName())) {%>
+            <img src="images/warning-16x16.gif" width="16" height="16" border="0" alt="<fmt:message key="index.certificate-warning" />">&nbsp;
+            <% } %>
             ${webManager.serverInfo.name}
         </td>
     </tr>

src/web/ssl-certificates.jsp

@@ -96,7 +96,18 @@
   </head>
   <body>
 
-  <% if (((AdminConsolePlugin) pluginManager.getPlugin("admin")).isRestartNeeded()) { %>
+  <% if (!CertificateManager.isRSACertificate(SSLConfig.getKeyStore(), XMPPServer.getInstance().getServerInfo().getName())) { %>
+      <div class="warning">
+      <table cellpadding="0" cellspacing="0" border="0">
+      <tbody>
+          <tr>
+          <td class="jive-icon-label">
+              <fmt:message key="index.certificate-warning"/>
+          </td></tr>
+      </tbody>
+      </table>
+      </div><br>
+  <% } else if (((AdminConsolePlugin) pluginManager.getPlugin("admin")).isRestartNeeded()) { %>
       <div class="warning">
       <table cellpadding="0" cellspacing="0" border="0">
       <tbody>