Skip to content

Commit 036c258

Browse files
molotkov-andmolotkov-and
authored
Merge 3db8b40 into f72af11 
2 parents f72af11 + 3db8b40 commit 036c258

File tree

11 files changed

+32
-13
lines changed

11 files changed

+32
-13
lines changed

‎ydb/core/client/flat_ut.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,9 @@ Y_UNIT_TEST_SUITE(TFlatTest) {
12821282
Y_UNIT_TEST(CheckACL) {
12831283
TPortManager pm;
12841284
ui16 port = pm.GetPort(2134);
1285-
TServer cleverServer = TServer(TServerSettings(port));
1285+
NKikimrProto::TAuthConfig authConfig;
1286+
authConfig.SetUseBuiltinDomain(true);
1287+
TServer cleverServer = TServer(TServerSettings(port, authConfig));
12861288
if (!true) {
12871289
cleverServer.GetRuntime()->SetLogPriority(NKikimrServices::FLAT_TX_SCHEMESHARD, NActors::NLog::PRI_DEBUG);
12881290
cleverServer.GetRuntime()->SetLogPriority(NKikimrServices::TX_DATASHARD, NActors::NLog::PRI_DEBUG);

‎ydb/core/kqp/ut/common/kqp_ut_common.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ TKikimrRunner::TKikimrRunner(const TKikimrSettings& settings) {
108108

109109
effectiveKqpSettings.insert(effectiveKqpSettings.end(), settings.KqpSettings.begin(), settings.KqpSettings.end());
110110

111-
ServerSettings.Reset(MakeHolder<Tests::TServerSettings>(mbusPort, NKikimrProto::TAuthConfig(), settings.PQConfig));
111+
NKikimrProto::TAuthConfig authConfig;
112+
authConfig.SetUseBuiltinDomain(true);
113+
ServerSettings.Reset(MakeHolder<Tests::TServerSettings>(mbusPort, authConfig, settings.PQConfig));
112114
ServerSettings->SetDomainName(settings.DomainRoot);
113115
ServerSettings->SetKqpSettings(effectiveKqpSettings);
114116

‎ydb/core/protos/auth.proto

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ message TAuthConfig {
4848
optional string LdapAuthenticationDomain = 75 [default = "ldap"];
4949
optional bool UseAccessServiceApiKey = 76 [default = false]; // Use IAM ApiKey
5050
optional string AsSignatureExpireTime = 77 [default = "1m"];
51+
optional bool UseBuiltinDomain = 78 [default = false];
5152
}
5253

5354
message TUserRegistryConfig {

‎ydb/core/security/ticket_parser_impl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ class TTicketParserImpl : public TActorBootstrapped<TDerived> {
465465

466466
template <typename TTokenRecord>
467467
bool CanInitBuiltinToken(const TString& key, TTokenRecord& record) {
468-
if (record.TokenType == TDerived::ETokenType::Unknown || record.TokenType == TDerived::ETokenType::Builtin) {
468+
if (Config.GetUseBuiltinDomain() && (record.TokenType == TDerived::ETokenType::Unknown || record.TokenType == TDerived::ETokenType::Builtin)) {
469469
if(record.Ticket.EndsWith("@" BUILTIN_ACL_DOMAIN)) {
470470
record.TokenType = TDerived::ETokenType::Builtin;
471471
SetToken(key, record, new NACLib::TUserToken({

‎ydb/core/sys_view/ut_common.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ TTestEnv::TTestEnv(ui32 staticNodes, ui32 dynamicNodes, ui32 storagePools, ui32
3232

3333
TVector<NKikimrKqp::TKqpSetting> kqpSettings;
3434

35-
Settings = new Tests::TServerSettings(mbusPort);
35+
NKikimrProto::TAuthConfig authConfig;
36+
authConfig.SetUseBuiltinDomain(true);
37+
Settings = new Tests::TServerSettings(mbusPort, authConfig);
3638
Settings->SetDomainName("Root");
3739
Settings->SetNodeCount(staticNodes);
3840
Settings->SetDynamicNodeCount(dynamicNodes);

‎ydb/core/testlib/test_pq_client.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ const static ui32 PQ_DEFAULT_NODE_COUNT = 2;
2828
inline Tests::TServerSettings PQSettings(ui16 port = 0, ui32 nodesCount = PQ_DEFAULT_NODE_COUNT, const TString& yql_timeout = "10", const THolder<TTempFileHandle>& netDataFile = nullptr) {
2929
NKikimrPQ::TPQConfig pqConfig;
3030
NKikimrProto::TAuthConfig authConfig;
31+
authConfig.SetUseBuiltinDomain(true);
3132
authConfig.SetUseBlackBox(false);
3233
authConfig.SetUseAccessService(false);
3334
authConfig.SetUseAccessServiceTLS(false);
@@ -542,7 +543,7 @@ class TFlatMsgBusPQClient : public NFlatTests::TFlatMsgBusClient {
542543
auto driverConfig = NYdb::TDriverConfig()
543544
.SetEndpoint(endpoint)
544545
.SetLog(CreateLogBackend("cerr", ELogPriority::TLOG_DEBUG));
545-
if (databaseName)
546+
if (databaseName)
546547
driverConfig.SetDatabase(*databaseName);
547548
Driver.Reset(MakeHolder<NYdb::TDriver>(driverConfig));
548549

@@ -791,7 +792,7 @@ class TFlatMsgBusPQClient : public NFlatTests::TFlatMsgBusClient {
791792
{
792793
auto response = RequestTopicMetadata(name);
793794

794-
if (response.GetErrorCode() != (ui32)NPersQueue::NErrorCode::OK)
795+
if (response.GetErrorCode() != (ui32)NPersQueue::NErrorCode::OK)
795796
return 0;
796797

797798
UNIT_ASSERT(response.HasMetaResponse());
@@ -1081,7 +1082,7 @@ class TFlatMsgBusPQClient : public NFlatTests::TFlatMsgBusClient {
10811082
Cerr << "ChooseProxy response:\n" << PrintToString(response) << Endl;
10821083

10831084
UNIT_ASSERT_C(status.ok(), status.error_message());
1084-
1085+
10851086
UNIT_ASSERT_VALUES_EQUAL_C((NMsgBusProxy::EResponseStatus)response.GetStatus(), NMsgBusProxy::MSTATUS_OK, "proxy failure");
10861087
}
10871088

@@ -1096,7 +1097,7 @@ class TFlatMsgBusPQClient : public NFlatTests::TFlatMsgBusClient {
10961097
TString cookie = GetOwnership({writeRequest.Topic, writeRequest.Partition}, expectedOwnerStatus);
10971098

10981099
THolder<NMsgBusProxy::TBusPersQueue> request = writeRequest.GetRequest(data, cookie);
1099-
if (!ticket.empty())
1100+
if (!ticket.empty())
11001101
request.Get()->Record.SetTicket(ticket);
11011102

11021103
auto response = CallPersQueueGRPC(request->Record);

‎ydb/core/tx/tiering/ut/ut_tiers.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,9 @@ Y_UNIT_TEST_SUITE(ColumnShardTiers) {
533533
ui32 grpcPort = pm.GetPort();
534534
ui32 msgbPort = pm.GetPort();
535535

536-
Tests::TServerSettings serverSettings(msgbPort);
536+
NKikimrProto::TAuthConfig authConfig;
537+
authConfig.SetUseBuiltinDomain(true);
538+
Tests::TServerSettings serverSettings(msgbPort, authConfig);
537539
serverSettings.Port = msgbPort;
538540
serverSettings.GrpcPort = grpcPort;
539541
serverSettings.SetDomainName("Root")

‎ydb/services/metadata/initializer/ut/ut_init.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,9 @@ Y_UNIT_TEST_SUITE(Initializer) {
108108
ui32 grpcPort = pm.GetPort();
109109
ui32 msgbPort = pm.GetPort();
110110

111-
Tests::TServerSettings serverSettings(msgbPort);
111+
NKikimrProto::TAuthConfig authConfig;
112+
authConfig.SetUseBuiltinDomain(true);
113+
Tests::TServerSettings serverSettings(msgbPort, authConfig);
112114
serverSettings.Port = msgbPort;
113115
serverSettings.GrpcPort = grpcPort;
114116
serverSettings.SetDomainName("Root")

‎ydb/services/metadata/secret/ut/ut_secret.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,9 @@ Y_UNIT_TEST_SUITE(Secret) {
258258
NKikimrConfig::TAppConfig appConfig;
259259
appConfig.MutableTableServiceConfig()->SetEnablePreparedDdl(true);
260260

261-
Tests::TServerSettings serverSettings(msgbPort);
261+
NKikimrProto::TAuthConfig authConfig;
262+
authConfig.SetUseBuiltinDomain(true);
263+
Tests::TServerSettings serverSettings(msgbPort, authConfig);
262264
serverSettings.Port = msgbPort;
263265
serverSettings.GrpcPort = grpcPort;
264266
serverSettings.SetDomainName("Root")

‎ydb/services/ydb/ydb_common_ut.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ class TBasicKikimrWithGrpcAndRootSchema {
5959
{
6060
ui16 port = PortManager.GetPort(2134);
6161
ui16 grpc = PortManager.GetPort(2135);
62-
ServerSettings = new TServerSettings(port);
62+
63+
NKikimrProto::TAuthConfig authConfig = appConfig.GetAuthConfig();
64+
authConfig.SetUseBuiltinDomain(true);
65+
ServerSettings = new TServerSettings(port, authConfig);
6366
ServerSettings->SetGrpcPort(grpc);
6467
ServerSettings->SetLogBackend(logBackend);
6568
ServerSettings->SetDomainName("Root");
@@ -78,7 +81,6 @@ class TBasicKikimrWithGrpcAndRootSchema {
7881
ServerSettings->AddStoragePoolType("hdd2");
7982
}
8083
ServerSettings->AppConfig->MergeFrom(appConfig);
81-
ServerSettings->AuthConfig = appConfig.GetAuthConfig();
8284
ServerSettings->FeatureFlags = appConfig.GetFeatureFlags();
8385
ServerSettings->SetKqpSettings(kqpSettings);
8486
ServerSettings->SetEnableDataColumnForIndexTable(true);

‎ydb/tests/library/harness/kikimr_config.py

+3
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,9 @@ def __init__(
331331

332332
if auth_config_path:
333333
self.yaml_config["auth_config"] = _load_yaml_config(auth_config_path)
334+
else:
335+
self.yaml_config['auth_config'] = {}
336+
self.yaml_config['auth_config']['use_builtin_domain'] = True
334337

335338
if fq_config_path:
336339
self.yaml_config["federated_query_config"] = _load_yaml_config(fq_config_path)

0 commit comments

Comments
 (0)