From bc249369699a003e4b8123287dcc1288bde08c56 Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 9 May 2026 01:41:51 +0300 Subject: [PATCH] Fix use_auth usage --- mon/antietcd_adapter.js | 3 ++- src/client/etcd_state_client.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/mon/antietcd_adapter.js b/mon/antietcd_adapter.js index a91178d7..52fe400d 100644 --- a/mon/antietcd_adapter.js +++ b/mon/antietcd_adapter.js @@ -72,7 +72,8 @@ class AntiEtcdAdapter delete antietcd_config.cluster; delete antietcd_config.cluster_key; } - if (config.use_auth) + const use_auth = config.use_auth || config.use_auth == null && config.client_ca; + if (use_auth) { antietcd_config.client_cert_auth = true; antietcd_config.auth_filter = vitastor_auth_filter; diff --git a/src/client/etcd_state_client.cpp b/src/client/etcd_state_client.cpp index b0c87305..6ce7dd0a 100644 --- a/src/client/etcd_state_client.cpp +++ b/src/client/etcd_state_client.cpp @@ -291,7 +291,12 @@ void etcd_state_client_t::parse_config(const json11::Json & config) add_etcd_url(ea.string_value()); } } - if (this->osd_num) + if (this->etcd_client_cert != "") + { + this->etcd_client_cert = config["etcd_client_cert"].string_value(); + this->etcd_client_key = config["etcd_client_key"].string_value(); + } + else if (this->osd_num) { this->etcd_client_cert = config["osd_cert"].string_value(); this->etcd_client_key = config["osd_pkey"].string_value(); @@ -301,11 +306,6 @@ void etcd_state_client_t::parse_config(const json11::Json & config) this->etcd_client_cert = config["cert"].string_value(); this->etcd_client_key = config["pkey"].string_value(); } - if (this->etcd_client_cert == "") - { - this->etcd_client_cert = config["etcd_client_cert"].string_value(); - this->etcd_client_key = config["etcd_client_key"].string_value(); - } this->etcd_ca = config["etcd_ca"].string_value(); this->etcd_prefix = config["etcd_prefix"].string_value(); if (this->etcd_prefix == "")