Skip to content

Fix core when ssl is enabled #2180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wwbmmm merged 1 commit into from
Jun 25, 2023
Merged

Fix core when ssl is enabled #2180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions src/brpc/socket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,6 +1505,7 @@ X509* Socket::GetPeerCertificate() const {
if (ssl_state() != SSL_CONNECTED) {
return NULL;
}
BAIDU_SCOPED_LOCK(_ssl_session_mutex);
return SSL_get_peer_certificate(_ssl_session);
}

Expand Down Expand Up @@ -1815,11 +1816,15 @@ ssize_t Socket::DoWrite(WriteRequest* req) {
CHECK_EQ(SSL_CONNECTED, ssl_state());
if (_conn) {
// TODO: Separate SSL stuff from SocketConnection
BAIDU_SCOPED_LOCK(_ssl_session_mutex);
return _conn->CutMessageIntoSSLChannel(_ssl_session, data_list, ndata);
}
int ssl_error = 0;
ssize_t nw = butil::IOBuf::cut_multiple_into_SSL_channel(
_ssl_session, data_list, ndata, &ssl_error);
ssize_t nw = 0;
{
BAIDU_SCOPED_LOCK(_ssl_session_mutex);
nw = butil::IOBuf::cut_multiple_into_SSL_channel(_ssl_session, data_list, ndata, &ssl_error);
}
switch (ssl_error) {
case SSL_ERROR_NONE:
break;
Expand Down Expand Up @@ -1963,7 +1968,11 @@ ssize_t Socket::DoRead(size_t size_hint) {

CHECK_EQ(SSL_CONNECTED, ssl_state());
int ssl_error = 0;
ssize_t nr = _read_buf.append_from_SSL_channel(_ssl_session, &ssl_error, size_hint);
ssize_t nr = 0;
{
BAIDU_SCOPED_LOCK(_ssl_session_mutex);
nr = _read_buf.append_from_SSL_channel(_ssl_session, &ssl_error, size_hint);
}
switch (ssl_error) {
case SSL_ERROR_NONE: // `nr' > 0
break;
Expand Down
3 changes: 3 additions & 0 deletions src/brpc/socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,9 @@ friend void DereferenceSocket(Socket*);
AuthContext* _auth_context;

SSLState _ssl_state;
// SSL objects cannot be read and written at the same time.
// Use mutex to protect SSL objects when ssl_state is SSL_CONNECTED.
mutable butil::Mutex _ssl_session_mutex;
SSL* _ssl_session; // owner
std::shared_ptr<SocketSSLContext> _ssl_ctx;

Expand Down