fix(pubsub): url encode routing params on publish (#12454)

googleapis · Aug 24, 2023 · 828a9f7 · 828a9f7
1 parent 2c7c4f6
commit 828a9f7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/google/cloud/pubsub/internal/streaming_subscription_batch_source.cc b/google/cloud/pubsub/internal/streaming_subscription_batch_source.cc
@@ -16,6 +16,7 @@
 #include "google/cloud/pubsub/internal/exactly_once_policies.h"
 #include "google/cloud/pubsub/internal/extend_leases_with_retry.h"
 #include "google/cloud/internal/async_retry_loop.h"
+#include "google/cloud/internal/url_encode.h"
 #include "google/cloud/log.h"
 #include <iterator>
 #include <ostream>
@@ -204,8 +205,9 @@ void StreamingSubscriptionBatchSource::StartStream(
 
   auto request = InitialRequest();
   auto context = std::make_shared<grpc::ClientContext>();
-  context->AddMetadata("x-goog-request-params",
-                       "subscription=" + request.subscription());
+  context->AddMetadata(
+      "x-goog-request-params",
+      "subscription=" + internal::UrlEncode(request.subscription()));
   auto stream = stub_->AsyncStreamingPull(cq_, std::move(context));
   if (!stream) {
     OnRetryFailure(Status(StatusCode::kUnknown, "null stream"));

diff --git a/google/cloud/pubsub/subscriber_connection_test.cc b/google/cloud/pubsub/subscriber_connection_test.cc
@@ -20,6 +20,7 @@
 #include "google/cloud/pubsub/testing/mock_subscriber_stub.h"
 #include "google/cloud/pubsub/testing/test_retry_policies.h"
 #include "google/cloud/internal/api_client_header.h"
+#include "google/cloud/internal/url_encode.h"
 #include "google/cloud/testing_util/scoped_log.h"
 #include "google/cloud/testing_util/status_matchers.h"
 #include "google/cloud/testing_util/validate_metadata.h"
@@ -138,7 +139,8 @@ TEST(SubscriberConnectionTest, MakeSubscriberConnectionSetupsMetadata) {
                     Pair("x-goog-api-client",
                          google::cloud::internal::ApiClientHeader("generator")),
                     Pair("x-goog-request-params",
-                         "subscription=" + subscription.FullName())));
+                         "subscription=" +
+                             internal::UrlEncode(subscription.FullName()))));
             return FakeAsyncStreamingPull(cq, std::move(context));
           });