From 75e079cb73c588a5a5858b7146635d0fb461a5bf Mon Sep 17 00:00:00 2001 From: Ermoshkin Artem <94714022+Shfdis@users.noreply.github.com> Date: Tue, 3 Nov 2026 11:08:24 +0300 Subject: [PATCH 1/3] Fix initial token refresh in write sessions --- CHANGELOG.md | 2 + .../grpc_connections/grpc_connections.h | 19 +- .../impl/write_session_impl.cpp | 22 +- .../impl/write_session_impl.h | 2 +- .../persqueue_public/ut/read_session_ut.cpp | 3 +- src/client/topic/impl/common.h | 25 +- src/client/topic/impl/write_session_impl.cpp | 22 +- src/client/topic/impl/write_session_impl.h | 2 +- tests/integration/topic/direct_read_it.cpp | 3 +- tests/unit/client/topic/CMakeLists.txt | 11 + .../topic/write_session_credentials_ut.cpp | 263 ++++++++++++++++++ 11 files changed, 344 insertions(+), 30 deletions(-) create mode 100644 tests/unit/client/topic/write_session_credentials_ut.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index a7e7ba85cb9..d1446399d55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +* Fixed Topic and PersQueue writers unnecessarily refreshing the initial authentication token and failing against servers with authentication disabled. + ## v3.26.0 * Federated topic read sessions now follow federation membership. After the initial discovery, databases that join the federation are read and databases that leave it are dropped; partition sessions of a dropped database get `TPartitionSessionClosedEvent` with the `ConnectionLost` reason. A listed database that becomes unavailable keeps its subsession. The refresh period is `TFederatedTopicClientSettings::FederationDiscoveryInterval` (30 seconds by default). diff --git a/src/client/impl/internal/grpc_connections/grpc_connections.h b/src/client/impl/internal/grpc_connections/grpc_connections.h index 79d4f2c4473..931249f03fb 100644 --- a/src/client/impl/internal/grpc_connections/grpc_connections.h +++ b/src/client/impl/internal/grpc_connections/grpc_connections.h @@ -654,7 +654,8 @@ class TGRpcConnectionsImpl TDbDriverStatePtr dbState, const TRpcRequestSettings& requestSettings, std::shared_ptr context = nullptr, - NThreading::TFuture authInfo = {}) + NThreading::TFuture authInfo = {}, + std::shared_ptr initialAuthToken = nullptr) { using NYdbGrpc::TGrpcStatus; using TConnection = std::unique_ptr>; @@ -662,7 +663,7 @@ class TGRpcConnectionsImpl if (auto ready = CredentialsReadyToWaitFor(dbState, requestSettings, context, authInfo); ready.Initialized()) { DeferUntilCredentialsReady(requestSettings, context, std::move(ready), - [this, connectedCallback = std::move(connectedCallback), rpc, dbState, requestSettings, context, authInfo] + [this, connectedCallback = std::move(connectedCallback), rpc, dbState, requestSettings, context, authInfo, initialAuthToken] (std::optional status) YDB_ASAN_SIZE_ATTRIBUTES mutable { if (status) { connectedCallback(std::move(*status), nullptr); @@ -674,7 +675,8 @@ class TGRpcConnectionsImpl std::move(dbState), requestSettings, std::move(context), - std::move(authInfo)); + std::move(authInfo), + std::move(initialAuthToken)); }); return; } @@ -690,7 +692,7 @@ class TGRpcConnectionsImpl } WithServiceConnection( - [this, connectedCallback = std::move(connectedCallback), rpc, requestSettings, context = std::move(context), dbState, authInfo = std::move(authInfo)] + [this, connectedCallback = std::move(connectedCallback), rpc, requestSettings, context = std::move(context), dbState, authInfo = std::move(authInfo), initialAuthToken = std::move(initialAuthToken)] (TPlainStatus status, TConnection serviceConnection, TEndpointKey endpoint) mutable { if (!status.Ok()) { context.reset(); @@ -703,6 +705,15 @@ class TGRpcConnectionsImpl TCallMeta meta; try { meta = MakeCallMeta(requestSettings, dbState, authInfo); + if (initialAuthToken) { + initialAuthToken->clear(); + for (const auto& [name, value] : meta.Aux) { + if (name == YDB_AUTH_TICKET_HEADER) { + *initialAuthToken = value; + break; + } + } + } } catch (const TYdbException& e) { context.reset(); RunStreamCallback( diff --git a/src/client/persqueue_public/impl/write_session_impl.cpp b/src/client/persqueue_public/impl/write_session_impl.cpp index 1e2141a2450..e5eb6521ff1 100644 --- a/src/client/persqueue_public/impl/write_session_impl.cpp +++ b/src/client/persqueue_public/impl/write_session_impl.cpp @@ -417,6 +417,7 @@ void TWriteSessionImpl::DoConnect(const TDuration& delay, const std::string& end NYdbGrpc::IQueueClientContextPtr connectTimeoutContext = nullptr; TRpcRequestSettings reqSettings; std::shared_ptr connectionFactory; + auto initialAuthToken = std::make_shared(); // Callbacks std::function connectCallback; @@ -484,9 +485,9 @@ void TWriteSessionImpl::DoConnect(const TDuration& delay, const std::string& end reqSettings = TRpcRequestSettings::Make(Settings); connectCallback = [cbContext = SelfContext, - connectContext = connectContext](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { + connectContext = connectContext, initialAuthToken](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { if (auto self = cbContext->LockShared()) { - self->OnConnect(std::move(st), std::move(processor), connectContext); + self->OnConnect(std::move(st), std::move(processor), connectContext, std::move(*initialAuthToken)); } }; @@ -507,7 +508,8 @@ void TWriteSessionImpl::DoConnect(const TDuration& delay, const std::string& end std::move(connectTimeoutContext), std::move(connectTimeoutCallback), delay, - std::move(connectDelayContext) + std::move(connectDelayContext), + std::move(initialAuthToken) ); } @@ -540,7 +542,8 @@ void TWriteSessionImpl::OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& // RPC callback. void TWriteSessionImpl::OnConnect( - TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext + TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext, + std::string initialAuthToken ) { THandleResult handleResult; { @@ -552,6 +555,8 @@ void TWriteSessionImpl::OnConnect( ConnectDelayContext = nullptr; if (st.Ok()) { + PrevToken = std::move(initialAuthToken); + UpdateTokenInProgress = false; Processor = std::move(processor); InitImpl(); // Still should call ReadFromProcessor(); @@ -1256,7 +1261,7 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefix() << "Write session: try to update token"); auto credentialsProvider = DbDriverState->GetCredentialsProvider(); - if (!credentialsProvider || UpdateTokenInProgress || !SessionEstablished || Aborting) + if (!credentialsProvider || !credentialsProvider->IsValid() || UpdateTokenInProgress || !SessionEstablished || Aborting) return; auto authInfo = credentialsProvider->GetAuthInfoAsync(); if (authInfo.IsReady()) { @@ -1265,15 +1270,18 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { } UpdateTokenInProgress = true; try { - authInfo.Subscribe([cbContext = SelfContext](const auto& future) { + authInfo.Subscribe([cbContext = SelfContext, connectionGeneration = ConnectionGeneration](const auto& future) { if (auto self = cbContext->LockShared()) try { - self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future](bool ok) { + self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future, connectionGeneration](bool ok) { if (auto self = cbContext->LockShared()) { if (!ok) { self->UpdateTokenInProgress = false; return; } std::lock_guard guard(self->Lock); + if (connectionGeneration != self->ConnectionGeneration) { + return; + } self->UpdateTokenImpl(future); } }); diff --git a/src/client/persqueue_public/impl/write_session_impl.h b/src/client/persqueue_public/impl/write_session_impl.h index 061ad02656c..59903090886 100644 --- a/src/client/persqueue_public/impl/write_session_impl.h +++ b/src/client/persqueue_public/impl/write_session_impl.h @@ -338,7 +338,7 @@ class TWriteSessionImpl : public TContinuationTokenIssuer, void DoCdsRequest(TDuration delay = TDuration::Zero()); void OnCdsResponse(TStatus& status, const Ydb::PersQueue::ClusterDiscovery::DiscoverClustersResult& result); void OnConnect(TPlainStatus&& st, typename IProcessor::TPtr&& processor, - const NYdbGrpc::IQueueClientContextPtr& connectContext); + const NYdbGrpc::IQueueClientContextPtr& connectContext, std::string initialAuthToken); void OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& connectTimeoutContext); void ResetForRetryImpl(); THandleResult RestartImpl(const TPlainStatus& status); diff --git a/src/client/persqueue_public/ut/read_session_ut.cpp b/src/client/persqueue_public/ut/read_session_ut.cpp index 55fbe94368b..267538b913e 100644 --- a/src/client/persqueue_public/ut/read_session_ut.cpp +++ b/src/client/persqueue_public/ut/read_session_ut.cpp @@ -75,7 +75,8 @@ struct TMockProcessorFactory : public ISessionConnectionProcessorFactory /* initialAuthToken */) override { UNIT_ASSERT_C(!ConnectedCallback, "Only one connect at a time is expected"); UNIT_ASSERT_C(!ConnectTimeoutCallback, "Only one connect at a time is expected"); diff --git a/src/client/topic/impl/common.h b/src/client/topic/impl/common.h index ec20f8ef2cc..a891f5206c9 100644 --- a/src/client/topic/impl/common.h +++ b/src/client/topic/impl/common.h @@ -324,7 +324,9 @@ struct ISessionConnectionProcessorFactory { TConnectTimeoutCallback connectTimeoutCallback, // Params for delay before reconnect and its cancellation. TDuration connectDelay = TDuration::Zero(), - NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext = nullptr) = 0; + NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext = nullptr, + // Receives the token sent in stream metadata before callback is invoked. + std::shared_ptr initialAuthToken = nullptr) = 0; }; template @@ -353,7 +355,8 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac NYdbGrpc::IQueueClientContextPtr connectTimeoutContext, TConnectTimeoutCallback connectTimeoutCallback, TDuration connectDelay, - NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext) override + NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext, + std::shared_ptr initialAuthToken) override { Y_ASSERT(connectContext); Y_ASSERT(connectTimeoutContext); @@ -364,7 +367,8 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac std::move(connectContext), connectTimeout, std::move(connectTimeoutContext), - std::move(connectTimeoutCallback)); + std::move(connectTimeoutCallback), + std::move(initialAuthToken)); } else { auto connect = [ weakThis = this->weak_from_this(), @@ -373,8 +377,9 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac connectContext = std::move(connectContext), connectTimeout, connectTimeoutContext = std::move(connectTimeoutContext), - connectTimeoutCallback = std::move(connectTimeoutCallback) - ] (bool ok) + connectTimeoutCallback = std::move(connectTimeoutCallback), + initialAuthToken = std::move(initialAuthToken) + ] (bool ok) mutable { if (!ok) { // Delay context is cancelled (driver Stop, previous @@ -391,7 +396,8 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac std::move(connectContext), connectTimeout, std::move(connectTimeoutContext), - std::move(connectTimeoutCallback) + std::move(connectTimeoutCallback), + std::move(initialAuthToken) ); } }; @@ -411,14 +417,17 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac NYdbGrpc::IQueueClientContextPtr connectContext, TDuration connectTimeout, NYdbGrpc::IQueueClientContextPtr connectTimeoutContext, - TConnectTimeoutCallback connectTimeoutCallback) + TConnectTimeoutCallback connectTimeoutCallback, + std::shared_ptr initialAuthToken) { Connections->StartBidirectionalStream( std::move(callback), Rpc, DbDriverState, requestSettings, - std::move(connectContext) + std::move(connectContext), + {}, + std::move(initialAuthToken) ); Connections->ScheduleCallback( diff --git a/src/client/topic/impl/write_session_impl.cpp b/src/client/topic/impl/write_session_impl.cpp index 94142c07728..d37f81eda8a 100644 --- a/src/client/topic/impl/write_session_impl.cpp +++ b/src/client/topic/impl/write_session_impl.cpp @@ -893,6 +893,7 @@ void TWriteSessionImpl::Connect(const TDuration& delay) { NYdbGrpc::IQueueClientContextPtr connectTimeoutContext = nullptr; TRpcRequestSettings reqSettings; std::shared_ptr connectionFactory; + auto initialAuthToken = std::make_shared(); // Callbacks std::function connectCallback; @@ -964,9 +965,9 @@ void TWriteSessionImpl::Connect(const TDuration& delay) { reqSettings = TRpcRequestSettings::Make(Settings, PreferredPartitionLocation.Endpoint); connectCallback = [cbContext = SelfContext, - connectContext = connectContext](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { + connectContext = connectContext, initialAuthToken](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { if (auto self = cbContext->LockShared()) { - self->OnConnect(std::move(st), std::move(processor), connectContext); + self->OnConnect(std::move(st), std::move(processor), connectContext, std::move(*initialAuthToken)); } }; @@ -987,7 +988,8 @@ void TWriteSessionImpl::Connect(const TDuration& delay) { std::move(connectTimeoutContext), std::move(connectTimeoutCallback), delay, - std::move(connectDelayContext) + std::move(connectDelayContext), + std::move(initialAuthToken) ); } @@ -1020,7 +1022,8 @@ void TWriteSessionImpl::OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& // RPC callback. void TWriteSessionImpl::OnConnect( - TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext + TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext, + std::string initialAuthToken ) { THandleResult handleResult; { @@ -1032,6 +1035,8 @@ void TWriteSessionImpl::OnConnect( ConnectDelayContext = nullptr; if (st.Ok()) { + PrevToken = std::move(initialAuthToken); + UpdateTokenInProgress = false; Processor = std::move(processor); InitImpl(); // Still should call ReadFromProcessor(); @@ -1864,7 +1869,7 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefixImpl() << "Write session: try to update token"); auto credentialsProvider = DbDriverState->GetCredentialsProvider(); - if (!credentialsProvider || UpdateTokenInProgress || !SessionEstablished || Aborting) { + if (!credentialsProvider || !credentialsProvider->IsValid() || UpdateTokenInProgress || !SessionEstablished || Aborting) { return; } @@ -1875,15 +1880,18 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { } UpdateTokenInProgress = true; try { - authInfo.Subscribe([cbContext = SelfContext](const auto& future) { + authInfo.Subscribe([cbContext = SelfContext, connectionGeneration = ConnectionGeneration](const auto& future) { if (auto self = cbContext->LockShared()) try { - self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future](bool ok) { + self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future, connectionGeneration](bool ok) { if (auto self = cbContext->LockShared()) { if (!ok) { self->UpdateTokenInProgress = false; return; } std::lock_guard guard(self->Lock); + if (connectionGeneration != self->ConnectionGeneration) { + return; + } self->UpdateTokenImpl(future); } }); diff --git a/src/client/topic/impl/write_session_impl.h b/src/client/topic/impl/write_session_impl.h index c4185e7b94f..ee68f0cf87c 100644 --- a/src/client/topic/impl/write_session_impl.h +++ b/src/client/topic/impl/write_session_impl.h @@ -436,7 +436,7 @@ class TWriteSessionImpl : public TContinuationTokenIssuer, void InitWriter(); void OnConnect(TPlainStatus&& st, typename IProcessor::TPtr&& processor, - const NYdbGrpc::IQueueClientContextPtr& connectContext); + const NYdbGrpc::IQueueClientContextPtr& connectContext, std::string initialAuthToken); void OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& connectTimeoutContext); void ResetForRetryImpl(); THandleResult RestartImpl(const TPlainStatus& status); diff --git a/tests/integration/topic/direct_read_it.cpp b/tests/integration/topic/direct_read_it.cpp index dda69d0152b..a3dbff196bb 100644 --- a/tests/integration/topic/direct_read_it.cpp +++ b/tests/integration/topic/direct_read_it.cpp @@ -54,7 +54,8 @@ struct TMockProcessorFactory : public ISessionConnectionProcessorFactory /* initialAuthToken */) override { ASSERT_FALSE(ConnectedCallback) << "Only one connect at a time is expected"; ASSERT_FALSE(ConnectTimeoutCallback) << "Only one connect at a time is expected"; diff --git a/tests/unit/client/topic/CMakeLists.txt b/tests/unit/client/topic/CMakeLists.txt index 65134cb4fb9..fec1f58f9fc 100644 --- a/tests/unit/client/topic/CMakeLists.txt +++ b/tests/unit/client/topic/CMakeLists.txt @@ -46,3 +46,14 @@ add_ydb_test(NAME client-topic-read-session-accounting_ut # read_session_kafka_timestamps_ut.cpp, reset_offset_ut.cpp, and # write_session_connect_ut.cpp use the upstream TTopicSdkTestSetup and # ydb/core server fixtures, which are absent from the standalone SDK repository. + +add_ydb_test(NAME client-topic-write-session-credentials_ut + INCLUDE_DIRS ${YDB_SDK_SOURCE_DIR} + SOURCES write_session_credentials_ut.cpp + LINK_LIBRARIES + YDB-CPP-SDK::Topic + cpp-client-ydb_persqueue_public + api-grpc + api-grpc-draft + LABELS unit +) diff --git a/tests/unit/client/topic/write_session_credentials_ut.cpp b/tests/unit/client/topic/write_session_credentials_ut.cpp new file mode 100644 index 00000000000..9cb01f686ea --- /dev/null +++ b/tests/unit/client/topic/write_session_credentials_ut.cpp @@ -0,0 +1,263 @@ +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +namespace NYdb::inline Dev { + namespace { + + class TAsyncCredentials final: public ICredentialsProvider { + public: + std::string GetAuthInfo() const override { + throw TAuthenticationError("Synchronous credentials access"); + } + + NThreading::TFuture GetAuthInfoAsync() const override { + NThreading::TFuture future; + { + std::lock_guard guard(Lock); + future = Token.GetFuture(); + } + if (!Requested.exchange(true)) { + FirstRequest.SetValue(); + } + return future; + } + + bool IsValid() const override { + return true; + } + + void SetToken(const std::string& token) { + NThreading::TPromise promise; + { + std::lock_guard guard(Lock); + if (Token.HasValue()) { + Token = NThreading::NewPromise(); + } + promise = Token; + } + promise.SetValue(token); + } + + NThreading::TPromise DeferToken() { + std::lock_guard guard(Lock); + Token = NThreading::NewPromise(); + return Token; + } + + mutable NThreading::TPromise FirstRequest = NThreading::NewPromise(); + + private: + mutable std::atomic Requested = false; + mutable std::mutex Lock; + NThreading::TPromise Token = NThreading::NewPromise(); + }; + + class TAsyncCredentialsFactory final: public ICredentialsProviderFactory { + public: + explicit TAsyncCredentialsFactory(std::shared_ptr provider) + : Provider(std::move(provider)) + { + } + + TCredentialsProviderPtr CreateProvider() const override { + return Provider; + } + + private: + const std::shared_ptr Provider; + }; + + using TTopicRequest = Ydb::Topic::StreamWriteMessage::FromClient; + using TTopicResponse = Ydb::Topic::StreamWriteMessage::FromServer; + using TPqRequest = Ydb::PersQueue::V1::StreamingWriteClientMessage; + using TPqResponse = Ydb::PersQueue::V1::StreamingWriteServerMessage; + + void Ack(const TTopicRequest& request, TTopicResponse& response) { + for (const auto& message : request.write_request().messages()) { + auto* ack = response.mutable_write_response()->add_acks(); + ack->set_seq_no(message.seq_no()); + ack->mutable_written()->set_offset(message.seq_no()); + } + } + + void Ack(const TPqRequest& request, TPqResponse& response) { + for (auto seqNo : request.write_request().sequence_numbers()) { + auto* ack = response.mutable_batch_write_response(); + ack->add_sequence_numbers(seqNo); + ack->add_offsets(seqNo); + ack->add_already_written(false); + } + } + + class TWriteService final: public Ydb::Topic::V1::TopicService::Service, + public Ydb::PersQueue::V1::PersQueueService::Service { + public: + explicit TWriteService(std::shared_ptr credentials, bool reconnect) + : Credentials(std::move(credentials)) + , Reconnect(reconnect) + { + } + + grpc::Status StreamWrite(grpc::ServerContext* context, + grpc::ServerReaderWriter* stream) override { + return Handle(context, stream); + } + + grpc::Status StreamingWrite(grpc::ServerContext* context, + grpc::ServerReaderWriter* stream) override { + return Handle(context, stream); + } + + std::atomic Connections = 0; + std::atomic Refreshes = 0; + NThreading::TPromise FirstWrite = NThreading::NewPromise(); + NThreading::TPromise SecondWrite = NThreading::NewPromise(); + + private: + template + grpc::Status Handle(grpc::ServerContext* context, grpc::ServerReaderWriter* stream) { + const size_t connection = ++Connections; + const auto token = context->client_metadata().find("x-ydb-auth-ticket"); + if (token == context->client_metadata().end() || + std::string(token->second.data(), token->second.size()) != (connection == 1 ? "abc" : "reconnected")) { + return {grpc::StatusCode::UNAUTHENTICATED, "wrong initial token"}; + } + TRequest request; + while (stream->Read(&request)) { + TResponse response; + response.set_status(Ydb::StatusIds::SUCCESS); + if (request.has_init_request()) { + if (Reconnect && connection == 1) { + // Leave a refresh pending when this stream disconnects. + PendingRefresh = Credentials->DeferToken(); + } + response.mutable_init_response()->set_session_id("session"); + } else if (request.has_update_token_request()) { + ++Refreshes; + if (request.update_token_request().token() != "rotated") { + // A server with auth disabled accepts initial metadata but + // rejects an unnecessary refresh of its dummy token. + return {grpc::StatusCode::UNAUTHENTICATED, "refreshed token is invalid"}; + } + response.mutable_update_token_response(); + } else if (request.has_write_request()) { + if (Reconnect && connection == 1) { + Credentials->DeferToken().SetValue("reconnected"); + return {grpc::StatusCode::UNAVAILABLE, "reconnect with a new token"}; + } + Ack(request, response); + if (++Writes == 1) { + if (Reconnect) { + // The old refresh must not replace the new stream's token. + PendingRefresh.SetValue("abc"); + } + FirstWrite.SetValue(); + } else if (Writes == 2) { + SecondWrite.SetValue(); + } + } + if (!stream->Write(response)) { + break; + } + } + return grpc::Status::OK; + } + + const std::shared_ptr Credentials; + const bool Reconnect; + NThreading::TPromise PendingRefresh; + std::atomic Writes = 0; + }; + + template + void CheckCredentials(bool reconnect) { + auto credentials = std::make_shared(); + TWriteService service(credentials, reconnect); + grpc::ServerBuilder builder; + int port = 0; + builder.AddListeningPort("127.0.0.1:0", grpc::InsecureServerCredentials(), &port); + builder.RegisterService(static_cast(&service)); + builder.RegisterService(static_cast(&service)); + auto server = builder.BuildAndStart(); + UNIT_ASSERT(server); + struct TShutdown { + grpc::Server& Server; + ~TShutdown() { + Server.Shutdown(std::chrono::system_clock::now()); + } + } shutdown{*server}; + + TDriver driver(TDriverConfig() + .SetEndpoint("127.0.0.1:" + std::to_string(port)) + .SetDatabase("/Root") + .SetDiscoveryMode(EDiscoveryMode::Off) + .SetCredentialsProviderFactory(std::make_shared(credentials))); + + auto run = [&](auto& client, auto settings) { + auto session = client.CreateSimpleBlockingWriteSession(settings); + // Session creation must not wait for the pending credentials future. + UNIT_ASSERT(credentials->FirstRequest.GetFuture().Wait(TDuration::Seconds(10))); + credentials->SetToken("abc"); + UNIT_ASSERT(session->Write("first", {}, {}, TDuration::Seconds(10))); + UNIT_ASSERT_C(service.FirstWrite.GetFuture().Wait(TDuration::Seconds(10)), "first write failed"); + UNIT_ASSERT_VALUES_EQUAL(service.Refreshes.load(), 0); + + credentials->SetToken("rotated"); + UNIT_ASSERT(session->Write("second", {}, {}, TDuration::Seconds(10))); + UNIT_ASSERT_C(service.SecondWrite.GetFuture().Wait(TDuration::Seconds(10)), "write after rotation failed"); + UNIT_ASSERT(session->Close(TDuration::Seconds(10))); + UNIT_ASSERT_VALUES_EQUAL(service.Refreshes.load(), 1); + UNIT_ASSERT_VALUES_EQUAL(service.Connections.load(), reconnect ? 2 : 1); + }; + + if constexpr (Topic) { + NTopic::TTopicClient client(driver); + run(client, NTopic::TWriteSessionSettings() + .Path("topic") + .MessageGroupId("producer") + .DirectWriteToPartition(false) + .Codec(NTopic::ECodec::RAW) + .BatchFlushInterval(TDuration::Zero()) + .BatchFlushMessageCount(1)); + } else { + NPersQueue::TPersQueueClient client(driver); + run(client, NPersQueue::TWriteSessionSettings() + .Path("topic") + .MessageGroupId("producer") + .ClusterDiscoveryMode(NPersQueue::EClusterDiscoveryMode::Off) + .Codec(NPersQueue::ECodec::RAW) + .BatchFlushInterval(TDuration::Zero())); + } + } + + } // namespace + + Y_UNIT_TEST_SUITE(WriteSessionCredentials) { + Y_UNIT_TEST(TopicKeepsInitialAsyncTokenAndRefreshesChanges) { + CheckCredentials(false); + } + Y_UNIT_TEST(PersQueueKeepsInitialAsyncTokenAndRefreshesChanges) { + CheckCredentials(false); + } + Y_UNIT_TEST(TopicRemembersTokenAfterReconnect) { + CheckCredentials(true); + } + Y_UNIT_TEST(PersQueueRemembersTokenAfterReconnect) { + CheckCredentials(true); + } + } // Y_UNIT_TEST_SUITE(WriteSessionCredentials) + +} // namespace NYdb::inline Dev From beab47f79b83099d85a0b1c6a24da3c3a994233e Mon Sep 17 00:00:00 2001 From: Ermoshkin Artem <94714022+Shfdis@users.noreply.github.com> Date: Tue, 3 Nov 2026 11:19:34 +0300 Subject: [PATCH 2/3] Track initial writer tokens asynchronously --- CHANGELOG.md | 2 +- .../grpc_connections/grpc_connections.h | 19 +- .../impl/write_session_impl.cpp | 29 +- .../impl/write_session_impl.h | 4 +- .../persqueue_public/ut/read_session_ut.cpp | 3 +- src/client/topic/impl/common.h | 25 +- src/client/topic/impl/write_session_impl.cpp | 29 +- src/client/topic/impl/write_session_impl.h | 4 +- tests/integration/topic/basic_usage_it.cpp | 20 ++ tests/integration/topic/direct_read_it.cpp | 3 +- tests/unit/client/topic/CMakeLists.txt | 11 - .../topic/write_session_credentials_ut.cpp | 263 ------------------ 12 files changed, 63 insertions(+), 349 deletions(-) delete mode 100644 tests/unit/client/topic/write_session_credentials_ut.cpp diff --git a/CHANGELOG.md b/CHANGELOG.md index d1446399d55..9ce3e2d8d5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -* Fixed Topic and PersQueue writers unnecessarily refreshing the initial authentication token and failing against servers with authentication disabled. +* Fixed redundant initial token refreshes in Topic and PersQueue writers. ## v3.26.0 diff --git a/src/client/impl/internal/grpc_connections/grpc_connections.h b/src/client/impl/internal/grpc_connections/grpc_connections.h index 931249f03fb..79d4f2c4473 100644 --- a/src/client/impl/internal/grpc_connections/grpc_connections.h +++ b/src/client/impl/internal/grpc_connections/grpc_connections.h @@ -654,8 +654,7 @@ class TGRpcConnectionsImpl TDbDriverStatePtr dbState, const TRpcRequestSettings& requestSettings, std::shared_ptr context = nullptr, - NThreading::TFuture authInfo = {}, - std::shared_ptr initialAuthToken = nullptr) + NThreading::TFuture authInfo = {}) { using NYdbGrpc::TGrpcStatus; using TConnection = std::unique_ptr>; @@ -663,7 +662,7 @@ class TGRpcConnectionsImpl if (auto ready = CredentialsReadyToWaitFor(dbState, requestSettings, context, authInfo); ready.Initialized()) { DeferUntilCredentialsReady(requestSettings, context, std::move(ready), - [this, connectedCallback = std::move(connectedCallback), rpc, dbState, requestSettings, context, authInfo, initialAuthToken] + [this, connectedCallback = std::move(connectedCallback), rpc, dbState, requestSettings, context, authInfo] (std::optional status) YDB_ASAN_SIZE_ATTRIBUTES mutable { if (status) { connectedCallback(std::move(*status), nullptr); @@ -675,8 +674,7 @@ class TGRpcConnectionsImpl std::move(dbState), requestSettings, std::move(context), - std::move(authInfo), - std::move(initialAuthToken)); + std::move(authInfo)); }); return; } @@ -692,7 +690,7 @@ class TGRpcConnectionsImpl } WithServiceConnection( - [this, connectedCallback = std::move(connectedCallback), rpc, requestSettings, context = std::move(context), dbState, authInfo = std::move(authInfo), initialAuthToken = std::move(initialAuthToken)] + [this, connectedCallback = std::move(connectedCallback), rpc, requestSettings, context = std::move(context), dbState, authInfo = std::move(authInfo)] (TPlainStatus status, TConnection serviceConnection, TEndpointKey endpoint) mutable { if (!status.Ok()) { context.reset(); @@ -705,15 +703,6 @@ class TGRpcConnectionsImpl TCallMeta meta; try { meta = MakeCallMeta(requestSettings, dbState, authInfo); - if (initialAuthToken) { - initialAuthToken->clear(); - for (const auto& [name, value] : meta.Aux) { - if (name == YDB_AUTH_TICKET_HEADER) { - *initialAuthToken = value; - break; - } - } - } } catch (const TYdbException& e) { context.reset(); RunStreamCallback( diff --git a/src/client/persqueue_public/impl/write_session_impl.cpp b/src/client/persqueue_public/impl/write_session_impl.cpp index e5eb6521ff1..9b02bff258e 100644 --- a/src/client/persqueue_public/impl/write_session_impl.cpp +++ b/src/client/persqueue_public/impl/write_session_impl.cpp @@ -29,6 +29,9 @@ TWriteSessionImpl::TWriteSessionImpl( , Client(std::move(client)) , Connections(std::move(connections)) , DbDriverState(std::move(dbDriverState)) + , PrevToken(DbDriverState->GetCredentialsProvider() + ? DbDriverState->GetCredentialsProvider()->GetAuthInfoAsync() + : NThreading::MakeFuture(std::string())) , InitSeqNoPromise(NThreading::NewPromise()) , WakeupInterval( Settings.BatchFlushInterval_ != TDuration::Zero() ? @@ -417,7 +420,6 @@ void TWriteSessionImpl::DoConnect(const TDuration& delay, const std::string& end NYdbGrpc::IQueueClientContextPtr connectTimeoutContext = nullptr; TRpcRequestSettings reqSettings; std::shared_ptr connectionFactory; - auto initialAuthToken = std::make_shared(); // Callbacks std::function connectCallback; @@ -485,9 +487,9 @@ void TWriteSessionImpl::DoConnect(const TDuration& delay, const std::string& end reqSettings = TRpcRequestSettings::Make(Settings); connectCallback = [cbContext = SelfContext, - connectContext = connectContext, initialAuthToken](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { + connectContext = connectContext](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { if (auto self = cbContext->LockShared()) { - self->OnConnect(std::move(st), std::move(processor), connectContext, std::move(*initialAuthToken)); + self->OnConnect(std::move(st), std::move(processor), connectContext); } }; @@ -508,8 +510,7 @@ void TWriteSessionImpl::DoConnect(const TDuration& delay, const std::string& end std::move(connectTimeoutContext), std::move(connectTimeoutCallback), delay, - std::move(connectDelayContext), - std::move(initialAuthToken) + std::move(connectDelayContext) ); } @@ -542,8 +543,7 @@ void TWriteSessionImpl::OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& // RPC callback. void TWriteSessionImpl::OnConnect( - TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext, - std::string initialAuthToken + TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext ) { THandleResult handleResult; { @@ -555,8 +555,6 @@ void TWriteSessionImpl::OnConnect( ConnectDelayContext = nullptr; if (st.Ok()) { - PrevToken = std::move(initialAuthToken); - UpdateTokenInProgress = false; Processor = std::move(processor); InitImpl(); // Still should call ReadFromProcessor(); @@ -1261,7 +1259,7 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefix() << "Write session: try to update token"); auto credentialsProvider = DbDriverState->GetCredentialsProvider(); - if (!credentialsProvider || !credentialsProvider->IsValid() || UpdateTokenInProgress || !SessionEstablished || Aborting) + if (!credentialsProvider || UpdateTokenInProgress || !SessionEstablished || Aborting) return; auto authInfo = credentialsProvider->GetAuthInfoAsync(); if (authInfo.IsReady()) { @@ -1270,18 +1268,15 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { } UpdateTokenInProgress = true; try { - authInfo.Subscribe([cbContext = SelfContext, connectionGeneration = ConnectionGeneration](const auto& future) { + authInfo.Subscribe([cbContext = SelfContext](const auto& future) { if (auto self = cbContext->LockShared()) try { - self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future, connectionGeneration](bool ok) { + self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future](bool ok) { if (auto self = cbContext->LockShared()) { if (!ok) { self->UpdateTokenInProgress = false; return; } std::lock_guard guard(self->Lock); - if (connectionGeneration != self->ConnectionGeneration) { - return; - } self->UpdateTokenImpl(future); } }); @@ -1309,12 +1304,12 @@ void TWriteSessionImpl::UpdateTokenImpl(const NThreading::TFuture& CloseImpl(EStatus::CLIENT_UNAUTHENTICATED, CurrentExceptionMessage()); return; } - if (token == PrevToken) { + if (PrevToken.HasValue() && token == PrevToken.GetValue()) { return; } UpdateTokenInProgress = true; - PrevToken = token; + PrevToken = future; LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefix() << "Write session: updating token"); diff --git a/src/client/persqueue_public/impl/write_session_impl.h b/src/client/persqueue_public/impl/write_session_impl.h index 59903090886..1af3f7b130e 100644 --- a/src/client/persqueue_public/impl/write_session_impl.h +++ b/src/client/persqueue_public/impl/write_session_impl.h @@ -338,7 +338,7 @@ class TWriteSessionImpl : public TContinuationTokenIssuer, void DoCdsRequest(TDuration delay = TDuration::Zero()); void OnCdsResponse(TStatus& status, const Ydb::PersQueue::ClusterDiscovery::DiscoverClustersResult& result); void OnConnect(TPlainStatus&& st, typename IProcessor::TPtr&& processor, - const NYdbGrpc::IQueueClientContextPtr& connectContext, std::string initialAuthToken); + const NYdbGrpc::IQueueClientContextPtr& connectContext); void OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& connectTimeoutContext); void ResetForRetryImpl(); THandleResult RestartImpl(const TPlainStatus& status); @@ -389,7 +389,7 @@ class TWriteSessionImpl : public TContinuationTokenIssuer, std::string PreferredClusterByCDS; std::shared_ptr ConnectionFactory; TDbDriverStatePtr DbDriverState; - std::string PrevToken; + NThreading::TFuture PrevToken; std::atomic_bool UpdateTokenInProgress = false; TInstant LastTokenUpdate = TInstant::Zero(); std::shared_ptr EventsQueue; diff --git a/src/client/persqueue_public/ut/read_session_ut.cpp b/src/client/persqueue_public/ut/read_session_ut.cpp index 267538b913e..55fbe94368b 100644 --- a/src/client/persqueue_public/ut/read_session_ut.cpp +++ b/src/client/persqueue_public/ut/read_session_ut.cpp @@ -75,8 +75,7 @@ struct TMockProcessorFactory : public ISessionConnectionProcessorFactory /* initialAuthToken */) override + NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext) override { UNIT_ASSERT_C(!ConnectedCallback, "Only one connect at a time is expected"); UNIT_ASSERT_C(!ConnectTimeoutCallback, "Only one connect at a time is expected"); diff --git a/src/client/topic/impl/common.h b/src/client/topic/impl/common.h index a891f5206c9..ec20f8ef2cc 100644 --- a/src/client/topic/impl/common.h +++ b/src/client/topic/impl/common.h @@ -324,9 +324,7 @@ struct ISessionConnectionProcessorFactory { TConnectTimeoutCallback connectTimeoutCallback, // Params for delay before reconnect and its cancellation. TDuration connectDelay = TDuration::Zero(), - NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext = nullptr, - // Receives the token sent in stream metadata before callback is invoked. - std::shared_ptr initialAuthToken = nullptr) = 0; + NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext = nullptr) = 0; }; template @@ -355,8 +353,7 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac NYdbGrpc::IQueueClientContextPtr connectTimeoutContext, TConnectTimeoutCallback connectTimeoutCallback, TDuration connectDelay, - NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext, - std::shared_ptr initialAuthToken) override + NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext) override { Y_ASSERT(connectContext); Y_ASSERT(connectTimeoutContext); @@ -367,8 +364,7 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac std::move(connectContext), connectTimeout, std::move(connectTimeoutContext), - std::move(connectTimeoutCallback), - std::move(initialAuthToken)); + std::move(connectTimeoutCallback)); } else { auto connect = [ weakThis = this->weak_from_this(), @@ -377,9 +373,8 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac connectContext = std::move(connectContext), connectTimeout, connectTimeoutContext = std::move(connectTimeoutContext), - connectTimeoutCallback = std::move(connectTimeoutCallback), - initialAuthToken = std::move(initialAuthToken) - ] (bool ok) mutable + connectTimeoutCallback = std::move(connectTimeoutCallback) + ] (bool ok) { if (!ok) { // Delay context is cancelled (driver Stop, previous @@ -396,8 +391,7 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac std::move(connectContext), connectTimeout, std::move(connectTimeoutContext), - std::move(connectTimeoutCallback), - std::move(initialAuthToken) + std::move(connectTimeoutCallback) ); } }; @@ -417,17 +411,14 @@ class TSessionConnectionProcessorFactory : public ISessionConnectionProcessorFac NYdbGrpc::IQueueClientContextPtr connectContext, TDuration connectTimeout, NYdbGrpc::IQueueClientContextPtr connectTimeoutContext, - TConnectTimeoutCallback connectTimeoutCallback, - std::shared_ptr initialAuthToken) + TConnectTimeoutCallback connectTimeoutCallback) { Connections->StartBidirectionalStream( std::move(callback), Rpc, DbDriverState, requestSettings, - std::move(connectContext), - {}, - std::move(initialAuthToken) + std::move(connectContext) ); Connections->ScheduleCallback( diff --git a/src/client/topic/impl/write_session_impl.cpp b/src/client/topic/impl/write_session_impl.cpp index d37f81eda8a..69a7434a27a 100644 --- a/src/client/topic/impl/write_session_impl.cpp +++ b/src/client/topic/impl/write_session_impl.cpp @@ -185,6 +185,9 @@ TWriteSessionImpl::TWriteSessionImpl( , Client(std::move(client)) , Connections(std::move(connections)) , DbDriverState(std::move(dbDriverState)) + , PrevToken(DbDriverState->GetCredentialsProvider() + ? DbDriverState->GetCredentialsProvider()->GetAuthInfoAsync() + : NThreading::MakeFuture(std::string())) , MaxBlockMessageCount(Settings.BatchFlushMessageCount_) , InitSeqNoPromise(NThreading::NewPromise()) , WakeupInterval( @@ -893,7 +896,6 @@ void TWriteSessionImpl::Connect(const TDuration& delay) { NYdbGrpc::IQueueClientContextPtr connectTimeoutContext = nullptr; TRpcRequestSettings reqSettings; std::shared_ptr connectionFactory; - auto initialAuthToken = std::make_shared(); // Callbacks std::function connectCallback; @@ -965,9 +967,9 @@ void TWriteSessionImpl::Connect(const TDuration& delay) { reqSettings = TRpcRequestSettings::Make(Settings, PreferredPartitionLocation.Endpoint); connectCallback = [cbContext = SelfContext, - connectContext = connectContext, initialAuthToken](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { + connectContext = connectContext](TPlainStatus&& st, typename IProcessor::TPtr&& processor) { if (auto self = cbContext->LockShared()) { - self->OnConnect(std::move(st), std::move(processor), connectContext, std::move(*initialAuthToken)); + self->OnConnect(std::move(st), std::move(processor), connectContext); } }; @@ -988,8 +990,7 @@ void TWriteSessionImpl::Connect(const TDuration& delay) { std::move(connectTimeoutContext), std::move(connectTimeoutCallback), delay, - std::move(connectDelayContext), - std::move(initialAuthToken) + std::move(connectDelayContext) ); } @@ -1022,8 +1023,7 @@ void TWriteSessionImpl::OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& // RPC callback. void TWriteSessionImpl::OnConnect( - TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext, - std::string initialAuthToken + TPlainStatus&& st, typename IProcessor::TPtr&& processor, const NYdbGrpc::IQueueClientContextPtr& connectContext ) { THandleResult handleResult; { @@ -1035,8 +1035,6 @@ void TWriteSessionImpl::OnConnect( ConnectDelayContext = nullptr; if (st.Ok()) { - PrevToken = std::move(initialAuthToken); - UpdateTokenInProgress = false; Processor = std::move(processor); InitImpl(); // Still should call ReadFromProcessor(); @@ -1869,7 +1867,7 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefixImpl() << "Write session: try to update token"); auto credentialsProvider = DbDriverState->GetCredentialsProvider(); - if (!credentialsProvider || !credentialsProvider->IsValid() || UpdateTokenInProgress || !SessionEstablished || Aborting) { + if (!credentialsProvider || UpdateTokenInProgress || !SessionEstablished || Aborting) { return; } @@ -1880,18 +1878,15 @@ void TWriteSessionImpl::UpdateTokenIfNeededImpl() { } UpdateTokenInProgress = true; try { - authInfo.Subscribe([cbContext = SelfContext, connectionGeneration = ConnectionGeneration](const auto& future) { + authInfo.Subscribe([cbContext = SelfContext](const auto& future) { if (auto self = cbContext->LockShared()) try { - self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future, connectionGeneration](bool ok) { + self->Connections->ScheduleCallback(TDuration::Zero(), [cbContext, future](bool ok) { if (auto self = cbContext->LockShared()) { if (!ok) { self->UpdateTokenInProgress = false; return; } std::lock_guard guard(self->Lock); - if (connectionGeneration != self->ConnectionGeneration) { - return; - } self->UpdateTokenImpl(future); } }); @@ -1919,14 +1914,14 @@ void TWriteSessionImpl::UpdateTokenImpl(const NThreading::TFuture& CloseImpl(EStatus::CLIENT_UNAUTHENTICATED, CurrentExceptionMessage()); return; } - if (token == PrevToken) { + if (PrevToken.HasValue() && token == PrevToken.GetValue()) { return; } LOG_LAZY(DbDriverState->Log, TLOG_DEBUG, LogPrefixImpl() << "Write session: updating token"); UpdateTokenInProgress = true; - PrevToken = token; + PrevToken = future; TClientMessage clientMessage; clientMessage.mutable_update_token_request()->set_token(TStringType{token}); diff --git a/src/client/topic/impl/write_session_impl.h b/src/client/topic/impl/write_session_impl.h index ee68f0cf87c..0c4e35feca3 100644 --- a/src/client/topic/impl/write_session_impl.h +++ b/src/client/topic/impl/write_session_impl.h @@ -436,7 +436,7 @@ class TWriteSessionImpl : public TContinuationTokenIssuer, void InitWriter(); void OnConnect(TPlainStatus&& st, typename IProcessor::TPtr&& processor, - const NYdbGrpc::IQueueClientContextPtr& connectContext, std::string initialAuthToken); + const NYdbGrpc::IQueueClientContextPtr& connectContext); void OnConnectTimeout(const NYdbGrpc::IQueueClientContextPtr& connectTimeoutContext); void ResetForRetryImpl(); THandleResult RestartImpl(const TPlainStatus& status); @@ -502,7 +502,7 @@ class TWriteSessionImpl : public TContinuationTokenIssuer, std::shared_ptr ConnectionFactory; TDbDriverStatePtr DbDriverState; - std::string PrevToken; + NThreading::TFuture PrevToken; std::atomic_bool UpdateTokenInProgress = false; TInstant LastTokenUpdate = TInstant::Zero(); std::shared_ptr EventsQueue; diff --git a/tests/integration/topic/basic_usage_it.cpp b/tests/integration/topic/basic_usage_it.cpp index ceef48a74af..cffab74bf09 100644 --- a/tests/integration/topic/basic_usage_it.cpp +++ b/tests/integration/topic/basic_usage_it.cpp @@ -86,6 +86,26 @@ TEST_F(BasicUsage, TEST_NAME(ConnectToYDB)) { } } +TEST_F(BasicUsage, TEST_NAME(WriteWithInitialToken)) { + TDriver driver(MakeDriverConfig().SetAuthToken("unused-token")); + TTopicClient client(driver); + auto session = client.CreateSimpleBlockingWriteSession( + TWriteSessionSettings().Path(GetTopicPath()).MessageGroupId(TEST_MESSAGE_GROUP_ID)); + + ASSERT_TRUE(session->Write("message", {}, {}, TDuration::Seconds(10))); + ASSERT_TRUE(session->Close(TDuration::Seconds(10))); +} + +TEST_F(BasicUsage, TEST_NAME(PersQueueWriteWithInitialToken)) { + TDriver driver(MakeDriverConfig().SetAuthToken("unused-token")); + NPersQueue::TPersQueueClient client(driver); + auto session = client.CreateSimpleBlockingWriteSession( + NPersQueue::TWriteSessionSettings().Path(GetTopicPath()).MessageGroupId(TEST_MESSAGE_GROUP_ID)); + + ASSERT_TRUE(session->Write("message", {}, {}, TDuration::Seconds(10))); + ASSERT_TRUE(session->Close(TDuration::Seconds(10))); +} + TEST_F(BasicUsage, TEST_NAME(WriteRead)) { auto driver = MakeDriver(); diff --git a/tests/integration/topic/direct_read_it.cpp b/tests/integration/topic/direct_read_it.cpp index a3dbff196bb..dda69d0152b 100644 --- a/tests/integration/topic/direct_read_it.cpp +++ b/tests/integration/topic/direct_read_it.cpp @@ -54,8 +54,7 @@ struct TMockProcessorFactory : public ISessionConnectionProcessorFactory /* initialAuthToken */) override + NYdbGrpc::IQueueClientContextPtr connectDelayOperationContext) override { ASSERT_FALSE(ConnectedCallback) << "Only one connect at a time is expected"; ASSERT_FALSE(ConnectTimeoutCallback) << "Only one connect at a time is expected"; diff --git a/tests/unit/client/topic/CMakeLists.txt b/tests/unit/client/topic/CMakeLists.txt index fec1f58f9fc..65134cb4fb9 100644 --- a/tests/unit/client/topic/CMakeLists.txt +++ b/tests/unit/client/topic/CMakeLists.txt @@ -46,14 +46,3 @@ add_ydb_test(NAME client-topic-read-session-accounting_ut # read_session_kafka_timestamps_ut.cpp, reset_offset_ut.cpp, and # write_session_connect_ut.cpp use the upstream TTopicSdkTestSetup and # ydb/core server fixtures, which are absent from the standalone SDK repository. - -add_ydb_test(NAME client-topic-write-session-credentials_ut - INCLUDE_DIRS ${YDB_SDK_SOURCE_DIR} - SOURCES write_session_credentials_ut.cpp - LINK_LIBRARIES - YDB-CPP-SDK::Topic - cpp-client-ydb_persqueue_public - api-grpc - api-grpc-draft - LABELS unit -) diff --git a/tests/unit/client/topic/write_session_credentials_ut.cpp b/tests/unit/client/topic/write_session_credentials_ut.cpp deleted file mode 100644 index 9cb01f686ea..00000000000 --- a/tests/unit/client/topic/write_session_credentials_ut.cpp +++ /dev/null @@ -1,263 +0,0 @@ -#include -#include -#include -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include - -namespace NYdb::inline Dev { - namespace { - - class TAsyncCredentials final: public ICredentialsProvider { - public: - std::string GetAuthInfo() const override { - throw TAuthenticationError("Synchronous credentials access"); - } - - NThreading::TFuture GetAuthInfoAsync() const override { - NThreading::TFuture future; - { - std::lock_guard guard(Lock); - future = Token.GetFuture(); - } - if (!Requested.exchange(true)) { - FirstRequest.SetValue(); - } - return future; - } - - bool IsValid() const override { - return true; - } - - void SetToken(const std::string& token) { - NThreading::TPromise promise; - { - std::lock_guard guard(Lock); - if (Token.HasValue()) { - Token = NThreading::NewPromise(); - } - promise = Token; - } - promise.SetValue(token); - } - - NThreading::TPromise DeferToken() { - std::lock_guard guard(Lock); - Token = NThreading::NewPromise(); - return Token; - } - - mutable NThreading::TPromise FirstRequest = NThreading::NewPromise(); - - private: - mutable std::atomic Requested = false; - mutable std::mutex Lock; - NThreading::TPromise Token = NThreading::NewPromise(); - }; - - class TAsyncCredentialsFactory final: public ICredentialsProviderFactory { - public: - explicit TAsyncCredentialsFactory(std::shared_ptr provider) - : Provider(std::move(provider)) - { - } - - TCredentialsProviderPtr CreateProvider() const override { - return Provider; - } - - private: - const std::shared_ptr Provider; - }; - - using TTopicRequest = Ydb::Topic::StreamWriteMessage::FromClient; - using TTopicResponse = Ydb::Topic::StreamWriteMessage::FromServer; - using TPqRequest = Ydb::PersQueue::V1::StreamingWriteClientMessage; - using TPqResponse = Ydb::PersQueue::V1::StreamingWriteServerMessage; - - void Ack(const TTopicRequest& request, TTopicResponse& response) { - for (const auto& message : request.write_request().messages()) { - auto* ack = response.mutable_write_response()->add_acks(); - ack->set_seq_no(message.seq_no()); - ack->mutable_written()->set_offset(message.seq_no()); - } - } - - void Ack(const TPqRequest& request, TPqResponse& response) { - for (auto seqNo : request.write_request().sequence_numbers()) { - auto* ack = response.mutable_batch_write_response(); - ack->add_sequence_numbers(seqNo); - ack->add_offsets(seqNo); - ack->add_already_written(false); - } - } - - class TWriteService final: public Ydb::Topic::V1::TopicService::Service, - public Ydb::PersQueue::V1::PersQueueService::Service { - public: - explicit TWriteService(std::shared_ptr credentials, bool reconnect) - : Credentials(std::move(credentials)) - , Reconnect(reconnect) - { - } - - grpc::Status StreamWrite(grpc::ServerContext* context, - grpc::ServerReaderWriter* stream) override { - return Handle(context, stream); - } - - grpc::Status StreamingWrite(grpc::ServerContext* context, - grpc::ServerReaderWriter* stream) override { - return Handle(context, stream); - } - - std::atomic Connections = 0; - std::atomic Refreshes = 0; - NThreading::TPromise FirstWrite = NThreading::NewPromise(); - NThreading::TPromise SecondWrite = NThreading::NewPromise(); - - private: - template - grpc::Status Handle(grpc::ServerContext* context, grpc::ServerReaderWriter* stream) { - const size_t connection = ++Connections; - const auto token = context->client_metadata().find("x-ydb-auth-ticket"); - if (token == context->client_metadata().end() || - std::string(token->second.data(), token->second.size()) != (connection == 1 ? "abc" : "reconnected")) { - return {grpc::StatusCode::UNAUTHENTICATED, "wrong initial token"}; - } - TRequest request; - while (stream->Read(&request)) { - TResponse response; - response.set_status(Ydb::StatusIds::SUCCESS); - if (request.has_init_request()) { - if (Reconnect && connection == 1) { - // Leave a refresh pending when this stream disconnects. - PendingRefresh = Credentials->DeferToken(); - } - response.mutable_init_response()->set_session_id("session"); - } else if (request.has_update_token_request()) { - ++Refreshes; - if (request.update_token_request().token() != "rotated") { - // A server with auth disabled accepts initial metadata but - // rejects an unnecessary refresh of its dummy token. - return {grpc::StatusCode::UNAUTHENTICATED, "refreshed token is invalid"}; - } - response.mutable_update_token_response(); - } else if (request.has_write_request()) { - if (Reconnect && connection == 1) { - Credentials->DeferToken().SetValue("reconnected"); - return {grpc::StatusCode::UNAVAILABLE, "reconnect with a new token"}; - } - Ack(request, response); - if (++Writes == 1) { - if (Reconnect) { - // The old refresh must not replace the new stream's token. - PendingRefresh.SetValue("abc"); - } - FirstWrite.SetValue(); - } else if (Writes == 2) { - SecondWrite.SetValue(); - } - } - if (!stream->Write(response)) { - break; - } - } - return grpc::Status::OK; - } - - const std::shared_ptr Credentials; - const bool Reconnect; - NThreading::TPromise PendingRefresh; - std::atomic Writes = 0; - }; - - template - void CheckCredentials(bool reconnect) { - auto credentials = std::make_shared(); - TWriteService service(credentials, reconnect); - grpc::ServerBuilder builder; - int port = 0; - builder.AddListeningPort("127.0.0.1:0", grpc::InsecureServerCredentials(), &port); - builder.RegisterService(static_cast(&service)); - builder.RegisterService(static_cast(&service)); - auto server = builder.BuildAndStart(); - UNIT_ASSERT(server); - struct TShutdown { - grpc::Server& Server; - ~TShutdown() { - Server.Shutdown(std::chrono::system_clock::now()); - } - } shutdown{*server}; - - TDriver driver(TDriverConfig() - .SetEndpoint("127.0.0.1:" + std::to_string(port)) - .SetDatabase("/Root") - .SetDiscoveryMode(EDiscoveryMode::Off) - .SetCredentialsProviderFactory(std::make_shared(credentials))); - - auto run = [&](auto& client, auto settings) { - auto session = client.CreateSimpleBlockingWriteSession(settings); - // Session creation must not wait for the pending credentials future. - UNIT_ASSERT(credentials->FirstRequest.GetFuture().Wait(TDuration::Seconds(10))); - credentials->SetToken("abc"); - UNIT_ASSERT(session->Write("first", {}, {}, TDuration::Seconds(10))); - UNIT_ASSERT_C(service.FirstWrite.GetFuture().Wait(TDuration::Seconds(10)), "first write failed"); - UNIT_ASSERT_VALUES_EQUAL(service.Refreshes.load(), 0); - - credentials->SetToken("rotated"); - UNIT_ASSERT(session->Write("second", {}, {}, TDuration::Seconds(10))); - UNIT_ASSERT_C(service.SecondWrite.GetFuture().Wait(TDuration::Seconds(10)), "write after rotation failed"); - UNIT_ASSERT(session->Close(TDuration::Seconds(10))); - UNIT_ASSERT_VALUES_EQUAL(service.Refreshes.load(), 1); - UNIT_ASSERT_VALUES_EQUAL(service.Connections.load(), reconnect ? 2 : 1); - }; - - if constexpr (Topic) { - NTopic::TTopicClient client(driver); - run(client, NTopic::TWriteSessionSettings() - .Path("topic") - .MessageGroupId("producer") - .DirectWriteToPartition(false) - .Codec(NTopic::ECodec::RAW) - .BatchFlushInterval(TDuration::Zero()) - .BatchFlushMessageCount(1)); - } else { - NPersQueue::TPersQueueClient client(driver); - run(client, NPersQueue::TWriteSessionSettings() - .Path("topic") - .MessageGroupId("producer") - .ClusterDiscoveryMode(NPersQueue::EClusterDiscoveryMode::Off) - .Codec(NPersQueue::ECodec::RAW) - .BatchFlushInterval(TDuration::Zero())); - } - } - - } // namespace - - Y_UNIT_TEST_SUITE(WriteSessionCredentials) { - Y_UNIT_TEST(TopicKeepsInitialAsyncTokenAndRefreshesChanges) { - CheckCredentials(false); - } - Y_UNIT_TEST(PersQueueKeepsInitialAsyncTokenAndRefreshesChanges) { - CheckCredentials(false); - } - Y_UNIT_TEST(TopicRemembersTokenAfterReconnect) { - CheckCredentials(true); - } - Y_UNIT_TEST(PersQueueRemembersTokenAfterReconnect) { - CheckCredentials(true); - } - } // Y_UNIT_TEST_SUITE(WriteSessionCredentials) - -} // namespace NYdb::inline Dev From 10a8a7b6ece501ad674b65527d253c99feea4f5b Mon Sep 17 00:00:00 2001 From: Ermoshkin Artem <94714022+Shfdis@users.noreply.github.com> Date: Tue, 3 Nov 2026 12:31:57 +0300 Subject: [PATCH 3/3] Remove changelog entry --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ce3e2d8d5d..a7e7ba85cb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,3 @@ -* Fixed redundant initial token refreshes in Topic and PersQueue writers. - ## v3.26.0 * Federated topic read sessions now follow federation membership. After the initial discovery, databases that join the federation are read and databases that leave it are dropped; partition sessions of a dropped database get `TPartitionSessionClosedEvent` with the `ConnectionLost` reason. A listed database that becomes unavailable keeps its subsession. The refresh period is `TFederatedTopicClientSettings::FederationDiscoveryInterval` (30 seconds by default).