diff options
| author | Costa Tsaousis <costa@netdata.cloud> | 2022-10-05 14:59:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-05 14:59:25 +0300 |
| commit | ecbf10c87ca0d4296ecb0cf8e485b68a15ba9613 (patch) | |
| tree | abab301b989aa1dbc198b6a6597d7f86804bfae3 | |
| parent | 8fc3b351a2e7fc96eced8f924de2e9cec9842128 (diff) | |
fix bad merge (#13764)
* fix bad merge
* fix for ssl_security_cert
| -rw-r--r-- | daemon/main.c | 4 | ||||
| -rw-r--r-- | libnetdata/socket/security.c | 10 | ||||
| -rw-r--r-- | libnetdata/socket/security.h | 4 | ||||
| -rw-r--r-- | web/api/web_api_v1.c | 5 |
4 files changed, 11 insertions, 12 deletions
diff --git a/daemon/main.c b/daemon/main.c index 0ac0942292..a2e208811d 100644 --- a/daemon/main.c +++ b/daemon/main.c @@ -379,10 +379,10 @@ int help(int exitcode) { static void security_init(){ char filename[FILENAME_MAX + 1]; snprintfz(filename, FILENAME_MAX, "%s/ssl/key.pem",netdata_configured_user_config_dir); - ssl_security_key = config_get(CONFIG_SECTION_WEB, "ssl key", filename); + netdata_ssl_security_key = config_get(CONFIG_SECTION_WEB, "ssl key", filename); snprintfz(filename, FILENAME_MAX, "%s/ssl/cert.pem",netdata_configured_user_config_dir); - ssl_security_cert = config_get(CONFIG_SECTION_WEB, "ssl certificate", filename); + netdata_ssl_security_cert = config_get(CONFIG_SECTION_WEB, "ssl certificate", filename); tls_version = config_get(CONFIG_SECTION_WEB, "tls version", "1.3"); tls_ciphers = config_get(CONFIG_SECTION_WEB, "tls ciphers", "none"); diff --git a/libnetdata/socket/security.c b/libnetdata/socket/security.c index f229b7aa36..3ba964ee70 100644 --- a/libnetdata/socket/security.c +++ b/libnetdata/socket/security.c @@ -5,8 +5,8 @@ SSL_CTX *netdata_ssl_exporting_ctx =NULL; SSL_CTX *netdata_ssl_client_ctx =NULL; SSL_CTX *netdata_ssl_srv_ctx =NULL; -const char *ssl_security_key =NULL; -const char *ssl_security_cert =NULL; +const char *netdata_ssl_security_key =NULL; +const char *netdata_ssl_security_cert =NULL; const char *tls_version=NULL; const char *tls_ciphers=NULL; int netdata_ssl_validate_server = NETDATA_SSL_VALID_CERTIFICATE; @@ -169,11 +169,11 @@ static SSL_CTX * security_initialize_openssl_server() { return NULL; } - SSL_CTX_use_certificate_chain_file(ctx, ssl_security_cert); + SSL_CTX_use_certificate_chain_file(ctx, netdata_ssl_security_cert); #endif security_openssl_common_options(ctx, 0); - SSL_CTX_use_PrivateKey_file(ctx, ssl_security_key,SSL_FILETYPE_PEM); + SSL_CTX_use_PrivateKey_file(ctx, netdata_ssl_security_key,SSL_FILETYPE_PEM); if (!SSL_CTX_check_private_key(ctx)) { ERR_error_string_n(ERR_get_error(),lerror,sizeof(lerror)); @@ -207,7 +207,7 @@ void security_start_ssl(int selector) { switch (selector) { case NETDATA_SSL_CONTEXT_SERVER: { struct stat statbuf; - if (stat(ssl_security_key, &statbuf) || stat(ssl_security_cert, &statbuf)) { + if (stat(netdata_ssl_security_key, &statbuf) || stat(netdata_ssl_security_cert, &statbuf)) { info("To use encryption it is necessary to set \"ssl certificate\" and \"ssl key\" in [web] !\n"); return; } diff --git a/libnetdata/socket/security.h b/libnetdata/socket/security.h index a9b41fac46..5c9842e07a 100644 --- a/libnetdata/socket/security.h +++ b/libnetdata/socket/security.h @@ -45,8 +45,8 @@ struct netdata_ssl{ extern SSL_CTX *netdata_ssl_exporting_ctx; extern SSL_CTX *netdata_ssl_client_ctx; extern SSL_CTX *netdata_ssl_srv_ctx; -extern const char *ssl_security_key; -extern const char *ssl_security_cert; +extern const char *netdata_ssl_security_key; +extern const char *netdata_ssl_security_cert; extern const char *tls_version; extern const char *tls_ciphers; extern int netdata_ssl_validate_server; diff --git a/web/api/web_api_v1.c b/web/api/web_api_v1.c index a7cf5d6223..ce4f196be9 100644 --- a/web/api/web_api_v1.c +++ b/web/api/web_api_v1.c @@ -1670,9 +1670,8 @@ static struct api_command { { "allmetrics", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_allmetrics }, #if defined(ENABLE_ML) - { "anomaly_events", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_anomaly_events }, - { "anomaly_event_info", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_anomaly_event_info }, - { "ml_info", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_ml_info }, + { "ml_info", 0, WEB_CLIENT_ACL_DASHBOARD, web_client_api_request_v1_ml_info }, + { "ml_models", 0, WEB_CLIENT_ACL_DASHBOARD, web_client_api_request_v1_ml_models }, #endif { "manage/health", 0, WEB_CLIENT_ACL_MGMT | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_mgmt_health }, |