valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-4559: TSSLSocket no longer prints incorrect error for SYSCALL (#1549)

Browse Source 
Client: cpp
This commit is contained in:
Sidneys1 2018-05-02 13:39:49 -04:00 committed by James E. King III
parent c7aa68bd59
commit b33130f679
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/cpp/src/thrift/transport/TSSLSocket.cpp
View File

@ -403,11 +403,16 @@ uint32_t TSSLSocket::read(uint8_t* buf, uint32_t len) {
break;
}
unsigned int waitEventReturn;
bool breakout = false;
switch (error) {
case SSL_ERROR_ZERO_RETURN:
throw TTransportException(TTransportException::END_OF_FILE, "client disconnected");
case SSL_ERROR_SYSCALL:
if (errno_copy == 0 && ERR_peek_error() == 0) {
breakout = true;
break;
}
if ((errno_copy != THRIFT_EINTR)
&& (errno_copy != THRIFT_EAGAIN)) {
break;
@ -450,6 +455,9 @@ uint32_t TSSLSocket::read(uint8_t* buf, uint32_t len) {
throw TTransportException(TTransportException::INTERNAL_ERROR, "unkown waitForEvent return value");
default:;// do nothing
}
if (breakout) {
break;
}
string errors;
buildErrors(errors, errno_copy, error);
throw TSSLException("SSL_read: " + errors);
@ -1024,6 +1032,14 @@ void buildErrors(string& errors, int errno_copy, int sslerrno) {
}
if (sslerrno) {
errors += " (SSL_error_code = " + to_string(sslerrno) + ")";
if (sslerrno == SSL_ERROR_SYSCALL) {
char buf[4096];
int err;
while ((err = ERR_get_error()) != 0) {
errors += " ";
errors += ERR_error_string(err, buf);
}
}
}
}