thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not enable use_perms by default - make it more explicit for users

Browse Source
This commit is contained in:
Vitaliy Filippov
2026-07-05 15:19:03 +03:00
parent 265e99ccd0
commit 6a0f3a38d0
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mon/antietcd_adapter.js
+1 -2
View File
@@ -78,8 +78,7 @@ class AntiEtcdAdapter
delete antietcd_config.cluster; delete antietcd_config.cluster;
delete antietcd_config.cluster_key; delete antietcd_config.cluster_key;
} }
const use_perms = config.use_perms || config.use_perms == null && config.client_ca; if (config.use_perms)
if (use_perms)
{ {
antietcd_config.client_cert_auth = true; antietcd_config.client_cert_auth = true;
antietcd_config.auth_filter = vitastor_auth_filter; antietcd_config.auth_filter = vitastor_auth_filter;
src/cmd/cli_serve.cpp
+7 -4
View File
@@ -112,6 +112,7 @@ struct cli_serve_t
listen_backlog = options["listen_backlog"].uint64_value(); listen_backlog = options["listen_backlog"].uint64_value();
if (!listen_backlog) if (!listen_backlog)
listen_backlog = 128; listen_backlog = 128;
use_perms = json_is_true(parent->cli->config["use_perms"]);
{ {
std::string tls_cert = (parent->cli->config.find("server_cert") != parent->cli->config.end() std::string tls_cert = (parent->cli->config.find("server_cert") != parent->cli->config.end()
? parent->cli->config["server_cert"].string_value() : ""); ? parent->cli->config["server_cert"].string_value() : "");
@@ -128,10 +129,6 @@ struct cli_serve_t
state = 100; state = 100;
return; return;
} }
// use_perms is enabled by default when client_ca is set
use_perms = (parent->cli->config["use_perms"].is_null()
? (tls_ca != "")
: json_is_true(parent->cli->config["use_perms"]));
std::string error; std::string error;
http_ctx = http_context_init(parent->epmgr->tfd, tls_cert, tls_key, tls_ca, tls_ca != "", error); http_ctx = http_context_init(parent->epmgr->tfd, tls_cert, tls_key, tls_ca, tls_ca != "", error);
if (error != "") if (error != "")
@@ -141,6 +138,12 @@ struct cli_serve_t
return; return;
} }
} }
else if (use_perms)
{
result = (cli_result_t){ .err = EINVAL, .text = "use_perms requires encryption" };
state = 100;
return;
}
} }
for (auto & bind_address: bind_addresses) for (auto & bind_address: bind_addresses)
{ {
src/osd/osd.cpp
+10 -5
View File
@@ -178,7 +178,10 @@ void osd_t::parse_config(bool init)
// OSD number // OSD number
osd_num = config["osd_num"].uint64_value(); osd_num = config["osd_num"].uint64_value();
if (!osd_num) if (!osd_num)
throw std::runtime_error("osd_num is required in the configuration"); {
fprintf(stderr, "osd_num is required in the configuration\n");
exit(1);
}
msgr.osd_num = osd_num; msgr.osd_num = osd_num;
st_cli->osd_num = osd_num; st_cli->osd_num = osd_num;
} }
@@ -191,10 +194,12 @@ void osd_t::parse_config(bool init)
msgr.parse_config(config, init); msgr.parse_config(config, init);
if (init) if (init)
{ {
// use_perms is enabled by default when encryption is enabled use_perms = json_is_true(config["use_perms"]);
use_perms = (config["use_perms"].is_null() if (use_perms && !msgr.is_encryption_enabled())
? msgr.is_encryption_enabled() {
: json_is_true(config["use_perms"])); fprintf(stderr, "use_perms requires encryption\n");
exit(1);
}
// Vital Blockstore parameters // Vital Blockstore parameters
bs_block_size = config["block_size"].uint64_value(); bs_block_size = config["block_size"].uint64_value();
if (!bs_block_size) if (!bs_block_size)