Skip to content

FetchScriptResults. Fix crash on parsing of incorrect operation id (#15327) #15346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 5, 2025
Merged

FetchScriptResults. Fix crash on parsing of incorrect operation id (#15327) #15346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ydb/core/grpc_services/query/rpc_fetch_script_results.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,13 +125,18 @@ class TFetchScriptResultsRPC : public TRpcRequestActor<TFetchScriptResultsRPC, T
}

bool GetExecutionIdFromRequest() {
TMaybe<TString> executionId = NKqp::ScriptExecutionIdFromOperation(GetProtoRequest()->operation_id());
if (!executionId) {
Reply(Ydb::StatusIds::BAD_REQUEST, "Invalid operation id");
try {
TMaybe<TString> executionId = NKqp::ScriptExecutionIdFromOperation(GetProtoRequest()->operation_id());
if (!executionId) {
Reply(Ydb::StatusIds::BAD_REQUEST, "Invalid operation id");
return false;
}
ExecutionId = *executionId;
return true;
} catch (const std::exception& ex) {
Reply(Ydb::StatusIds::BAD_REQUEST, TStringBuilder() << "Invalid operation id: " << ex.what());
return false;
}
ExecutionId = *executionId;
return true;
}

private:
Expand Down
37 changes: 37 additions & 0 deletions ydb/core/kqp/ut/federated_query/generic_ut/kqp_generic_provider_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
#include <ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/connector_client_mock.h>
#include <ydb/library/yql/providers/generic/connector/libcpp/ut_helpers/database_resolver_mock.h>
#include <ydb/library/yql/providers/s3/actors/yql_s3_actors_factory_impl.h>
#include <ydb/public/api/protos/ydb_query.pb.h>
#include <ydb/public/api/grpc/ydb_query_v1.grpc.pb.h>
#include <ydb/public/sdk/cpp/src/library/grpc/client/grpc_client_low.h>
#include <ydb-cpp-sdk/client/operation/operation.h>
#include <ydb-cpp-sdk/client/query/query.h>
#include <ydb-cpp-sdk/client/types/status_codes.h>
Expand Down Expand Up @@ -471,5 +474,39 @@ namespace NKikimr::NKqp {
Y_UNIT_TEST(YdbFilterPushdown) {
TestFilterPushdown(EProviderType::Ydb);
}

void TestFailsOnIncorrectScriptExecutionOperation(const TString& operationId, const TString& fetchToken) {
auto clientMock = std::make_shared<TConnectorClientMock>();
auto databaseAsyncResolverMock = MakeDatabaseAsyncResolver(EProviderType::Ydb);
auto appConfig = CreateDefaultAppConfig();
auto s3ActorsFactory = NYql::NDq::CreateS3ActorsFactory();
auto kikimr = MakeKikimrRunner(false, clientMock, databaseAsyncResolverMock, appConfig, s3ActorsFactory);

// Create trash query
NYdbGrpc::TGRpcClientLow clientLow;

std::shared_ptr<grpc::Channel> channel;
channel = grpc::CreateChannel("localhost:" + ToString(kikimr->GetTestServer().GetGRpcServer().GetPort()), grpc::InsecureChannelCredentials());
{
std::unique_ptr<Ydb::Query::V1::QueryService::Stub> stub;
stub = Ydb::Query::V1::QueryService::NewStub(channel);
grpc::ClientContext context;
Ydb::Query::FetchScriptResultsRequest request;
request.set_operation_id(operationId);
request.set_fetch_token(fetchToken);
Ydb::Query::FetchScriptResultsResponse response;
grpc::Status st = stub->FetchScriptResults(&context, request, &response);
UNIT_ASSERT(st.ok());
UNIT_ASSERT_EQUAL_C(response.status(), Ydb::StatusIds::BAD_REQUEST, response);
}
}

Y_UNIT_TEST(TestFailsOnIncorrectScriptExecutionOperationId) {
TestFailsOnIncorrectScriptExecutionOperation("trash", "");
}

Y_UNIT_TEST(TestFailsOnIncorrectScriptExecutionFetchToken) {
TestFailsOnIncorrectScriptExecutionOperation("", "trash");
}
}
}
Loading