Adding upstream version 1.32.0.upstream/1.32.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 3 insertions, 210 deletions

diff --git a/aclk/legacy/aclk_common.c b/aclk/legacy/aclk_common.c
index 96f955451..7f8368e44 100644
--- a/aclk/legacy/aclk_common.c
+++ b/aclk/legacy/aclk_common.c
@@ -1,201 +1,18 @@
 #include "aclk_common.h"
 
-#include "../../daemon/common.h"
+#include "daemon/common.h"
 
 #ifdef ENABLE_ACLK
 #include <libwebsockets.h>
 #endif
 
-netdata_mutex_t aclk_shared_state_mutex = NETDATA_MUTEX_INITIALIZER;
+netdata_mutex_t legacy_aclk_shared_state_mutex = NETDATA_MUTEX_INITIALIZER;
 
-int aclk_disable_runtime = 0;
-int aclk_kill_link = 0;
-
-struct aclk_shared_state aclk_shared_state = {
+struct legacy_aclk_shared_state legacy_aclk_shared_state = {
     .version_neg = 0,
     .version_neg_wait_till = 0
 };
 
-struct {
-    ACLK_PROXY_TYPE type;
-    const char *url_str;
-} supported_proxy_types[] = {
-    { .type = PROXY_TYPE_SOCKS5,   .url_str = "socks5"  ACLK_PROXY_PROTO_ADDR_SEPARATOR },
-    { .type = PROXY_TYPE_SOCKS5,   .url_str = "socks5h" ACLK_PROXY_PROTO_ADDR_SEPARATOR },
-    { .type = PROXY_TYPE_HTTP,     .url_str = "http"    ACLK_PROXY_PROTO_ADDR_SEPARATOR },
-    { .type = PROXY_TYPE_UNKNOWN,  .url_str = NULL                                      },
-};
-
-const char *aclk_proxy_type_to_s(ACLK_PROXY_TYPE *type)
-{
-    switch (*type) {
-        case PROXY_DISABLED:
-            return "disabled";
-        case PROXY_TYPE_HTTP:
-            return "HTTP";
-        case PROXY_TYPE_SOCKS5:
-            return "SOCKS";
-        default:
-            return "Unknown";
-    }
-}
-
-static inline ACLK_PROXY_TYPE aclk_find_proxy(const char *string)
-{
-    int i = 0;
-    while (supported_proxy_types[i].url_str) {
-        if (!strncmp(supported_proxy_types[i].url_str, string, strlen(supported_proxy_types[i].url_str)))
-            return supported_proxy_types[i].type;
-        i++;
-    }
-    return PROXY_TYPE_UNKNOWN;
-}
-
-ACLK_PROXY_TYPE aclk_verify_proxy(const char *string)
-{
-    if (!string)
-        return PROXY_TYPE_UNKNOWN;
-
-    while (*string == 0x20 && *string!=0)   // Help coverity (compiler will remove)
-        string++;
-
-    if (!*string)
-        return PROXY_TYPE_UNKNOWN;
-
-    return aclk_find_proxy(string);
-}
-
-// helper function to censor user&password
-// for logging purposes
-void safe_log_proxy_censor(char *proxy)
-{
-    size_t length = strlen(proxy);
-    char *auth = proxy + length - 1;
-    char *cur;
-
-    while ((auth >= proxy) && (*auth != '@'))
-        auth--;
-
-    //if not found or @ is first char do nothing
-    if (auth <= proxy)
-        return;
-
-    cur = strstr(proxy, ACLK_PROXY_PROTO_ADDR_SEPARATOR);
-    if (!cur)
-        cur = proxy;
-    else
-        cur += strlen(ACLK_PROXY_PROTO_ADDR_SEPARATOR);
-
-    while (cur < auth) {
-        *cur = 'X';
-        cur++;
-    }
-}
-
-static inline void safe_log_proxy_error(char *str, const char *proxy)
-{
-    char *log = strdupz(proxy);
-    safe_log_proxy_censor(log);
-    error("%s Provided Value:\"%s\"", str, log);
-    freez(log);
-}
-
-static inline int check_socks_environment(const char **proxy)
-{
-    char *tmp = getenv("socks_proxy");
-
-    if (!tmp)
-        return 1;
-
-    if (aclk_verify_proxy(tmp) == PROXY_TYPE_SOCKS5) {
-        *proxy = tmp;
-        return 0;
-    }
-
-    safe_log_proxy_error(
-        "Environment var \"socks_proxy\" defined but of unknown format. Supported syntax: \"socks5[h]://[user:pass@]host:ip\".",
-        tmp);
-    return 1;
-}
-
-static inline int check_http_environment(const char **proxy)
-{
-    char *tmp = getenv("http_proxy");
-
-    if (!tmp)
-        return 1;
-
-    if (aclk_verify_proxy(tmp) == PROXY_TYPE_HTTP) {
-        *proxy = tmp;
-        return 0;
-    }
-
-    safe_log_proxy_error(
-        "Environment var \"http_proxy\" defined but of unknown format. Supported syntax: \"http[s]://[user:pass@]host:ip\".",
-        tmp);
-    return 1;
-}
-
-const char *aclk_lws_wss_get_proxy_setting(ACLK_PROXY_TYPE *type)
-{
-    const char *proxy = config_get(CONFIG_SECTION_CLOUD, ACLK_PROXY_CONFIG_VAR, ACLK_PROXY_ENV);
-    *type = PROXY_DISABLED;
-
-    if (strcmp(proxy, "none") == 0)
-        return proxy;
-
-    if (strcmp(proxy, ACLK_PROXY_ENV) == 0) {
-        if (check_socks_environment(&proxy) == 0) {
-#ifdef LWS_WITH_SOCKS5
-            *type = PROXY_TYPE_SOCKS5;
-            return proxy;
-#else
-            safe_log_proxy_error("socks_proxy environment variable set to use SOCKS5 proxy "
-                "but Libwebsockets used doesn't have SOCKS5 support built in. "
-                "Ignoring and checking for other options.",
-                proxy);
-#endif
-        }
-        if (check_http_environment(&proxy) == 0)
-            *type = PROXY_TYPE_HTTP;
-        return proxy;
-    }
-
-    *type = aclk_verify_proxy(proxy);
-#ifndef LWS_WITH_SOCKS5
-    if (*type == PROXY_TYPE_SOCKS5) {
-        safe_log_proxy_error(
-            "Config var \"" ACLK_PROXY_CONFIG_VAR
-            "\" set to use SOCKS5 proxy but Libwebsockets used is built without support for SOCKS proxy. ACLK will be disabled.",
-            proxy);
-    }
-#endif
-    if (*type == PROXY_TYPE_UNKNOWN) {
-        *type = PROXY_DISABLED;
-        safe_log_proxy_error(
-            "Config var \"" ACLK_PROXY_CONFIG_VAR
-            "\" defined but of unknown format. Supported syntax: \"socks5[h]://[user:pass@]host:ip\".",
-            proxy);
-    }
-
-    return proxy;
-}
-
-// helper function to read settings only once (static)
-// as claiming, challenge/response and ACLK
-// read the same thing, no need to parse again
-const char *aclk_get_proxy(ACLK_PROXY_TYPE *type)
-{
-    static const char *proxy = NULL;
-    static ACLK_PROXY_TYPE proxy_type = PROXY_NOT_SET;
-
-    if (proxy_type == PROXY_NOT_SET)
-        proxy = aclk_lws_wss_get_proxy_setting(&proxy_type);
-
-    *type = proxy_type;
-    return proxy;
-}
-
 int aclk_decode_base_url(char *url, char **aclk_hostname, int *aclk_port)
 {
     int pos = 0;
@@ -234,27 +51,3 @@ int aclk_decode_base_url(char *url, char **aclk_hostname, int *aclk_port)
     info("Setting ACLK target host=%s port=%d from %s", *aclk_hostname, *aclk_port, url);
     return 0;
 }
-
-struct label *add_aclk_host_labels(struct label *label) {
-#ifdef ENABLE_ACLK
-    ACLK_PROXY_TYPE aclk_proxy;
-    char *proxy_str;
-    aclk_get_proxy(&aclk_proxy);
-
-    switch(aclk_proxy) {
-        case PROXY_TYPE_SOCKS5:
-            proxy_str = "SOCKS5";
-            break;
-        case PROXY_TYPE_HTTP:
-            proxy_str = "HTTP";
-            break;
-        default:
-            proxy_str = "none";
-            break;
-    }
-    label = add_label_to_list(label, "_aclk_impl", "Legacy", LABEL_SOURCE_AUTO);
-    return add_label_to_list(label, "_aclk_proxy", proxy_str, LABEL_SOURCE_AUTO);
-#else
-    return label;
-#endif
-}