File tree 2 files changed +15
-2
lines changed
ydb/core/kqp/session_actor 2 files changed +15
-2
lines changed Original file line number Diff line number Diff line change @@ -117,7 +117,7 @@ std::unique_ptr<TEvTxProxySchemeCache::TEvNavigateKeySet> TKqpQueryState::BuildN
117
117
118
118
auto navigate = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
119
119
navigate->DatabaseName = Database;
120
- if (UserToken && !UserToken-> GetSerializedToken (). empty ()) {
120
+ if (HasUserToken ()) {
121
121
navigate->UserToken = UserToken;
122
122
}
123
123
@@ -412,12 +412,23 @@ std::unique_ptr<NSchemeCache::TSchemeCacheNavigate> TKqpQueryState::BuildSchemeC
412
412
consumer = operations.GetConsumer ();
413
413
414
414
TopicOperations.FillSchemeCacheNavigate (*navigate, std::move (consumer));
415
- navigate->UserToken = UserToken;
415
+ if (HasUserToken ()) {
416
+ navigate->UserToken = UserToken;
417
+ }
416
418
navigate->Cookie = QueryId;
417
419
return navigate;
418
420
}
419
421
422
+ bool TKqpQueryState::HasUserToken () const
423
+ {
424
+ return UserToken && !UserToken->GetSerializedToken ().empty ();
425
+ }
426
+
420
427
bool TKqpQueryState::IsAccessDenied (const NSchemeCache::TSchemeCacheNavigate& response, TString& message) {
428
+ if (!HasUserToken ()) {
429
+ return false ;
430
+ }
431
+
421
432
auto checkAccessDenied = [&] (const NSchemeCache::TSchemeCacheNavigate::TEntry& result) {
422
433
static const auto selectRowRights = NACLib::EAccessRights::SelectRow;
423
434
static const auto accessAttributesRights = NACLib::EAccessRights::ReadAttributes | NACLib::EAccessRights::WriteAttributes;
Original file line number Diff line number Diff line change @@ -596,6 +596,8 @@ class TKqpQueryState : public TNonCopyable {
596
596
std::unique_ptr<NSchemeCache::TSchemeCacheNavigate> BuildSchemeCacheNavigate ();
597
597
bool IsAccessDenied (const NSchemeCache::TSchemeCacheNavigate& response, TString& message);
598
598
bool HasErrors (const NSchemeCache::TSchemeCacheNavigate& response, TString& message);
599
+
600
+ bool HasUserToken () const ;
599
601
};
600
602
601
603
You can’t perform that action at this time.
0 commit comments