summaryrefslogtreecommitdiffstats
path: root/aclk/https_client.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-01 06:15:11 +0000
commit483926a283e118590da3f9ecfa75a8a4d62143ce (patch)
treecb77052778df9a128a8cd3ff5bf7645322a13bc5 /aclk/https_client.c
parentReleasing debian version 1.31.0-4. (diff)
downloadnetdata-483926a283e118590da3f9ecfa75a8a4d62143ce.tar.xz
netdata-483926a283e118590da3f9ecfa75a8a4d62143ce.zip
Merging upstream version 1.32.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'aclk/https_client.c')
-rw-r--r--aclk/https_client.c46
1 files changed, 41 insertions, 5 deletions
diff --git a/aclk/https_client.c b/aclk/https_client.c
index 907f512ba..470c3fdf3 100644
--- a/aclk/https_client.c
+++ b/aclk/https_client.c
@@ -4,7 +4,7 @@
#include "https_client.h"
-#include "../mqtt_websockets/c-rbuf/include/ringbuffer.h"
+#include "mqtt_websockets/c-rbuf/include/ringbuffer.h"
enum http_parse_state {
HTTP_PARSE_INITIAL = 0,
@@ -47,7 +47,7 @@ static inline void http_parse_ctx_clear(http_parse_ctx *ctx) {
#define RESP_PROTO "HTTP/1.1 "
#define HTTP_KEYVAL_SEPARATOR ": "
#define HTTP_HDR_BUFFER_SIZE 256
-#define PORT_STR_MAX_BYTES 7
+#define PORT_STR_MAX_BYTES 12
static void process_http_hdr(http_parse_ctx *parse_ctx, const char *key, const char *val)
{
@@ -303,7 +303,8 @@ static int read_parse_response(https_req_ctx_t *ctx) {
error("Poll timed out");
return 2;
}
- continue;
+ if (!ctx->ssl_ctx)
+ continue;
}
ctx->poll_fd.events = 0;
@@ -421,6 +422,35 @@ err_exit:
return rc;
}
+static int cert_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
+{
+ X509 *err_cert;
+ int err, depth;
+ char *err_str;
+
+ if (!preverify_ok) {
+ err = X509_STORE_CTX_get_error(ctx);
+ depth = X509_STORE_CTX_get_error_depth(ctx);
+ err_cert = X509_STORE_CTX_get_current_cert(ctx);
+ err_str = X509_NAME_oneline(X509_get_subject_name(err_cert), NULL, 0);
+
+ error("Cert Chain verify error:num=%d:%s:depth=%d:%s", err,
+ X509_verify_cert_error_string(err), depth, err_str);
+
+ free(err_str);
+ }
+
+#ifdef ACLK_SSL_ALLOW_SELF_SIGNED
+ if (!preverify_ok && err == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
+ {
+ preverify_ok = 1;
+ error("Self Signed Certificate Accepted as the agent was built with ACLK_SSL_ALLOW_SELF_SIGNED");
+ }
+#endif
+
+ return preverify_ok;
+}
+
int https_request(https_req_t *request, https_req_response_t *response) {
int rc = 1, ret;
char connect_port_str[PORT_STR_MAX_BYTES];
@@ -438,7 +468,7 @@ int https_request(https_req_t *request, https_req_response_t *response) {
goto exit_req_ctx;
}
- snprintf(connect_port_str, PORT_STR_MAX_BYTES, "%d", connect_port);
+ snprintfz(connect_port_str, PORT_STR_MAX_BYTES, "%d", connect_port);
ctx->sock = connect_to_this_ip46(IPPROTO_TCP, SOCK_STREAM, connect_host, 0, connect_port_str, &timeout);
if (ctx->sock < 0) {
@@ -480,6 +510,12 @@ int https_request(https_req_t *request, https_req_response_t *response) {
goto exit_sock;
}
+ if (!SSL_CTX_set_default_verify_paths(ctx->ssl_ctx)) {
+ error("Error setting default verify paths");
+ goto exit_CTX;
+ }
+ SSL_CTX_set_verify(ctx->ssl_ctx, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, cert_verify_callback);
+
ctx->ssl = SSL_new(ctx->ssl_ctx);
if (ctx->ssl==NULL) {
error("Cannot allocate SSL");
@@ -570,7 +606,7 @@ static int parse_host_port(url_t *url) {
error(URL_PARSER_LOG_PREFIX ": specified but no port number");
return 1;
}
- if (port_len > 5 /* MAX port lenght is 5digit long in decimal */) {
+ if (port_len > 5 /* MAX port length is 5digit long in decimal */) {
error(URL_PARSER_LOG_PREFIX "port # is too long");
return 1;
}