Skip to content
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

YDB-966 tls incomplete transfer #1024

Merged
merged 4 commits into from
Jan 17, 2024
Merged

YDB-966 tls incomplete transfer #1024

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9797eae
YDB-966 tls incomplete transfer
StekPerepolnen Jan 16, 2024
594b60f
make SSL_get_error after each SSL_* operation
StekPerepolnen Jan 16, 2024
84586d5
added ProcessSslError method
StekPerepolnen Jan 16, 2024
7d5e83b
made ProcessSslResult method
StekPerepolnen Jan 16, 2024
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
84 changes: 24 additions & 60 deletions ydb/library/actors/http/http_proxy_sock_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,82 +192,46 @@ struct TSecureSocketImpl : TPlainSocketImpl, TSslHelpers {

void Flush() {}

ssize_t Send(const void* data, size_t size, bool& read, bool& write) {
ssize_t res = SSL_write(Ssl.Get(), data, size);
if (res < 0) {
res = SSL_get_error(Ssl.Get(), res);
switch(res) {
case SSL_ERROR_WANT_READ:
read = true;
return -EAGAIN;
case SSL_ERROR_WANT_WRITE:
write = true;
return -EAGAIN;
default:
return -EIO;
}
int ProcessSslResult(const int res, bool& read, bool& write) {
int err = SSL_get_error(Ssl.Get(), res); // SSL_get_error() must be used after each SSL_* operation
switch(err) {
case SSL_ERROR_NONE:
return res;
case SSL_ERROR_WANT_READ:
read = true;
return -EAGAIN;
case SSL_ERROR_WANT_WRITE:
write = true;
return -EAGAIN;
default:
return -EIO;
}
return res;
}

ssize_t Send(const void* data, size_t size, bool& read, bool& write) {
ERR_clear_error();
return ProcessSslResult(SSL_write(Ssl.Get(), data, size), read, write);
}

ssize_t Recv(void* data, size_t size, bool& read, bool& write) {
ssize_t res = SSL_read(Ssl.Get(), data, size);
if (res < 0) {
res = SSL_get_error(Ssl.Get(), res);
switch(res) {
case SSL_ERROR_WANT_READ:
read = true;
return -EAGAIN;
case SSL_ERROR_WANT_WRITE:
write = true;
return -EAGAIN;
default:
return -EIO;
}
}
return res;
ERR_clear_error();
return ProcessSslResult(SSL_read(Ssl.Get(), data, size), read, write);
}

int OnConnect(bool& read, bool& write) {
if (!Ssl) {
InitClientSsl();
}
int res = SSL_connect(Ssl.Get());
if (res <= 0) {
res = SSL_get_error(Ssl.Get(), res);
switch(res) {
case SSL_ERROR_WANT_READ:
read = true;
return -EAGAIN;
case SSL_ERROR_WANT_WRITE:
write = true;
return -EAGAIN;
default:
return -EIO;
}
}
return res;
ERR_clear_error();
return ProcessSslResult(SSL_connect(Ssl.Get()), read, write);
}

int OnAccept(std::shared_ptr<TPrivateEndpointInfo> endpoint, bool& read, bool& write) {
if (!Ssl) {
InitServerSsl(endpoint->SecureContext.Get());
}
int res = SSL_accept(Ssl.Get());
if (res <= 0) {
res = SSL_get_error(Ssl.Get(), res);
switch(res) {
case SSL_ERROR_WANT_READ:
read = true;
return -EAGAIN;
case SSL_ERROR_WANT_WRITE:
write = true;
return -EAGAIN;
default:
return -EIO;
}
}
return res;
ERR_clear_error();
return ProcessSslResult(SSL_accept(Ssl.Get()), read, write);
}
};

Expand Down
Loading