refactor

Signed-off-by: Abhishek Kumar <[email protected]>

Author: shwstppr

utils/src/main/java/com/cloud/utils/nio/Link.java

@@ -362,7 +362,7 @@ public static KeyStore loadKeyStore(final InputStream stream, final char[] passp
     }
 
     public static SSLEngine initServerSSLEngine(final CAService caService, final String clientAddress) throws GeneralSecurityException, IOException {
-        final SSLContext sslContext = SSLUtils.getSSLContextWithLatestVersion();
+        final SSLContext sslContext = SSLUtils.getSSLContextWithLatestProtocolVersion();
         if (caService != null) {
             return caService.createSSLEngine(sslContext, clientAddress);
         }
@@ -391,7 +391,7 @@ public static SSLContext initManagementSSLContext(final CAService caService) thr
         final KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
         kmf.init(ks, passphrase);
 
-        final SSLContext sslContext = SSLUtils.getSSLContextWithLatestVersion();
+        final SSLContext sslContext = SSLUtils.getSSLContextWithLatestProtocolVersion();
         sslContext.init(kmf.getKeyManagers(), tms, new SecureRandom());
         return sslContext;
     }
@@ -435,7 +435,7 @@ public static SSLContext initClientSSLContext() throws GeneralSecurityException,
         final KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
         kmf.init(ks, passphrase);
 
-        final SSLContext sslContext = SSLUtils.getSSLContextWithLatestVersion();
+        final SSLContext sslContext = SSLUtils.getSSLContextWithLatestProtocolVersion();
         sslContext.init(kmf.getKeyManagers(), tms, new SecureRandom());
         return sslContext;
     }

utils/src/main/java/com/cloud/utils/nio/NioClient.java

@@ -74,7 +74,8 @@ protected void init() throws IOException {
             if (!Link.doHandshake(clientConnection, sslEngine, getSslHandshakeTimeout())) {
                 throw new IOException(String.format("SSL Handshake failed while connecting to host: %s", hostLog));
             }
-            logger.info("SSL: Handshake done");
+            logger.info("SSL: Handshake done with {} protocol: {}, cipher suite: {}",
+                    serverAddress, sslEngine.getSession().getProtocol(), sslEngine.getSession().getCipherSuite());
 
             final Link link = new Link(serverAddress, this);
             link.setSSLEngine(sslEngine);

utils/src/main/java/com/cloud/utils/nio/NioConnection.java

@@ -274,7 +274,9 @@ protected void accept(final SelectionKey key) throws IOException {
                     if (!Link.doHandshake(socketChannel, sslEngine, getSslHandshakeTimeout())) {
                         throw new IOException("SSL handshake timed out with " + socketAddress);
                     }
-                    logger.trace("SSL: Handshake done");
+                    logger.trace("SSL: Handshake done with {} protocol: {}, cipher suite: {}",
+                            socketAddress, sslEngine.getSession().getProtocol(),
+                            sslEngine.getSession().getCipherSuite());
                     final Link link = new Link(socketAddress, nioConnection);
                     link.setSSLEngine(sslEngine);
                     link.setKey(socketChannel.register(key.selector(), SelectionKey.OP_READ, link));

utils/src/main/java/org/apache/cloudstack/utils/security/SSLUtils.java

@@ -70,7 +70,7 @@ public static SSLContext getSSLContext() throws NoSuchAlgorithmException {
         return SSLContext.getInstance("TLSv1.2");
     }
 
-    public static SSLContext getSSLContextWithLatestVersion() throws NoSuchAlgorithmException {
+    public static SSLContext getSSLContextWithLatestProtocolVersion() throws NoSuchAlgorithmException {
         return SSLContext.getInstance("TLSv1.3");
     }