From 0f47841dffac70d64604dc906d8af4e17b96dcc6 Mon Sep 17 00:00:00 2001 From: dachau Date: Tue, 8 Sep 2026 23:09:33 -0600 Subject: [PATCH 1/4] Revert "SDSTOR-24888: Improve sync_client_injects_auth_header assertion" This reverts commit 61540389e7b3295ffff4dc00e9fc3357e50fced6. --- src/grpc/tests/unit/auth_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grpc/tests/unit/auth_test.cpp b/src/grpc/tests/unit/auth_test.cpp index 2dd7c4c7..ab1367db 100644 --- a/src/grpc/tests/unit/auth_test.cpp +++ b/src/grpc/tests/unit/auth_test.cpp @@ -357,7 +357,7 @@ TEST_F(AuthEnableTest, sync_client_injects_auth_header) { EchoReply reply; req.set_message("sync_inject_auth"); ::grpc::Status status = sync_client.call_echo(req, reply); - ASSERT_TRUE(status.ok()) << status.error_message(); + EXPECT_TRUE(status.ok()); EXPECT_EQ(req.message(), reply.message()); } From b0399908ee032ec5bba55f6a4d0e4d188da2d7b9 Mon Sep 17 00:00:00 2001 From: dachau Date: Tue, 8 Sep 2026 23:09:34 -0600 Subject: [PATCH 2/4] Revert "SDSTOR-24888: Bump sisl version to 14.8.2" This reverts commit 60125c8d4cbd80a933346c09e0f842e5845085e4. --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 23b5af5a..86e3b76c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ class SISLConan(ConanFile): name = "sisl" - version = "14.8.2" + version = "14.8.1" homepage = "https://github.com/eBay/sisl" description = "Library for fast data structures, utilities" From 91d21997ab1f066428a67bd3fecfe096dd42a4e1 Mon Sep 17 00:00:00 2001 From: dachau Date: Tue, 8 Sep 2026 23:09:34 -0600 Subject: [PATCH 3/4] Revert "SDSTOR-24888: Test GrpcSyncClient::inject_auth_metadata" This reverts commit 5da2b00faa8f10325c56acf1a0085be78e55fb06. --- src/grpc/tests/unit/auth_test.cpp | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/src/grpc/tests/unit/auth_test.cpp b/src/grpc/tests/unit/auth_test.cpp index ab1367db..ddbc37dc 100644 --- a/src/grpc/tests/unit/auth_test.cpp +++ b/src/grpc/tests/unit/auth_test.cpp @@ -326,13 +326,6 @@ class EchoAndPingClient : public GrpcSyncClient { const std::unique_ptr< EchoService::StubInterface >& echo_stub() { return echo_stub_; } - // Simulates how a real sync client subclass uses inject_auth_metadata (analogous to OmClient::init_ctx). - ::grpc::Status call_echo(const EchoRequest& req, EchoReply& reply) { - ::grpc::ClientContext ctx; - inject_auth_metadata(ctx); - return echo_stub_->Echo(&ctx, req, &reply); - } - private: std::unique_ptr< EchoService::StubInterface > echo_stub_; }; @@ -350,28 +343,6 @@ TEST_F(AuthEnableTest, allow_sync_client_with_auth) { EXPECT_EQ(req.message(), reply.message()); } -TEST_F(AuthEnableTest, sync_client_injects_auth_header) { - EchoAndPingClient sync_client{grpc_server_addr, m_token_client, "", ""}; - sync_client.init(); - EchoRequest req; - EchoReply reply; - req.set_message("sync_inject_auth"); - ::grpc::Status status = sync_client.call_echo(req, reply); - EXPECT_TRUE(status.ok()); - EXPECT_EQ(req.message(), reply.message()); -} - -TEST_F(AuthServerOnlyTest, sync_client_no_token_is_noop) { - EchoAndPingClient sync_client{grpc_server_addr, "", ""}; - sync_client.init(); - EchoRequest req; - EchoReply reply; - req.set_message("sync_no_token"); - ::grpc::Status status = sync_client.call_echo(req, reply); - EXPECT_FALSE(status.ok()); - EXPECT_EQ(status.error_code(), ::grpc::UNAUTHENTICATED); -} - void validate_generic_reply(const std::string& method, ::grpc::Status& status) { if (method == "method1" || method == "method2") { EXPECT_TRUE(status.ok()); From cb78baabce445a601b43989fffe30c0ae39be3ae Mon Sep 17 00:00:00 2001 From: dachau Date: Tue, 8 Sep 2026 23:09:34 -0600 Subject: [PATCH 4/4] Revert "SDSTOR-24888: Add inject_auth_metadata helper to GrpcSyncClient" This reverts commit 4a7e2cabdb491aed4d5817166cb4da72e652af1d. --- include/sisl/grpc/rpc_client.hpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/sisl/grpc/rpc_client.hpp b/include/sisl/grpc/rpc_client.hpp index 4f15d017..d59f7f07 100644 --- a/include/sisl/grpc/rpc_client.hpp +++ b/include/sisl/grpc/rpc_client.hpp @@ -299,11 +299,6 @@ class GrpcSyncClient : public GrpcBaseClient { std::unique_ptr< typename ServiceT::StubInterface > MakeStub() { return ServiceT::NewStub(m_channel); } - -protected: - void inject_auth_metadata(::grpc::ClientContext& ctx) const { - if (m_token_client) { ctx.AddMetadata(m_token_client->get_auth_header_key(), m_token_client->get_token()); } - } }; ENUM(ClientState, uint8_t, VOID, INIT, RUNNING, SHUTTING_DOWN, TERMINATED)