Skip to content

Commit d86d220

Browse files
committed
Config option for node registration token (ydb-platform#7754)
(cherry picked from commit 0ce24a5)
1 parent 9a36432 commit d86d220

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

ydb/core/config/init/init.cpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ class TDefaultNodeBrokerClient
228228
const TGrpcSslSettings& grpcSettings,
229229
const TString addr,
230230
const NYdb::NDiscovery::TNodeRegistrationSettings& settings,
231+
const TString& nodeRegistrationToken,
231232
const IEnv& env)
232233
{
233234
TCommandConfig::TServerEndpoint endpoint = TCommandConfig::ParseServerAddress(addr);
@@ -242,7 +243,9 @@ class TDefaultNodeBrokerClient
242243
config.UseClientCertificate(certificate.c_str(), privateKey.c_str());
243244
}
244245
}
245-
config.SetAuthToken(BUILTIN_ACL_ROOT);
246+
if (nodeRegistrationToken) {
247+
config.SetAuthToken(nodeRegistrationToken);
248+
}
246249
config.SetEndpoint(endpoint.Address);
247250
auto connection = NYdb::TDriver(config);
248251

@@ -313,6 +316,7 @@ class TDefaultNodeBrokerClient
313316
const TGrpcSslSettings& grpcSettings,
314317
const TVector<TString>& addrs,
315318
const NYdb::NDiscovery::TNodeRegistrationSettings& settings,
319+
const TString& nodeRegistrationToken,
316320
const IEnv& env,
317321
IInitLogger& logger)
318322
{
@@ -326,6 +330,7 @@ class TDefaultNodeBrokerClient
326330
grpcSettings,
327331
addr,
328332
settings,
333+
nodeRegistrationToken,
329334
env);
330335
if (result.IsSuccess()) {
331336
logger.Out() << "Success. Registered via discovery service as " << result.GetNodeId() << Endl;
@@ -387,6 +392,7 @@ class TDefaultNodeBrokerClient
387392
grpcSettings,
388393
addrs,
389394
newRegSettings,
395+
regSettings.NodeRegistrationToken,
390396
env,
391397
logger);
392398

ydb/core/config/init/init.h

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ struct TNodeRegistrationSettings {
118118
bool FixedNodeID;
119119
ui32 InterconnectPort;
120120
NActors::TNodeLocation Location;
121+
TString NodeRegistrationToken;
121122
};
122123

123124
class INodeRegistrationResult {

ydb/core/config/init/init_impl.h

+1
Original file line numberDiff line numberDiff line change
@@ -1247,6 +1247,7 @@ class TInitialConfiguratorImpl
12471247
cf.FixedNodeID,
12481248
cf.InterconnectPort,
12491249
cf.CreateNodeLocation(),
1250+
AppConfig.GetAuthConfig().GetNodeRegistrationToken(),
12501251
};
12511252

12521253
auto result = NodeBrokerClient.RegisterDynamicNode(cf.GrpcSslSettings, addrs, settings, Env, Logger);

ydb/core/protos/auth.proto

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ message TAuthConfig {
5454
optional bool UseBuiltinDomain = 78 [default = true];
5555
optional string AccessServiceType = 79 [default = "Yandex_v2"]; // For now the following values are supported: "Yandex_v2", "Nebius_v1"
5656
optional string CertificateAuthenticationDomain = 80 [default = "cert"];
57+
optional string NodeRegistrationToken = 82 [default = "root@builtin", (Ydb.sensitive) = true];
5758
}
5859

5960
message TUserRegistryConfig {

0 commit comments

Comments
 (0)