Merge pull request #5 from oatpp/fix_missing_host_name

Fix missing host-name
oatpp · Jan 21, 2021 · b45f755 · b45f755
2 parents 68d31ed + 7bff23b
commit b45f755
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/oatpp-openssl/client/ConnectionProvider.cpp b/src/oatpp-openssl/client/ConnectionProvider.cpp
@@ -83,11 +83,11 @@ std::shared_ptr<ConnectionProvider> ConnectionProvider::createShared(const std::
 
 std::shared_ptr<data::stream::IOStream> ConnectionProvider::get(){
 
-//  oatpp::String host;
-//  auto hostName = m_streamProvider->getProperty(oatpp::network::ConnectionProvider::PROPERTY_HOST);
-//  if(hostName) {
-//    host = hostName.toString();
-//  }
+  oatpp::String host;
+  auto hostName = m_streamProvider->getProperty(oatpp::network::ConnectionProvider::PROPERTY_HOST);
+  if(hostName) {
+    host = hostName.toString();
+  }
 
   auto transportStream = m_streamProvider->get();
 
@@ -98,6 +98,7 @@ std::shared_ptr<data::stream::IOStream> ConnectionProvider::get(){
   auto ssl = SSL_new(m_ctx);
   SSL_set_mode(ssl, SSL_MODE_ENABLE_PARTIAL_WRITE);
   SSL_set_connect_state(ssl);
+  SSL_set_tlsext_host_name(ssl, host->c_str());
 
   auto sslConnection = std::make_shared<Connection>(ssl, transportStream);
 
@@ -142,15 +143,16 @@ oatpp::async::CoroutineStarterForResult<const std::shared_ptr<data::stream::IOSt
 
     Action secureConnection() {
 
-//      oatpp::String host;
-//      auto hostName = m_streamProvider->getProperty(oatpp::network::ConnectionProvider::PROPERTY_HOST);
-//      if(hostName) {
-//        host = hostName.toString();
-//      }
+      oatpp::String host;
+      auto hostName = m_streamProvider->getProperty(oatpp::network::ConnectionProvider::PROPERTY_HOST);
+      if(hostName) {
+        host = hostName.toString();
+      }
 
       auto ssl = SSL_new(m_ctx);
       SSL_set_mode(ssl, SSL_MODE_ENABLE_PARTIAL_WRITE);
       SSL_set_connect_state(ssl);
+      SSL_set_tlsext_host_name(ssl, host->c_str());
 
       m_connection = std::make_shared<Connection>(ssl, m_stream);