branding for cli; self-signed cert

Signed-off-by: Tony Germano <tony@germano.name>

Author: tonygermano

command/src/com/mirth/connect/cli/CommandLineInterface.java

@@ -51,6 +51,7 @@
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.math.NumberUtils;
 
+import com.mirth.connect.client.core.BrandingConstants;
 import com.mirth.connect.client.core.Client;
 import com.mirth.connect.client.core.ClientException;
 import com.mirth.connect.client.core.ListHandlerException;
@@ -191,7 +192,7 @@ private void runShell(String server, String user, String password, String script
             } catch (Exception e) {
             }
 
-            out.println("Connected to Mirth Connect server @ " + server + " (" + serverVersion + ")");
+            out.println(String.format("Connected to %s Server @ %s (%s)", BrandingConstants.PRODUCT_NAME, server, serverVersion));
             currentUser = StringUtils.defaultString(loginStatus.getUpdatedUsername(), user);
 
             if (script != null) {
@@ -569,7 +570,7 @@ private void commandHelp(Token[] arguments) {
         out.println("user add username \"password\" \"firstName\" \"lastName\" \"organization\" \"email\"\n\tAdds the specified user\n");
         out.println("user remove id|username\n\tRemoves the specified user\n");
         out.println("user changepw id|username \"newpassword\"\n\tChanges the specified user's password\n");
-        out.println("quit\n\tQuits Mirth Connect Shell");
+        out.println(String.format("quit\n\tQuits %s Shell", BrandingConstants.PRODUCT_NAME));
     }
 
     private void commandUserList(Token[] arguments) throws ClientException {
@@ -1851,7 +1852,7 @@ private void commandDumpEvents(Token[] arguments) throws ClientException {
         dumpFilename = replaceValues(dumpFilename);
 
         StringBuilder builder = new StringBuilder();
-        builder.append("Mirth Connect Event Log Dump: " + (new Date()).toString() + "\n");
+        builder.append(String.format("%s Event Log Dump: %s\n", BrandingConstants.PRODUCT_NAME, (new Date()).toString()));
         builder.append(ServerEvent.getExportHeader() + "\n");
 
         File dumpFile = new File(dumpFilename);
@@ -1898,7 +1899,7 @@ private void commandDumpStats(Token[] arguments) throws ClientException {
         dumpFilename = replaceValues(dumpFilename);
 
         StringBuilder builder = new StringBuilder();
-        builder.append("Mirth Connect Channel Statistics Dump: " + (new Date()).toString() + "\n");
+        builder.append(String.format("%s Channel Statistics Dump: %s\n", BrandingConstants.PRODUCT_NAME, (new Date()).toString()));
         builder.append("Name, Received, Filtered, Queued, Sent, Errored\n");
 
         List<DashboardStatus> channelStatuses = client.getAllChannelStatuses();
@@ -2100,4 +2101,4 @@ private void removeInvalidItems(List<?> list, Class<?> expectedClass) {
             }
         }
     }
-}
+}

server/src/com/mirth/connect/client/core/BrandingConstants.java

@@ -6,4 +6,6 @@ public class BrandingConstants {
     public static final String VENDOR_NAME = "Open Integration Engine";
 
     public static final String CLIENT_CONNECTION_HEADER = "openintegrationengine-client";
+
+    public static final String SERVER_CERTIFICATE_CN = "oie-engine";
 }

server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java

@@ -1530,7 +1530,7 @@ private void generateDefaultCertificate(Provider provider, KeyStore keyStore, ch
             logger.debug("generated new key pair for CA cert using provider: " + provider.getName());
 
             // Generate CA cert
-            X500Name caSubjectName = new X500Name("CN=Mirth Connect Certificate Authority");
+            X500Name caSubjectName = new X500Name(String.format("CN=%s Certificate Authority", BrandingConstants.PRODUCT_NAME));
             SubjectPublicKeyInfo caSubjectKey = SubjectPublicKeyInfo.getInstance(caKeyPair.getPublic().getEncoded());
             X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(caSubjectName, BigInteger.ONE, startDate, expiryDate, caSubjectName, caSubjectKey);
             certBuilder.addExtension(org.bouncycastle.asn1.x509.Extension.basicConstraints, true, new BasicConstraints(0));
@@ -1541,7 +1541,7 @@ private void generateDefaultCertificate(Provider provider, KeyStore keyStore, ch
             KeyPair sslKeyPair = keyPairGenerator.generateKeyPair();
             logger.debug("generated new key pair for SSL cert using provider: " + provider.getName());
 
-            X500Name sslSubjectName = new X500Name("CN=mirth-connect");
+            X500Name sslSubjectName = new X500Name(String.format("CN=%s", BrandingConstants.SERVER_CERTIFICATE_CN));
             SubjectPublicKeyInfo sslSubjectKey = SubjectPublicKeyInfo.getInstance(sslKeyPair.getPublic().getEncoded());
             X509v3CertificateBuilder sslCertBuilder = new X509v3CertificateBuilder(caSubjectName, new BigInteger(50, new SecureRandom()), startDate, expiryDate, sslSubjectName, sslSubjectKey);
             sslCertBuilder.addExtension(org.bouncycastle.asn1.x509.Extension.authorityKeyIdentifier, false, new AuthorityKeyIdentifier(caCert.getEncoded()));