rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More robust secure socket error handling #4313

This commit is contained in:
Nick Bolton 2015-03-03 19:21:14 +00:00
parent b6a3788fea
commit 40fa58de8c
2 changed files with 63 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
src/lib/plugin/ns/SecureSocket.cpp
View File

@ -71,7 +71,6 @@ SecureSocket::~SecureSocket()
} }
delete m_ssl; delete m_ssl;
delete[] m_error;
} }
void void
@ -105,7 +104,7 @@ SecureSocket::secureRead(void* buffer, UInt32 n)
int r = 0; int r = 0;
if (m_ssl->m_ssl != NULL) { if (m_ssl->m_ssl != NULL) {
r = SSL_read(m_ssl->m_ssl, buffer, n); r = SSL_read(m_ssl->m_ssl, buffer, n);
retry = checkResult(r); retry = checkResult(r, false);
if (retry) { if (retry) {
r = 0; r = 0;
} }
@ -121,7 +120,7 @@ SecureSocket::secureWrite(const void* buffer, UInt32 n)
int r = 0; int r = 0;
if (m_ssl->m_ssl != NULL) { if (m_ssl->m_ssl != NULL) {
r = SSL_write(m_ssl->m_ssl, buffer, n); r = SSL_write(m_ssl->m_ssl, buffer, n);
retry = checkResult(r); retry = checkResult(r, false);
if (retry) { if (retry) {
r = 0; r = 0;
} }
@ -142,7 +141,6 @@ SecureSocket::initSsl(bool server)
m_ssl = new Ssl(); m_ssl = new Ssl();
m_ssl->m_context = NULL; m_ssl->m_context = NULL;
m_ssl->m_ssl = NULL; m_ssl->m_ssl = NULL;
m_error = new char[MAX_ERROR_SIZE];
initContext(server); initContext(server);
} }
@ -153,18 +151,17 @@ SecureSocket::loadCertificates(const char* filename)
int r = 0; int r = 0;
r = SSL_CTX_use_certificate_file(m_ssl->m_context, filename, SSL_FILETYPE_PEM); r = SSL_CTX_use_certificate_file(m_ssl->m_context, filename, SSL_FILETYPE_PEM);
if (r <= 0) { if (r <= 0) {
showError(); throwError("failed to use ssl certificate");
} }
r = SSL_CTX_use_PrivateKey_file(m_ssl->m_context, filename, SSL_FILETYPE_PEM); r = SSL_CTX_use_PrivateKey_file(m_ssl->m_context, filename, SSL_FILETYPE_PEM);
if (r <= 0) { if (r <= 0) {
showError(); throwError("failed to use ssl private key");
} }
//verify private key
r = SSL_CTX_check_private_key(m_ssl->m_context); r = SSL_CTX_check_private_key(m_ssl->m_context);
if (!r) { if (!r) {
showError(); throwError("check ssl private key failed");
} }
} }
@ -194,7 +191,7 @@ SecureSocket::initContext(bool server)
SSL_METHOD* m = const_cast<SSL_METHOD*>(method); SSL_METHOD* m = const_cast<SSL_METHOD*>(method);
m_ssl->m_context = SSL_CTX_new(m); m_ssl->m_context = SSL_CTX_new(m);
if (m_ssl->m_context == NULL) { if (m_ssl->m_context == NULL) {
showError(); throwError("failed to create ssl context");
} }
} }
@ -211,6 +208,8 @@ SecureSocket::createSSL()
bool bool
SecureSocket::secureAccept(int socket) SecureSocket::secureAccept(int socket)
{ {
LOG((CLOG_DEBUG "accepting secure connection"));
createSSL(); createSSL();
// set connection socket to SSL state // set connection socket to SSL state
@ -219,15 +218,25 @@ SecureSocket::secureAccept(int socket)
// do SSL-protocol accept // do SSL-protocol accept
LOG((CLOG_DEBUG1 "secureAccept")); LOG((CLOG_DEBUG1 "secureAccept"));
int r = SSL_accept(m_ssl->m_ssl); int r = SSL_accept(m_ssl->m_ssl);
bool retry = checkResult(r);
bool retry = false;
try {
retry = checkResult(r, true);
m_secureReady = !retry; m_secureReady = !retry;
}
catch (XSocket& e) {
LOG((CLOG_ERR "failed to accept secure connection"));
LOG((CLOG_INFO "client may have encryption disabled"));
}
return retry; return retry;
} }
bool bool
SecureSocket::secureConnect(int socket) SecureSocket::secureConnect(int socket)
{ {
LOG((CLOG_DEBUG "establishing secure connection"));
createSSL(); createSSL();
// attach the socket descriptor // attach the socket descriptor
@ -235,7 +244,15 @@ SecureSocket::secureConnect(int socket)
LOG((CLOG_DEBUG1 "secureConnect")); LOG((CLOG_DEBUG1 "secureConnect"));
int r = SSL_connect(m_ssl->m_ssl); int r = SSL_connect(m_ssl->m_ssl);
bool retry = checkResult(r);
bool retry = false;
try {
retry = checkResult(r, true);
}
catch (XSocket& e) {
LOG((CLOG_ERR "failed to establish secure connection"));
LOG((CLOG_INFO "server may have encryption disabled"));
}
m_secureReady = !retry; m_secureReady = !retry;
@ -255,107 +272,92 @@ SecureSocket::showCertificate()
// get the server's certificate // get the server's certificate
cert = SSL_get_peer_certificate(m_ssl->m_ssl); cert = SSL_get_peer_certificate(m_ssl->m_ssl);
if (cert != NULL) { if (cert != NULL) {
LOG((CLOG_INFO "server certificate")); LOG((CLOG_DEBUG "checking ssl certificate"));
line = X509_NAME_oneline(X509_get_subject_name(cert), 0, 0); line = X509_NAME_oneline(X509_get_subject_name(cert), 0, 0);
LOG((CLOG_INFO "subject: %s", line)); LOG((CLOG_INFO "ssl certificate: %s", line));
OPENSSL_free(line); OPENSSL_free(line);
X509_free(cert); X509_free(cert);
} }
else { else {
LOG((CLOG_INFO "no certificates")); LOG((CLOG_ERR "could not find ssl certificate"));
} }
} }
bool bool
SecureSocket::checkResult(int n) SecureSocket::checkResult(int n, bool canThrow)
{ {
bool retry = false;
int errorCode = SSL_get_error(m_ssl->m_ssl, n); int errorCode = SSL_get_error(m_ssl->m_ssl, n);
switch (errorCode) { switch (errorCode) {
case SSL_ERROR_NONE: case SSL_ERROR_NONE:
// the TLS/SSL I/O operation completed return false;
break;
case SSL_ERROR_ZERO_RETURN: case SSL_ERROR_ZERO_RETURN:
// the TLS/SSL connection has been closed LOG((CLOG_WARN "secure socket error: SSL_ERROR_ZERO_RETURN"));
LOG((CLOG_DEBUG2 "SSL_ERROR_ZERO_RETURN"));
break; break;
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
LOG((CLOG_DEBUG2 "secure socket error: SSL_ERROR_WANT_READ")); LOG((CLOG_WARN "secure socket error: SSL_ERROR_WANT_READ"));
retry = true;
break; break;
case SSL_ERROR_WANT_WRITE: case SSL_ERROR_WANT_WRITE:
LOG((CLOG_DEBUG2 "secure socket error: SSL_ERROR_WANT_WRITE")); LOG((CLOG_WARN "secure socket error: SSL_ERROR_WANT_WRITE"));
retry = true;
break; break;
case SSL_ERROR_WANT_CONNECT: case SSL_ERROR_WANT_CONNECT:
LOG((CLOG_DEBUG2 "secure socket error: SSL_ERROR_WANT_CONNECT")); LOG((CLOG_WARN "secure socket error: SSL_ERROR_WANT_CONNECT"));
retry = true;
break; break;
case SSL_ERROR_WANT_ACCEPT: case SSL_ERROR_WANT_ACCEPT:
LOG((CLOG_DEBUG2 "secure socket error: SSL_ERROR_WANT_ACCEPT")); LOG((CLOG_WARN "secure socket error: SSL_ERROR_WANT_ACCEPT"));
retry = true;
break; break;
case SSL_ERROR_SYSCALL: case SSL_ERROR_SYSCALL:
// some I/O error occurred LOG((CLOG_WARN "secure socket error: SSL_ERROR_SYSCALL"));
throwError("Secure socket syscall error");
break; break;
case SSL_ERROR_SSL: case SSL_ERROR_SSL:
// a failure in the SSL library occurred LOG((CLOG_WARN "secure socket error: SSL_ERROR_SSL"));
LOG((CLOG_DEBUG2 "SSL_ERROR_SSL"));
sendEvent(getEvents()->forISocket().disconnected());
sendEvent(getEvents()->forIStream().inputShutdown());
showError();
retry = true;
break; break;
default: default:
// possible cases: LOG((CLOG_WARN "secure socket error: unknown"));
// SSL_ERROR_WANT_X509_LOOKUP
showError();
} }
return retry; if (canThrow) {
} sendEvent(getEvents()->forISocket().disconnected());
sendEvent(getEvents()->forIStream().inputShutdown());
void throwError("secure socket failed");
SecureSocket::showError()
{
if (getError()) {
LOG((CLOG_ERR "secure socket error: %s", m_error));
} }
return false;
} }
void void
SecureSocket::throwError(const char* reason) SecureSocket::throwError(const char* reason)
{ {
if (getError()) { String error = getError();
if (error.empty()) {
throw XSocket(reason);
}
else {
throw XSocket(synergy::string::sprintf( throw XSocket(synergy::string::sprintf(
"%s: %s", reason, m_error)); "%s: %s", reason, getError().c_str()));
} }
} }
bool String
SecureSocket::getError() SecureSocket::getError()
{ {
unsigned long e = ERR_get_error(); unsigned long e = ERR_get_error();
bool errorUpdated = false;
if (e != 0) { if (e != 0) {
ERR_error_string_n(e, m_error, MAX_ERROR_SIZE); char error[MAX_ERROR_SIZE];
errorUpdated = true; ERR_error_string_n(e, error, MAX_ERROR_SIZE);
return error;
} }
else { else {
LOG((CLOG_DEBUG2 "can not detect any error in secure socket")); return "";
} }
return errorUpdated;
} }
ISocketMultiplexerJob* ISocketMultiplexerJob*

6
src/lib/plugin/ns/SecureSocket.h
View File

@ -58,10 +58,9 @@ private:
bool secureAccept(int s); bool secureAccept(int s);
bool secureConnect(int s); bool secureConnect(int s);
void showCertificate(); void showCertificate();
bool checkResult(int n); bool checkResult(int n, bool canThrow);
void showError();
void throwError(const char* reason); void throwError(const char* reason);
bool getError(); String getError();
ISocketMultiplexerJob* ISocketMultiplexerJob*
serviceConnect(ISocketMultiplexerJob*, serviceConnect(ISocketMultiplexerJob*,
@ -74,5 +73,4 @@ private:
private: private:
Ssl* m_ssl; Ssl* m_ssl;
bool m_secureReady; bool m_secureReady;
char* m_error;
}; };