tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6371 from Icinga/bugfix/socket-io-handling-with-http-json-rpc-6361 

ApiListener#NewClientHandlerInternal(): Explicitly close the TLS stream on any failure
This commit is contained in:
Michael Friedrich 2018-06-15 14:35:48 +02:00 committed by GitHub
parent 8aaabea54f 7741517df7
commit 8c3c4704d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/remote/apilistener.cpp
View File

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