summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--aclk/aclk_common.c2
-rw-r--r--aclk/aclk_lws_https_client.c1
-rw-r--r--aclk/agent_cloud_link.c25
-rw-r--r--claim/claim.c33
-rw-r--r--libnetdata/libnetdata.c38
-rw-r--r--libnetdata/libnetdata.h1
6 files changed, 51 insertions, 49 deletions
diff --git a/aclk/aclk_common.c b/aclk/aclk_common.c
index ccd527f101..9f64567b18 100644
--- a/aclk/aclk_common.c
+++ b/aclk/aclk_common.c
@@ -42,7 +42,7 @@ ACLK_PROXY_TYPE aclk_verify_proxy(const char *string)
if (!string)
return PROXY_TYPE_UNKNOWN;
- while (*string == 0x20)
+ while (*string == 0x20 && *string!=0) // Help coverity (compiler will remove)
string++;
if (!*string)
diff --git a/aclk/aclk_lws_https_client.c b/aclk/aclk_lws_https_client.c
index 500292ac5d..cd17625232 100644
--- a/aclk/aclk_lws_https_client.c
+++ b/aclk/aclk_lws_https_client.c
@@ -176,6 +176,7 @@ int aclk_send_https_request(char *method, char *host, char *port, char *url, cha
context = lws_create_context(&info);
if (!context) {
error("Error creating LWS context");
+ freez(data);
return 1;
}
diff --git a/aclk/agent_cloud_link.c b/aclk/agent_cloud_link.c
index a4e2896e4f..1adaf6bcce 100644
--- a/aclk/agent_cloud_link.c
+++ b/aclk/agent_cloud_link.c
@@ -146,29 +146,16 @@ int cloud_to_agent_parse(JSON_ENTRY *e)
static RSA *aclk_private_key = NULL;
static int create_private_key()
{
- char filename[FILENAME_MAX + 1]; struct stat statbuf;
+ char filename[FILENAME_MAX + 1];
snprintfz(filename, FILENAME_MAX, "%s/claim.d/private.pem", netdata_configured_user_config_dir);
- if (lstat(filename, &statbuf) != 0) {
- error("Claimed agent cannot establish ACLK - private key not found '%s' failed.", filename);
+ long bytes_read;
+ char *private_key = read_by_filename(filename, &bytes_read);
+ if (!private_key) {
+ error("Claimed agent cannot establish ACLK - unable to load private key '%s' failed.", filename);
return 1;
}
- if (unlikely(statbuf.st_size == 0)) {
- info("Claimed agent cannot establish ACLK - private key '%s' is empty.", filename);
- return 1;
- }
-
- FILE *f = fopen(filename, "rt");
- if (unlikely(f == NULL)) {
- error("Claimed agent cannot establish ACLK - unable to open private key '%s'.", filename);
- return 1;
- }
-
- char *private_key = callocz(1, statbuf.st_size + 1);
- size_t bytes_read = fread(private_key, 1, statbuf.st_size, f);
- private_key[bytes_read] = 0;
- debug(D_ACLK, "Claimed agent loaded private key len=%zu bytes", bytes_read);
- fclose(f);
+ debug(D_ACLK, "Claimed agent loaded private key len=%ld bytes", bytes_read);
BIO *key_bio = BIO_new_mem_buf(private_key, -1);
if (key_bio==NULL) {
diff --git a/claim/claim.c b/claim/claim.c
index f3b7ff07e8..7c729988e8 100644
--- a/claim/claim.c
+++ b/claim/claim.c
@@ -51,15 +51,7 @@ void claim_agent(char *claiming_arguments)
char command_buffer[CLAIMING_COMMAND_LENGTH + 1];
FILE *fp;
- char *cloud_base_hostname = NULL; // Initializers are over-written but prevent gcc complaining about clobbering.
- char *cloud_base_port = NULL;
char *cloud_base_url = config_get(CONFIG_SECTION_CLOUD, "cloud base url", DEFAULT_CLOUD_BASE_URL);
- if( aclk_decode_base_url(cloud_base_url, &cloud_base_hostname, &cloud_base_port))
- {
- error("Configuration error - cannot decode \"cloud base url\"");
- return;
- }
-
const char *proxy_str;
ACLK_PROXY_TYPE proxy_type;
char proxy_flag[CLAIMING_PROXY_LENGTH] = "-noproxy";
@@ -120,31 +112,14 @@ void load_claiming_state(void)
}
char filename[FILENAME_MAX + 1];
- struct stat statbuf;
-
snprintfz(filename, FILENAME_MAX, "%s/claim.d/claimed_id", netdata_configured_user_config_dir);
- // check if the file exists
- if (lstat(filename, &statbuf) != 0) {
- info("lstat on File '%s' failed reason=\"%s\". Setting state to AGENT_UNCLAIMED.", filename, strerror(errno));
- return;
- }
- if (unlikely(statbuf.st_size == 0)) {
- info("File '%s' has no contents. Setting state to AGENT_UNCLAIMED.", filename);
- return;
- }
-
- FILE *f = fopen(filename, "rt");
- if (unlikely(f == NULL)) {
- error("File '%s' cannot be opened. Setting state to AGENT_UNCLAIMED.", filename);
+ long bytes_read;
+ claimed_id = read_by_filename(filename, &bytes_read);
+ if (!claimed_id) {
+ info("Unable to load '%s', setting state to AGENT_UNCLAIMED", filename);
return;
}
- claimed_id = callocz(1, statbuf.st_size + 1);
- size_t bytes_read = fread(claimed_id, 1, statbuf.st_size, f);
- claimed_id[bytes_read] = 0;
info("File '%s' was found. Setting state to AGENT_CLAIMED.", filename);
- fclose(f);
-
- snprintfz(filename, FILENAME_MAX, "%s/claim.d/private.pem", netdata_configured_user_config_dir);
}
diff --git a/libnetdata/libnetdata.c b/libnetdata/libnetdata.c
index 70b656d838..c9b7ab1983 100644
--- a/libnetdata/libnetdata.c
+++ b/libnetdata/libnetdata.c
@@ -1453,3 +1453,41 @@ void recursive_config_double_dir_load(const char *user_path, const char *stock_p
freez(udir);
freez(sdir);
}
+
+// Returns the number of bytes read from the file if file_size is not NULL.
+// The actual buffer has an extra byte set to zero (not included in the count).
+char *read_by_filename(char *filename, long *file_size)
+{
+ FILE *f = fopen(filename, "r");
+ if (!f)
+ return NULL;
+ if (fseek(f, 0, SEEK_END) < 0) {
+ fclose(f);
+ return NULL;
+ }
+ long size = ftell(f);
+ if (size <= 0 || fseek(f, 0, SEEK_END) < 0) {
+ fclose(f);
+ return NULL;
+ }
+ char *contents = callocz(size + 1, 1);
+ if (!contents) {
+ fclose(f);
+ return NULL;
+ }
+ if (fseek(f, 0, SEEK_SET) < 0) {
+ fclose(f);
+ freez(contents);
+ return NULL;
+ }
+ size_t res = fread(contents, 1, size, f);
+ if ( res != (size_t)size) {
+ freez(contents);
+ fclose(f);
+ return NULL;
+ }
+ fclose(f);
+ if (file_size)
+ *file_size = size;
+ return contents;
+}
diff --git a/libnetdata/libnetdata.h b/libnetdata/libnetdata.h
index b7fa9d5aba..45ac6e81bf 100644
--- a/libnetdata/libnetdata.h
+++ b/libnetdata/libnetdata.h
@@ -278,6 +278,7 @@ extern void recursive_config_double_dir_load(
, void *data
, size_t depth
);
+extern char *read_by_filename(char *filename, long *file_size);
/* fix for alpine linux */
#ifndef RUSAGE_THREAD
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 21:02:37 +0000