Skip to content

Commit 0ce24a5

Browse files
authored
Config option for node registration token (#7754)
1 parent 6266c81 commit 0ce24a5

File tree

4 files changed

+10
-1
lines changed

4 files changed

+10
-1
lines changed

ydb/core/config/init/init.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ class TDefaultNodeBrokerClient
196196
const TGrpcSslSettings& grpcSettings,
197197
const TString addr,
198198
const NYdb::NDiscovery::TNodeRegistrationSettings& settings,
199+
const TString& nodeRegistrationToken,
199200
const IEnv& env)
200201
{
201202
TCommandConfig::TServerEndpoint endpoint = TCommandConfig::ParseServerAddress(addr);
@@ -210,7 +211,9 @@ class TDefaultNodeBrokerClient
210211
config.UseClientCertificate(certificate.c_str(), privateKey.c_str());
211212
}
212213
}
213-
config.SetAuthToken(BUILTIN_ACL_ROOT);
214+
if (nodeRegistrationToken) {
215+
config.SetAuthToken(nodeRegistrationToken);
216+
}
214217
config.SetEndpoint(endpoint.Address);
215218
auto connection = NYdb::TDriver(config);
216219

@@ -224,6 +227,7 @@ class TDefaultNodeBrokerClient
224227
const TGrpcSslSettings& grpcSettings,
225228
const TVector<TString>& addrs,
226229
const NYdb::NDiscovery::TNodeRegistrationSettings& settings,
230+
const TString& nodeRegistrationToken,
227231
const IEnv& env,
228232
IInitLogger& logger)
229233
{
@@ -234,6 +238,7 @@ class TDefaultNodeBrokerClient
234238
result = TryToRegisterDynamicNode(grpcSettings,
235239
addr,
236240
settings,
241+
nodeRegistrationToken,
237242
env);
238243
if (result.IsSuccess()) {
239244
logger.Out() << "Success. Registered as " << result.GetNodeId() << Endl;
@@ -289,6 +294,7 @@ class TDefaultNodeBrokerClient
289294
NYdb::NDiscovery::TNodeRegistrationResult result = RegisterDynamicNodeImpl(grpcSettings,
290295
addrs,
291296
newRegSettings,
297+
regSettings.NodeRegistrationToken,
292298
env,
293299
logger);
294300

ydb/core/config/init/init.h

Lines changed: 1 addition & 0 deletions
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,6 +1257,7 @@ class TInitialConfiguratorImpl
12571257
cf.FixedNodeID,
12581258
cf.InterconnectPort,
12591259
cf.CreateNodeLocation(),
1260+
AppConfig.GetAuthConfig().GetNodeRegistrationToken(),
12601261
};
12611262

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

ydb/core/protos/auth.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ message TAuthConfig {
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"];
5757
optional bool EnableLoginAuthentication = 81 [default = true];
58+
optional string NodeRegistrationToken = 82 [default = "root@builtin", (Ydb.sensitive) = true];
5859
}
5960

6061
message TUserRegistryConfig {

0 commit comments

Comments
 (0)