ApiListener#NewClientHandlerInternal(): Explicitly close the TLS stream on any failure

refs #6361

diff --git a/lib/remote/apilistener.cpp b/lib/remote/apilistener.cpp
index d7e01da67c26ec57f92df0ed0ef8af92b3eb3208..c1546710d0a84b80450a804846c06df391ec8bea 100644 (file)
--- a/lib/remote/apilistener.cpp
+++ b/lib/remote/apilistener.cpp
@@ -457,6 +457,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
        } catch (const std::exception&) {
                Log(LogCritical, "ApiListener")
                        << "Client TLS handshake failed (" << conninfo << ")";
+               tlsStream->Close();
                return;
        }
 
@@ -471,6 +472,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
                } catch (const std::exception&) {
                        Log(LogCritical, "ApiListener")
                                << "Cannot get certificate common name from cert path: '" << GetDefaultCertPath() << "'.";
+                       tlsStream->Close();
                        return;
                }
 
@@ -480,6 +482,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
                                Log(LogWarning, "ApiListener")
                                        << "Unexpected certificate common name while connecting to endpoint '"
                                        << hostname << "': got '" << identity << "'";
+                               tlsStream->Close();
                                return;
                        } else if (!verify_ok) {
                                Log(LogWarning, "ApiListener")
@@ -529,6 +532,7 @@ void ApiListener::NewClientHandlerInternal(const Socket::Ptr& client, const Stri
                                Log(LogWarning, "ApiListener")
                                        << "No data received on new API connection for identity '" << identity << "'. "
                                        << "Ensure that the remote endpoints are properly configured in a cluster setup.";
+                       tlsStream->Close();
                        return;
                }