Skip to content

Commit 16ceb2b

Browse files
committed
Fixed ceche permissions validation
1 parent 1d91bca commit 16ceb2b

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

ydb/core/kqp/proxy_service/kqp_proxy_service.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,9 +1590,10 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
15901590
return true;
15911591
}
15921592

1593-
if (const auto& securityObject = poolInfo->SecurityObject) {
1594-
const auto& userToken = ev->Get()->GetUserToken();
1595-
if (!userToken || !securityObject->CheckAccess(NACLib::EAccessRights::DescribeSchema, *userToken)) {
1593+
const auto& securityObject = poolInfo->SecurityObject;
1594+
const auto& userToken = ev->Get()->GetUserToken();
1595+
if (securityObject && userToken && !userToken->GetSerializedToken().empty()) {
1596+
if (!securityObject->CheckAccess(NACLib::EAccessRights::DescribeSchema, *userToken)) {
15961597
ReplyProcessError(Ydb::StatusIds::NOT_FOUND, TStringBuilder() << "Resource pool " << poolId << " not found or you don't have access permissions", requestId);
15971598
return false;
15981599
}

ydb/core/kqp/workload_service/kqp_workload_service.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
403403
}
404404
IdleChecksStarted = true;
405405

406-
Schedule(IDLE_DURATION / 2, new TEvents::TEvWakeup());
406+
Schedule(IDLE_DURATION / 2, new TEvents::TEvWakeup(static_cast<ui64>(EWakeUp::IdleCheck)));
407407
}
408408

409409
void RunIdleCheck() {
@@ -457,7 +457,7 @@ class TKqpWorkloadService : public TActorBootstrapped<TKqpWorkloadService> {
457457
}
458458

459459
void ScheduleNodeInfoRequest() const {
460-
Schedule(IDLE_DURATION * 2, new TEvents::TEvWakeup(static_cast<ui64>(EWakeUp::StartCpuLoadRequest)));
460+
Schedule(IDLE_DURATION * 2, new TEvents::TEvWakeup(static_cast<ui64>(EWakeUp::StartNodeInfoRequest)));
461461
}
462462

463463
void RunNodeInfoRequest() const {

ydb/core/kqp/workload_service/ut/kqp_workload_service_ut.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,9 @@ Y_UNIT_TEST_SUITE(KqpWorkloadService) {
260260
TSampleQueries::TSelect42::CheckResult(ydb->ExecuteQuery(TSampleQueries::TSelect42::Query, TQueryRunnerSettings().PoolId(NResourcePool::DEFAULT_POOL_ID)));
261261

262262
ydb->WaitPoolHandlersCount(0, 2, TDuration::Seconds(95));
263+
264+
// Check pool creation after cleanup
265+
TSampleQueries::TSelect42::CheckResult(ydb->ExecuteQuery(TSampleQueries::TSelect42::Query));
263266
}
264267
}
265268

0 commit comments

Comments
 (0)