[geode-native] 06/08: Add try/catch to TcpSslConn

[bb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bbender pushed a commit to branch feature/asio
in repository https://gitbox.apache.org/repos/asf/geode-native.git

commit 12ded66441f771512196934a26ba6850193e719b
Author: Mike Martell <mm...@pivotal.io>
AuthorDate: Mon Jul 27 09:36:52 2020 -0700

    Add try/catch to TcpSslConn
---
 cppcache/src/TcpSslConn.cpp | 67 +++++++++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/cppcache/src/TcpSslConn.cpp b/cppcache/src/TcpSslConn.cpp
index 6513514..52b3072 100644
--- a/cppcache/src/TcpSslConn.cpp
+++ b/cppcache/src/TcpSslConn.cpp
@@ -23,6 +23,8 @@
 #include <chrono>
 #include <thread>
 
+#include <boost/exception/diagnostic_information.hpp>
+
 #include <geode/SystemProperties.hpp>
 
 #include "CacheImpl.hpp"
@@ -93,34 +95,45 @@ void TcpSslConn::init(const std::string& pubkeyfile,
   // This configuration is copied into each SSL instance upon construction.
   // That means you need to get your configuration in order before you
   // construct the stream and connect the socket.
-  ssl_context_.set_verify_mode(boost::asio::ssl::verify_peer);
-  ssl_context_.load_verify_file(pubkeyfile);
-
-  ssl_context_.set_password_callback(
-      [pemPassword](std::size_t /*max_length*/,
-                    boost::asio::ssl::context::password_purpose /*purpose*/) {
-        return pemPassword;
-      });
-
-  if (!privkeyfile.empty()) {
-    ssl_context_.use_certificate_chain_file(privkeyfile);
-    ssl_context_.use_private_key_file(
-        privkeyfile, boost::asio::ssl::context::file_format::pem);
+  LOGDEBUG(
+      "*** TcpSslConn init, pubkeyfile = %s, pemPassword = %s, sniHostname = "
+      "%s",
+      pubkeyfile.c_str(), pemPassword.c_str(), sniHostname.c_str());
+
+  try {
+    ssl_context_.set_verify_mode(boost::asio::ssl::verify_peer);
+    ssl_context_.load_verify_file(pubkeyfile);
+
+    ssl_context_.set_password_callback(
+        [pemPassword](std::size_t /*max_length*/,
+                      boost::asio::ssl::context::password_purpose /*purpose*/) {
+          return pemPassword;
+        });
+
+    if (!privkeyfile.empty()) {
+      ssl_context_.use_certificate_chain_file(privkeyfile);
+      ssl_context_.use_private_key_file(
+          privkeyfile, boost::asio::ssl::context::file_format::pem);
+    }
+
+    auto stream = std::unique_ptr<ssl_stream_type>(
+        new ssl_stream_type{socket_, ssl_context_});
+
+    SSL_set_tlsext_host_name(stream->native_handle(), sniHostname.c_str());
+
+    stream->handshake(ssl_stream_type::client);
+
+    std::stringstream ss;
+    ss << "Setup SSL " << socket_.local_endpoint() << " -> "
+       << socket_.remote_endpoint();
+    LOGINFO(ss.str());
+
+    socket_stream_ = std::move(stream);
+  } catch (const boost::exception& ex) {
+    // error handling
+    std::string info = boost::diagnostic_information(ex);
+    LOGDEBUG("caught boost exception: %s", info);
   }
-
-  auto stream = std::unique_ptr<ssl_stream_type>(
-      new ssl_stream_type{socket_, ssl_context_});
-
-  SSL_set_tlsext_host_name(stream->native_handle(), sniHostname.c_str());
-
-  stream->handshake(ssl_stream_type::client);
-
-  std::stringstream ss;
-  ss << "Setup SSL " << socket_.local_endpoint() << " -> "
-     << socket_.remote_endpoint();
-  LOGINFO(ss.str());
-
-  socket_stream_ = std::move(stream);
 }
 
 TcpSslConn::~TcpSslConn() {