archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-13 09:11:50 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Misc SSL improvements" ()

Browse source 
Revert "Misc SSL improvements ()"

This reverts commit f4d017ccf7.
This commit is contained in:
Emmanuel Vasilakis 2023-01-25 19:06:06 +02:00 • committed by GitHub
parent 597f08dee6
commit bf38a22f32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 82 deletions
libnetdata/socket
socket.c
web/server
static
static-threaded.c
web_client.c

27
libnetdata/socket/socket.c
View file

@ -923,36 +923,53 @@ int connect_to_one_of_urls(const char *destination, int default_port, struct tim
ssize_t netdata_ssl_read(SSL *ssl, void *buf, size_t num) {
error_limit_static_thread_var(erl, 1, 0);
int bytes, err;
int bytes, err, retries = 0;
//do {
bytes = SSL_read(ssl, buf, (int)num);
err = SSL_get_error(ssl, bytes);
retries++;
//} while (bytes <= 0 && err == SSL_ERROR_WANT_READ);
if(unlikely(bytes <= 0)) {
if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
bytes = 0;
} else
error_limit(&erl, "SSL_write() returned %d bytes, SSL error %d", bytes, err);
error("SSL_write() returned %d bytes, SSL error %d", bytes, err);
}
if(retries > 1)
error_limit(&erl, "SSL_read() retried %d times", retries);
return bytes;
}
ssize_t netdata_ssl_write(SSL *ssl, const void *buf, size_t num) {
error_limit_static_thread_var(erl, 1, 0);
int bytes, err;
int bytes, err, retries = 0;
size_t total = 0;
bytes = SSL_write(ssl, (uint8_t *)buf, (int)num);
//do {
bytes = SSL_write(ssl, (uint8_t *)buf + total, (int)(num - total));
err = SSL_get_error(ssl, bytes);
retries++;
if(bytes > 0)
total += bytes;
//} while ((bytes <= 0 && (err == SSL_ERROR_WANT_WRITE)) || (bytes > 0 && total < num));
if(unlikely(bytes <= 0)) {
if (err == SSL_ERROR_WANT_WRITE || err == SSL_ERROR_WANT_READ) {
bytes = 0;
} else
error_limit(&erl, "SSL_write() returned %d bytes, SSL error %d", bytes, err);
error("SSL_write() returned %d bytes, SSL error %d", bytes, err);
}
if(retries > 1)
error_limit(&erl, "SSL_write() retried %d times", retries);
return bytes;
}
#endif

109
web/server/static/static-threaded.c
View file

