fix bad merge (#13764)
* fix bad merge * fix for ssl_security_cert
Costa Tsaousis committed
Oct 5, 2022 at 14:59 UTC
ecbf10c87ca0d4296ecb0cf8e485b68a15ba9613
4 files changed
+11
-12
daemon/main.c
+2
-2
@@ -379,10 +379,10 @@ int help(int exitcode) {
379
static void security_init(){
380
char filename[FILENAME_MAX + 1];
381
snprintfz(filename, FILENAME_MAX, "%s/ssl/key.pem",netdata_configured_user_config_dir);
382
- ssl_security_key = config_get(CONFIG_SECTION_WEB, "ssl key", filename);
382
+ netdata_ssl_security_key = config_get(CONFIG_SECTION_WEB, "ssl key", filename);
383
384
snprintfz(filename, FILENAME_MAX, "%s/ssl/cert.pem",netdata_configured_user_config_dir);
385
- ssl_security_cert = config_get(CONFIG_SECTION_WEB, "ssl certificate", filename);
385
+ netdata_ssl_security_cert = config_get(CONFIG_SECTION_WEB, "ssl certificate", filename);
386
387
tls_version = config_get(CONFIG_SECTION_WEB, "tls version", "1.3");
388
tls_ciphers = config_get(CONFIG_SECTION_WEB, "tls ciphers", "none");
libnetdata/socket/security.c
+5
-5
@@ -5,8 +5,8 @@
5
SSL_CTX *netdata_ssl_exporting_ctx =NULL;
6
SSL_CTX *netdata_ssl_client_ctx =NULL;
7
SSL_CTX *netdata_ssl_srv_ctx =NULL;
8
-const char *ssl_security_key =NULL;
9
-const char *ssl_security_cert =NULL;
8
+const char *netdata_ssl_security_key =NULL;
9
+const char *netdata_ssl_security_cert =NULL;
10
const char *tls_version=NULL;
11
const char *tls_ciphers=NULL;
12
int netdata_ssl_validate_server = NETDATA_SSL_VALID_CERTIFICATE;
@@ -169,11 +169,11 @@ static SSL_CTX * security_initialize_openssl_server() {
169
return NULL;
170
}
171
172
- SSL_CTX_use_certificate_chain_file(ctx, ssl_security_cert);
172
+ SSL_CTX_use_certificate_chain_file(ctx, netdata_ssl_security_cert);
173
#endif
174
security_openssl_common_options(ctx, 0);
175
176
- SSL_CTX_use_PrivateKey_file(ctx, ssl_security_key,SSL_FILETYPE_PEM);
176
+ SSL_CTX_use_PrivateKey_file(ctx, netdata_ssl_security_key,SSL_FILETYPE_PEM);
177
178
if (!SSL_CTX_check_private_key(ctx)) {
179
ERR_error_string_n(ERR_get_error(),lerror,sizeof(lerror));
@@ -207,7 +207,7 @@ void security_start_ssl(int selector) {
207
switch (selector) {
208
case NETDATA_SSL_CONTEXT_SERVER: {
209
struct stat statbuf;
210
- if (stat(ssl_security_key, &statbuf) || stat(ssl_security_cert, &statbuf)) {
210
+ if (stat(netdata_ssl_security_key, &statbuf) || stat(netdata_ssl_security_cert, &statbuf)) {
211
info("To use encryption it is necessary to set \"ssl certificate\" and \"ssl key\" in [web] !\n");
212
return;
213
}
libnetdata/socket/security.h
+2
-2
@@ -45,8 +45,8 @@ struct netdata_ssl{
45
extern SSL_CTX *netdata_ssl_exporting_ctx;
46
extern SSL_CTX *netdata_ssl_client_ctx;
47
extern SSL_CTX *netdata_ssl_srv_ctx;
48
-extern const char *ssl_security_key;
49
-extern const char *ssl_security_cert;
48
+extern const char *netdata_ssl_security_key;
49
+extern const char *netdata_ssl_security_cert;
50
extern const char *tls_version;
51
extern const char *tls_ciphers;
52
extern int netdata_ssl_validate_server;
web/api/web_api_v1.c
+2
-3
@@ -1670,9 +1670,8 @@ static struct api_command {
1670
{ "allmetrics", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_allmetrics },
1671
1672
#if defined(ENABLE_ML)
1673
- { "anomaly_events", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_anomaly_events },
1674
- { "anomaly_event_info", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_anomaly_event_info },
1675
- { "ml_info", 0, WEB_CLIENT_ACL_DASHBOARD | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_ml_info },
1673
+ { "ml_info", 0, WEB_CLIENT_ACL_DASHBOARD, web_client_api_request_v1_ml_info },
1674
+ { "ml_models", 0, WEB_CLIENT_ACL_DASHBOARD, web_client_api_request_v1_ml_models },
1675
#endif
1676
1677
{ "manage/health", 0, WEB_CLIENT_ACL_MGMT | WEB_CLIENT_ACL_ACLK, web_client_api_request_v1_mgmt_health },