From 76410df0e844f89e98dbd735e381c835abfa776e Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sun, 5 Jul 2026 14:28:18 +0300 Subject: [PATCH] Do not require explicit peer_ca for antietcd --- mon/antietcd_adapter.js | 9 --------- mon/vitastor_auth_filter.js | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/mon/antietcd_adapter.js b/mon/antietcd_adapter.js index 6a3c4086..59e1d6da 100644 --- a/mon/antietcd_adapter.js +++ b/mon/antietcd_adapter.js @@ -85,15 +85,6 @@ class AntiEtcdAdapter antietcd_config.ca = config.client_ca; antietcd_config.osd_ca = config.osd_ca; antietcd_config.mon_ca = config.mon_ca; - if (!config.etcd_proxy) - { - antietcd_config.peer_ca = config.antietcd_server_ca; - if (!config.antietcd_server_ca || config.antietcd_server_ca == config.client_ca) - { - console.error('Secure setup requires separate antietcd_server_ca (for signing antietcd server certificates) and client_ca (for signing client certificates)'); - process.exit(1); - } - } } for (const key in config) { diff --git a/mon/vitastor_auth_filter.js b/mon/vitastor_auth_filter.js index 259cc5c6..4346d363 100644 --- a/mon/vitastor_auth_filter.js +++ b/mon/vitastor_auth_filter.js @@ -68,10 +68,10 @@ class VitastorAuthFilter async init() { - if (!this.cfg.cert || !this.cfg.key || !this.cfg.osd_ca || !this.cfg.etcd_proxy && !this.cfg.peer_ca || !this.cfg.client_cert_auth) + if (!this.cfg.cert || !this.cfg.key || !this.cfg.osd_ca || !this.cfg.client_cert_auth) { throw new Error('Authenticated Vitastor setups require enabled client_cert_auth, cert, key'+ - ' and separate ca (client CA), osd_ca'+(this.cfg.etcd_proxy ? '' : ', peer_ca')+' and optionally mon_ca'); + ' and separate ca (client CA), osd_ca and optionally mon_ca'); } this.osd_ca = await this.antietcd.readPEM(this.cfg.osd_ca); this.osd_ca_obj = new X509Certificate(this.osd_ca);