Skip to content

Commit 084d19f

Browse files
ijonblinkov
authored andcommitted
security: fix query service for alter-login and domain_login_only (#15380)
Fix database selection in kqp_scheme_executor for AlterLogin operations when domain_login_only=false.
1 parent b04b8a6 commit 084d19f

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,14 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
179179
}
180180

181181
TString GetDatabaseForLoginOperation() const {
182-
const auto domainLoginOnly = AppData()->AuthConfig.GetDomainLoginOnly();
183-
const auto domain = AppData()->DomainsInfo ? AppData()->DomainsInfo->GetDomain() : nullptr;
184-
const auto domainName = domain ? domain->Name : "";
185-
TString database;
186-
return NSchemeHelpers::SetDatabaseForLoginOperation(database, domainLoginOnly, domainName, Database)
187-
? database : Database;
182+
const bool domainLoginOnly = AppData()->AuthConfig.GetDomainLoginOnly();
183+
TMaybe<TString> domainName;
184+
if (domainLoginOnly && AppData()->DomainsInfo) {
185+
domainName = AppData()->DomainsInfo->GetDomain()->Name;
186+
}
187+
TString result;
188+
return NSchemeHelpers::SetDatabaseForLoginOperation(result, domainLoginOnly, domainName, Database)
189+
? result : Database;
188190
}
189191

190192
void MakeSchemeOperationRequest() {

0 commit comments

Comments
 (0)