Skip to content

Commit 1060128

Browse files
committed
Config option for node registration token (#7754)
(cherry picked from commit 0ce24a5)
1 parent dec6996 commit 1060128

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

ydb/core/driver_lib/cli_utils/cli_cmds_server.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -944,7 +944,8 @@ class TClientCommandServerBase : public TClientCommand {
944944
const TString &nodeHost,
945945
const TString &nodeAddress,
946946
const TString &nodeResolveHost,
947-
const TMaybe<TString>& path) {
947+
const TMaybe<TString>& path,
948+
const TString& nodeRegistrationToken) {
948949
TCommandConfig::TServerEndpoint endpoint = TCommandConfig::ParseServerAddress(addr);
949950
NYdb::TDriverConfig config;
950951
if (endpoint.EnableSsl.Defined()) {
@@ -957,7 +958,9 @@ class TClientCommandServerBase : public TClientCommand {
957958
config.UseClientCertificate(certificate.c_str(), privateKey.c_str());
958959
}
959960
}
960-
config.SetAuthToken(BUILTIN_ACL_ROOT);
961+
if (nodeRegistrationToken) {
962+
config.SetAuthToken(nodeRegistrationToken);
963+
}
961964
config.SetEndpoint(endpoint.Address);
962965
auto connection = NYdb::TDriver(config);
963966

@@ -1028,13 +1031,13 @@ class TClientCommandServerBase : public TClientCommand {
10281031
return {};
10291032
}
10301033

1031-
NYdb::NDiscovery::TNodeRegistrationResult RegisterDynamicNodeViaDiscoveryService(const TVector<TString>& addrs, const TString& domainName) {
1034+
NYdb::NDiscovery::TNodeRegistrationResult RegisterDynamicNodeViaDiscoveryService(const TVector<TString>& addrs, const TString& domainName, const TString& nodeRegistrationToken) {
10321035
NYdb::NDiscovery::TNodeRegistrationResult result;
10331036
const size_t maxNumberRecivedCallUnimplemented = 5;
10341037
size_t currentNumberRecivedCallUnimplemented = 0;
10351038
while (!result.IsSuccess() && currentNumberRecivedCallUnimplemented < maxNumberRecivedCallUnimplemented) {
10361039
for (const auto& addr : addrs) {
1037-
result = TryToRegisterDynamicNodeViaDiscoveryService(addr, domainName, NodeHost, NodeAddress, NodeResolveHost, GetSchemePath());
1040+
result = TryToRegisterDynamicNodeViaDiscoveryService(addr, domainName, NodeHost, NodeAddress, NodeResolveHost, GetSchemePath(), nodeRegistrationToken);
10381041
if (result.IsSuccess()) {
10391042
Cout << "Success. Registered via discovery service as " << result.GetNodeId() << Endl;
10401043
Cout << "Node name: ";
@@ -1217,7 +1220,7 @@ class TClientCommandServerBase : public TClientCommand {
12171220
if (!NodeResolveHost)
12181221
NodeResolveHost = NodeHost;
12191222

1220-
NYdb::NDiscovery::TNodeRegistrationResult result = RegisterDynamicNodeViaDiscoveryService(addrs, domainName);
1223+
NYdb::NDiscovery::TNodeRegistrationResult result = RegisterDynamicNodeViaDiscoveryService(addrs, domainName, AppConfig.GetAuthConfig().GetNodeRegistrationToken());
12211224
if (result.IsSuccess()) {
12221225
ProcessRegistrationDynamicNodeResult(result);
12231226
} else {

ydb/core/protos/auth.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ message TAuthConfig {
5252
optional bool UseBuiltinDomain = 78 [default = true];
5353
optional string CertificateAuthenticationDomain = 80 [default = "cert"];
5454
optional bool EnableLoginAuthentication = 81 [default = true];
55+
optional string NodeRegistrationToken = 82 [default = "root@builtin", (Ydb.sensitive) = true];
5556
}
5657

5758
message TUserRegistryConfig {

0 commit comments

Comments
 (0)