Skip to content

feat(admin): Add default TLS for dump-config LS-380 #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rolysr wants to merge 1 commit into
base: dev
Choose a base branch
from
+16 −1
Open

feat(admin): Add default TLS for dump-config LS-380 #770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/admin/dump_config_command.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,9 @@ const static std::unordered_map<std::string, std::string> defaultOptionsMaster =
{"PRIORITIZE_DATA_PARTS", "1"},
{"USE_CHUNKSERVER_SIDE_CHUNK_LOCK", "0"},
{"CREATE_EMPTY_FOLDERS_WHEN_SPACE_DEPLETED", "1"},
{"TLS_CERT_FILE", ""},
{"TLS_KEY_FILE", ""},
{"TLS_CA_CERT_FILE", ""},
};

const static std::unordered_map<std::string, std::string> defaultOptionsShadow = {
Expand All @@ -143,6 +146,9 @@ const static std::unordered_map<std::string, std::string> defaultOptionsShadow =
{"MASTER_RECONNECTION_DELAY", "1"},
{"MASTER_TIMEOUT", "60"},
{"LOAD_FACTOR_PENALTY", "0.0"},
{"TLS_CERT_FILE", ""},
{"TLS_KEY_FILE", ""},
{"TLS_CA_CERT_FILE", ""},
};

const static std::unordered_map<std::string, std::string> defaultOptionsCS = {
Expand Down Expand Up @@ -188,6 +194,9 @@ const static std::unordered_map<std::string, std::string> defaultOptionsCS = {
{"CHUNK_TRASH_FREE_SPACE_THRESHOLD_GB", "0"},
{"CHUNK_TRASH_GC_BATCH_SIZE", "1000"},
{"CHUNK_TRASH_GC_SPACE_RECOVERY_BATCH_SIZE", "100"},
{"TLS_CERT_FILE", ""},
{"TLS_KEY_FILE", ""},
{"TLS_CA_CERT_FILE", ""},
};

const static std::unordered_map<std::string, std::string> defaultOptionsMeta = {
Expand All @@ -203,6 +212,9 @@ const static std::unordered_map<std::string, std::string> defaultOptionsMeta = {
{"MASTER_HOST", "sfsmaster"},
{"MASTER_PORT", "9419"},
{"MASTER_RECONNECTION_DELAY", "1"},
{"TLS_CERT_FILE", ""},
{"TLS_KEY_FILE", ""},
{"TLS_CA_CERT_FILE", ""},
};
// clang-format on

Expand Down
5 changes: 4 additions & 1 deletion tests/test_suites/ShortSystemTests/test_tls_master_admin_communication.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,8 @@ config="$(saunafs-admin dump-config --defaults localhost "${master_port}" --tlsc
printf "%s\n" "${config}"
# Spot-check a couple of defaults that should be stable
expect_equals 1 "$(grep "GLOBALIOLIMITS_RENEGOTIATION_PERIOD_SECONDS: 0.1" <<< "${config}" | wc -l)"
# This value may appear across multiple services, adjust expected count if needed
# These values may appear across multiple services, adjust expected count if needed
expect_equals 3 "$(grep "REPLICATION_BANDWIDTH_LIMIT_KBPS: 0" <<< "${config}" | wc -l)"
expect_equals 3 "$(grep "TLS_CERT_FILE: \"\"" <<< "${config}" | wc -l)"
expect_equals 3 "$(grep "TLS_KEY_FILE: \"\"" <<< "${config}" | wc -l)"
expect_equals 3 "$(grep "TLS_CA_CERT_FILE: \"\"" <<< "${config}" | wc -l)"