Skip to content

Commit e1d5952

Browse files
committed
[#25332]yugabyted: Add use_client_to_server_encryption as part of master gFlags
Summary: Adding `use_client_to_server_encryption` as part of master gFlags when node is staring in `--secure` mode as yugabyteDB stores login passwords in master which should not be expose through non secure channels. Jira: DB-14546 Test Plan: ./yb_build.sh --java-test 'org.yb.yugabyted.*' Reviewers: nikhil Reviewed By: nikhil Subscribers: svc_phabricator, yugabyted-dev, sgarg-yb Differential Revision: https://phorge.dev.yugabyte.com/D40798
1 parent 53a09a1 commit e1d5952

File tree

1 file changed

+4
-18
lines changed

1 file changed

+4
-18
lines changed

bin/yugabyted

+4-18
Original file line numberDiff line numberDiff line change
@@ -3601,7 +3601,10 @@ class ControlScript(object):
36013601
if self.configs.saved_data.get("secure"):
36023602
common_gflags.extend(["--certs_dir={}".format(certs_dir),
36033603
"--allow_insecure_connections=false",
3604-
"--use_node_to_node_encryption=true",])
3604+
"--use_node_to_node_encryption=true",
3605+
"--use_client_to_server_encryption=true",
3606+
"--certs_for_client_dir={}".format(certs_dir),
3607+
"--certs_for_cdc_dir={}/xcluster".format(certs_dir),])
36053608

36063609
return common_gflags
36073610

@@ -3653,7 +3656,6 @@ class ControlScript(object):
36533656
if join_ip:
36543657
master_addresses = "{}:{},{}".format(join_ip, master_rpc_port, master_addresses)
36553658

3656-
certs_dir = self.configs.saved_data.get("certs_dir")
36573659

36583660
flag_list = common_flags + [
36593661
"--rpc_bind_addresses={}:{}".format(advertise_ip, master_rpc_port),
@@ -3668,11 +3670,6 @@ class ControlScript(object):
36683670
"--split_respects_tablet_replica_limits=true",
36693671
]
36703672

3671-
if self.configs.saved_data.get("secure"):
3672-
flag_list.extend([
3673-
"--certs_for_cdc_dir={}/xcluster".format(certs_dir)
3674-
])
3675-
36763673
yb_master_cmd = [find_binary_location("yb-master")]
36773674

36783675
master_flags = self.configs.saved_data.get("master_flags","")
@@ -3747,7 +3744,6 @@ class ControlScript(object):
37473744
if join_ip:
37483745
master_addresses = "{}:{},{}".format(join_ip, master_rpc_port, master_addresses)
37493746
tserver_rpc_port = self.configs.saved_data.get("tserver_rpc_port")
3750-
certs_dir = self.configs.saved_data.get("certs_dir")
37513747

37523748
yb_tserver_cmd = [find_binary_location("yb-tserver")] + common_flags + \
37533749
[
@@ -3768,11 +3764,6 @@ class ControlScript(object):
37683764
"--placement_uuid={}".format(self.configs.saved_data.get("placement_uuid")),
37693765
]
37703766

3771-
if self.configs.saved_data.get("secure"):
3772-
yb_tserver_cmd.extend([
3773-
"--certs_for_cdc_dir={}/xcluster".format(certs_dir)
3774-
])
3775-
37763767
tserver_flags = self.configs.saved_data.get("tserver_flags","")
37773768

37783769
if self.configs.temp_data.get("enable_pg_parity"):
@@ -3876,11 +3867,6 @@ class ControlScript(object):
38763867
# Handle simple flags
38773868
yb_tserver_cmd.append("--{}".format(tserver_flag))
38783869

3879-
# Add authentication flags in tserver
3880-
if self.configs.saved_data.get("secure"):
3881-
yb_tserver_cmd.extend(["--use_client_to_server_encryption=true",
3882-
"--certs_for_client_dir={}".format(certs_dir),])
3883-
38843870
hba_conf_updated = False
38853871
for i, flag in enumerate(yb_tserver_cmd):
38863872
if flag.startswith("--ysql_hba_conf_csv="):

0 commit comments

Comments
 (0)