@ -293,73 +293,62 @@ static int web_server_rcv_callback(POLLINFO *pi, short int *events) {
struct web_client *w = (struct web_client *)pi->data;
int fd = pi->fd;
ssize_t bytes;
bytes = web_client_receive(w);
if (likely(bytes > 0)) {
debug(D_WEB_CLIENT, "%llu: processing received data on fd %d.", w->id, fd);
worker_is_idle();
worker_is_busy(WORKER_JOB_PROCESS);
web_client_process_request(w);
if (unlikely(w->mode == WEB_CLIENT_MODE_STREAM)) {
web_client_send(w);
}
else if(unlikely(w->mode == WEB_CLIENT_MODE_FILECOPY)) {
if(w->pollinfo_filecopy_slot == 0) {
debug(D_WEB_CLIENT, "%llu: FILECOPY DETECTED ON FD %d", w->id, pi->fd);
if (unlikely(w->ifd != -1 && w->ifd != w->ofd && w->ifd != fd)) {
// add a new socket to poll_events, with the same
debug(D_WEB_CLIENT, "%llu: CREATING FILECOPY SLOT ON FD %d", w->id, pi->fd);
POLLINFO *fpi = poll_add_fd(
pi->p
, w->ifd
, pi->port_acl
, 0
, POLLINFO_FLAG_CLIENT_SOCKET
, "FILENAME"
, ""
, ""
, web_server_file_add_callback
, web_server_file_del_callback
, web_server_file_read_callback
, web_server_file_write_callback
, (void *) w
);
if(fpi)
w->pollinfo_filecopy_slot = fpi->slot;
else {
error("Failed to add filecopy fd. Closing client.");
ret = -1;
goto cleanup;
}
}
}
}
else {
if(unlikely(w->ifd == fd && web_client_has_wait_receive(w)))
*events |= POLLIN;
}
if(unlikely(w->ofd == fd && web_client_has_wait_send(w)))
*events |= POLLOUT;
}
else if(unlikely(bytes < 0)) {
if(unlikely(web_client_receive(w) < 0)) {
ret = -1;
goto cleanup;
}
else if (unlikely(bytes == 0)) {
debug(D_WEB_CLIENT, "%llu: processing received data on fd %d.", w->id, fd);
worker_is_idle();
worker_is_busy(WORKER_JOB_PROCESS);
web_client_process_request(w);
if (unlikely(w->mode == WEB_CLIENT_MODE_STREAM)) {
web_client_send(w);
}
else if(unlikely(w->mode == WEB_CLIENT_MODE_FILECOPY)) {
if(w->pollinfo_filecopy_slot == 0) {
debug(D_WEB_CLIENT, "%llu: FILECOPY DETECTED ON FD %d", w->id, pi->fd);
if (unlikely(w->ifd != -1 && w->ifd != w->ofd && w->ifd != fd)) {
// add a new socket to poll_events, with the same
debug(D_WEB_CLIENT, "%llu: CREATING FILECOPY SLOT ON FD %d", w->id, pi->fd);
POLLINFO *fpi = poll_add_fd(
pi->p
, w->ifd
, pi->port_acl
, 0
, POLLINFO_FLAG_CLIENT_SOCKET
, "FILENAME"
, ""
, ""
, web_server_file_add_callback
, web_server_file_del_callback
, web_server_file_read_callback
, web_server_file_write_callback
, (void *) w
);
if(fpi)
w->pollinfo_filecopy_slot = fpi->slot;
else {
error("Failed to add filecopy fd. Closing client.");
ret = -1;
goto cleanup;
}
}
}
}
else {
if(unlikely(w->ifd == fd && web_client_has_wait_receive(w)))
*events |= POLLIN;
if(unlikely(w->ofd == fd && web_client_has_wait_send(w)))
*events |= POLLOUT;
}
if(unlikely(w->ofd == fd && web_client_has_wait_send(w)))
*events |= POLLOUT;
ret = web_server_check_client_status(w);
cleanup:

18
web/server/web_client.c
View file

@ -38,18 +38,6 @@ static inline int web_client_crock_socket(struct web_client *w) {
return 0;
}
static inline void web_client_enable_wait_from_ssl(struct web_client *w, int bytes) {
int ssl_err = SSL_get_error(w->ssl.conn, bytes);
if (ssl_err == SSL_ERROR_WANT_READ)
web_client_enable_wait_receive(w);
else if (ssl_err == SSL_ERROR_WANT_WRITE)
web_client_enable_wait_send(w);
else if (ssl_err) {
web_client_disable_wait_receive(w);
web_client_disable_wait_send(w);
}
}
static inline int web_client_uncrock_socket(struct web_client *w) {
#ifdef TCP_CORK
if(likely(w->tcp_cork && w->ofd != -1)) {
@ -1069,7 +1057,6 @@ static inline ssize_t web_client_send_data(struct web_client *w,const void *buf,
if ( (!web_client_check_unix(w)) && (netdata_ssl_srv_ctx) ) {
if ( ( w->ssl.conn ) && ( !w->ssl.flags ) ){
bytes = netdata_ssl_write(w->ssl.conn, buf, len) ;
web_client_enable_wait_from_ssl(w, bytes);
} else {
bytes = send(w->ofd,buf, len , flags);
}
@ -1225,10 +1212,8 @@ static inline void web_client_send_http_header(struct web_client *w) {
ssize_t bytes;
#ifdef ENABLE_HTTPS
if ( (!web_client_check_unix(w)) && (netdata_ssl_srv_ctx) ) {
if ( ( w->ssl.conn ) && ( w->ssl.flags == NETDATA_SSL_HANDSHAKE_COMPLETE ) ) {
if ( ( w->ssl.conn ) && ( w->ssl.flags == NETDATA_SSL_HANDSHAKE_COMPLETE ) )
bytes = netdata_ssl_write(w->ssl.conn, buffer_tostring(w->response.header_output), buffer_strlen(w->response.header_output));
web_client_enable_wait_from_ssl(w, bytes);
}
else {
while((bytes = send(w->ofd, buffer_tostring(w->response.header_output), buffer_strlen(w->response.header_output), 0)) == -1) {
count++;
@ -1921,7 +1906,6 @@ ssize_t web_client_receive(struct web_client *w)
if ( (!web_client_check_unix(w)) && (netdata_ssl_srv_ctx) ) {
if ( ( w->ssl.conn ) && (!w->ssl.flags)) {
bytes = netdata_ssl_read(w->ssl.conn, &w->response.data->buffer[w->response.data->len], (size_t) (left - 1));
web_client_enable_wait_from_ssl(w, bytes);
}else {
bytes = recv(w->ifd, &w->response.data->buffer[w->response.data->len], (size_t) (left - 1), MSG_DONTWAIT);
}