feat(storage): Respect custom endpoint for SignedUrl

googleapis · May 9, 2024 · 3623449 · 3623449
1 parent 8c959c5
commit 3623449
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/google/cloud/storage/client.cc b/google/cloud/storage/client.cc
@@ -389,7 +389,7 @@ StatusOr<std::string> Client::SignUrlV2(
   std::string signature = curl.MakeEscapedString(encoded).get();
 
   std::ostringstream os;
-  os << "https://storage.googleapis.com/" << request.bucket_name();
+  os << ExternalUrl() << request.bucket_name();
   if (!request.object_name().empty()) {
     os << '/' << curl.MakeEscapedString(request.object_name()).get();
   }
@@ -481,6 +481,10 @@ std::string CreateRandomPrefixName(std::string const& prefix) {
                                                   "abcdefghijklmnopqrstuvwxyz");
 }
 
+std::string Client::ExternalUrl() {
+  return connection_->client_options().endpoint() + "/";
+}
+
 namespace internal {
 
 Client ClientImplDetails::CreateWithDecorations(

diff --git a/google/cloud/storage/client.h b/google/cloud/storage/client.h
@@ -3492,6 +3492,8 @@ class Client {
   StatusOr<PolicyDocumentV4Result> SignPolicyDocumentV4(
       internal::PolicyDocumentV4Request request);
 
+  std::string ExternalUrl();
+
   std::shared_ptr<internal::StorageConnection> connection_;
 };
 

diff --git a/google/cloud/storage/client_sign_url_test.cc b/google/cloud/storage/client_sign_url_test.cc
@@ -107,6 +107,17 @@ TEST_F(CreateSignedUrlTest, V2SignRemote) {
   EXPECT_THAT(*actual, HasSubstr(expected_signed_blob_safe));
 }
 
+/// @test Verify that CreateV2SignedUrl() respects the custom endpoint.
+TEST_F(CreateSignedUrlTest, V2SignCustomEndpoint) {
+  std::string custom_endpoint = "https://storage.mydomain.com";
+
+  Client client(Options{}.set<RestEndpointOption>(custom_endpoint));
+  StatusOr<std::string> actual =
+      client.CreateV2SignedUrl("GET", "test-bucket", "test-object");
+  ASSERT_STATUS_OK(actual);
+  EXPECT_THAT(*actual, HasSubstr(custom_endpoint));
+}
+
 // This is a placeholder service account JSON file that is inactive. It's fine
 // for it to be public.
 constexpr char kJsonKeyfileContentsForV4[] = R"""({