From 53e6a778d8a5f66580cf7bc196062cd8dcb6536b Mon Sep 17 00:00:00 2001 From: Scott Hart Date: Fri, 20 Nov 2026 20:34:04 -0500 Subject: [PATCH] fix(oauth): ensure iam credentials endpoint is consistent with universe domain --- .../oauth2_minimal_iam_credentials_rest.cc | 56 +++++++----- .../oauth2_minimal_iam_credentials_rest.h | 7 +- ...auth2_minimal_iam_credentials_rest_test.cc | 91 ++++++++++++++++++- 3 files changed, 126 insertions(+), 28 deletions(-) diff --git a/google/cloud/internal/oauth2_minimal_iam_credentials_rest.cc b/google/cloud/internal/oauth2_minimal_iam_credentials_rest.cc index 616e750c3df7e..6a862b9d58dfa 100644 --- a/google/cloud/internal/oauth2_minimal_iam_credentials_rest.cc +++ b/google/cloud/internal/oauth2_minimal_iam_credentials_rest.cc @@ -28,6 +28,7 @@ #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include +#include namespace google { namespace cloud { @@ -35,10 +36,10 @@ namespace oauth2_internal { GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_BEGIN namespace { -std::string IamCredentialsEndpoint( - StatusOr const& universe_domain) { - return absl::StrCat("https://iamcredentials.", - universe_domain ? *universe_domain : "googleapis.com"); +StatusOr IamCredentialsEndpoint( + StatusOr universe_domain) { + if (!universe_domain) return std::move(universe_domain).status(); + return absl::StrCat("https://iamcredentials.", *universe_domain); } } // namespace @@ -59,13 +60,15 @@ MinimalIamCredentialsRestStub::MinimalIamCredentialsRestStub( StatusOr MinimalIamCredentialsRestStub::GenerateAccessToken( GenerateAccessTokenRequest const& request) { - auto authorization_header = + StatusOr path = MakeRequestPath(request); + if (!path) return std::move(path).status(); + StatusOr authorization_header = credentials_->Authorization(std::chrono::system_clock::now()); if (!authorization_header) return std::move(authorization_header).status(); rest_internal::RestRequest rest_request; rest_request.AddHeader(*std::move(authorization_header)); rest_request.AddHeader("Content-Type", "application/json"); - rest_request.SetPath(MakeRequestPath(request)); + rest_request.SetPath(*std::move(path)); nlohmann::json payload{ {"delegates", request.delegates}, {"scope", request.scopes}, @@ -84,21 +87,27 @@ MinimalIamCredentialsRestStub::GenerateAccessToken( {"serviceAccount", request.service_account}})); } -std::string MinimalIamCredentialsRestStub::MakeRequestPath( +StatusOr MinimalIamCredentialsRestStub::MakeRequestPath( GenerateAccessTokenRequest const& request) const { - return absl::StrCat(IamCredentialsEndpoint(universe_domain(Options{})), - "/v1/projects/-/serviceAccounts/", + StatusOr endpoint = + IamCredentialsEndpoint(universe_domain(options_)); + if (!endpoint) return std::move(endpoint).status(); + return absl::StrCat(*endpoint, "/v1/projects/-/serviceAccounts/", request.service_account, ":generateAccessToken"); } StatusOr -MinimalIamCredentialsRestStub::AllowedLocationsHelper(std::string path) { - auto authorization_header = +MinimalIamCredentialsRestStub::AllowedLocationsHelper( + std::string_view relative_path) { + StatusOr endpoint = + IamCredentialsEndpoint(universe_domain(options_)); + if (!endpoint) return std::move(endpoint).status(); + StatusOr authorization_header = credentials_->Authorization(std::chrono::system_clock::now()); if (!authorization_header) return std::move(authorization_header).status(); rest_internal::RestRequest rest_request; rest_request.AddHeader(*std::move(authorization_header)); - rest_request.SetPath(std::move(path)); + rest_request.SetPath(absl::StrCat(*endpoint, relative_path)); auto client = client_factory_(options_); rest_internal::RestContext context; @@ -115,29 +124,26 @@ MinimalIamCredentialsRestStub::AllowedLocationsHelper(std::string path) { StatusOr MinimalIamCredentialsRestStub::AllowedLocations( ServiceAccountAllowedLocationsRequest const& request) { - auto path = absl::StrCat(IamCredentialsEndpoint(universe_domain(Options{})), - "/v1/projects/-/serviceAccounts/", - request.service_account_email, "/allowedLocations"); - return AllowedLocationsHelper(std::move(path)); + return AllowedLocationsHelper(absl::StrCat("/v1/projects/-/serviceAccounts/", + request.service_account_email, + "/allowedLocations")); } StatusOr MinimalIamCredentialsRestStub::AllowedLocations( WorkloadIdentityAllowedLocationsRequest const& request) { - auto path = absl::StrCat(IamCredentialsEndpoint(universe_domain(Options{})), - "/v1/projects/", request.project_id, - "/locations/global/workloadIdentityPools/", - request.pool_id, "/allowedLocations"); - return AllowedLocationsHelper(std::move(path)); + return AllowedLocationsHelper( + absl::StrCat("/v1/projects/", request.project_id, + "/locations/global/workloadIdentityPools/", request.pool_id, + "/allowedLocations")); } StatusOr MinimalIamCredentialsRestStub::AllowedLocations( WorkforceIdentityAllowedLocationsRequest const& request) { - auto path = absl::StrCat(IamCredentialsEndpoint(universe_domain(Options{})), - "/v1/locations/global/workforcePools/", - request.pool_id, "/allowedLocations"); - return AllowedLocationsHelper(std::move(path)); + return AllowedLocationsHelper( + absl::StrCat("/v1/locations/global/workforcePools/", request.pool_id, + "/allowedLocations")); } MinimalIamCredentialsRestLogging::MinimalIamCredentialsRestLogging( diff --git a/google/cloud/internal/oauth2_minimal_iam_credentials_rest.h b/google/cloud/internal/oauth2_minimal_iam_credentials_rest.h index 0cf641e55eaa2..0d89dedc04e0c 100644 --- a/google/cloud/internal/oauth2_minimal_iam_credentials_rest.h +++ b/google/cloud/internal/oauth2_minimal_iam_credentials_rest.h @@ -25,6 +25,7 @@ #include "google/cloud/status_or.h" #include #include +#include #include namespace google { @@ -107,8 +108,10 @@ class MinimalIamCredentialsRestStub : public MinimalIamCredentialsRest { } private: - std::string MakeRequestPath(GenerateAccessTokenRequest const& request) const; - StatusOr AllowedLocationsHelper(std::string path); + StatusOr MakeRequestPath( + GenerateAccessTokenRequest const& request) const; + StatusOr AllowedLocationsHelper( + std::string_view relative_path); std::shared_ptr credentials_; Options options_; diff --git a/google/cloud/internal/oauth2_minimal_iam_credentials_rest_test.cc b/google/cloud/internal/oauth2_minimal_iam_credentials_rest_test.cc index 1652d9fad160b..d69e078ea5e12 100644 --- a/google/cloud/internal/oauth2_minimal_iam_credentials_rest_test.cc +++ b/google/cloud/internal/oauth2_minimal_iam_credentials_rest_test.cc @@ -321,6 +321,8 @@ TEST(MinimalIamCredentialsRestTest, GenerateAccessTokenWithUniverseDomain) { TEST(MinimalIamCredentialsRestTest, GenerateAccessTokenCredentialFailure) { auto mock_credentials = std::make_shared(); + EXPECT_CALL(*mock_credentials, universe_domain) + .WillOnce(Return(StatusOr{"googleapis.com"})); EXPECT_CALL(*mock_credentials, GetToken).WillOnce([] { return Status(StatusCode::kPermissionDenied, "Permission Denied"); }); @@ -329,10 +331,33 @@ TEST(MinimalIamCredentialsRestTest, GenerateAccessTokenCredentialFailure) { auto stub = MinimalIamCredentialsRestStub( std::move(mock_credentials), {}, mock_client_factory.AsStdFunction()); GenerateAccessTokenRequest request; - auto access_token = stub.GenerateAccessToken(request); + StatusOr access_token = stub.GenerateAccessToken(request); EXPECT_THAT(access_token, StatusIs(StatusCode::kPermissionDenied)); } +TEST(MinimalIamCredentialsRestTest, GenerateAccessTokenUniverseDomainFailure) { + struct TestOption { + using Type = std::string; + }; + auto mock_credentials = std::make_shared(); + EXPECT_CALL(*mock_credentials, universe_domain) + .WillOnce([](Options const& options) -> StatusOr { + EXPECT_THAT(options.get(), Eq("forwarded")); + return Status(StatusCode::kUnavailable, "MDS unavailable"); + }); + EXPECT_CALL(*mock_credentials, GetToken).Times(0); + MockHttpClientFactory mock_client_factory; + EXPECT_CALL(mock_client_factory, Call).Times(0); + auto stub = MinimalIamCredentialsRestStub( + std::move(mock_credentials), Options{}.set("forwarded"), + mock_client_factory.AsStdFunction()); + GenerateAccessTokenRequest request; + request.service_account = "foo@somewhere.com"; + StatusOr access_token = stub.GenerateAccessToken(request); + EXPECT_THAT(access_token, + StatusIs(StatusCode::kUnavailable, HasSubstr("MDS unavailable"))); +} + TEST(MinimalIamCredentialsRestTest, GetUniverseDomainFromCredentials) { auto constexpr kExpectedUniverseDomain = "my-ud.net"; auto mock_credentials = std::make_shared(); @@ -364,6 +389,70 @@ TEST(MinimalIamCredentialsRestTest, AllowedLocationsAuthorizationFailure) { EXPECT_THAT(access_token, StatusIs(StatusCode::kPermissionDenied)); } +TEST(MinimalIamCredentialsRestTest, + ServiceAccountAllowedLocationsUniverseDomainFailure) { + struct TestOption { + using Type = std::string; + }; + auto mock_credentials = std::make_shared(); + EXPECT_CALL(*mock_credentials, universe_domain) + .WillOnce([](Options const& options) -> StatusOr { + EXPECT_THAT(options.get(), Eq("forwarded")); + return Status(StatusCode::kUnavailable, "MDS unavailable"); + }); + EXPECT_CALL(*mock_credentials, GetToken).Times(0); + MockHttpClientFactory mock_client_factory; + EXPECT_CALL(mock_client_factory, Call).Times(0); + auto stub = MinimalIamCredentialsRestStub( + std::move(mock_credentials), Options{}.set("forwarded"), + mock_client_factory.AsStdFunction()); + ServiceAccountAllowedLocationsRequest request; + request.service_account_email = "foo@somewhere.com"; + StatusOr allowed_locations = + stub.AllowedLocations(request); + EXPECT_THAT(allowed_locations, + StatusIs(StatusCode::kUnavailable, HasSubstr("MDS unavailable"))); +} + +TEST(MinimalIamCredentialsRestTest, + WorkloadIdentityAllowedLocationsUniverseDomainFailure) { + auto mock_credentials = std::make_shared(); + EXPECT_CALL(*mock_credentials, universe_domain) + .WillOnce(Return(Status(StatusCode::kUnavailable, "MDS unavailable"))); + EXPECT_CALL(*mock_credentials, GetToken).Times(0); + MockHttpClientFactory mock_client_factory; + EXPECT_CALL(mock_client_factory, Call).Times(0); + auto stub = + MinimalIamCredentialsRestStub(std::move(mock_credentials), Options{}, + mock_client_factory.AsStdFunction()); + WorkloadIdentityAllowedLocationsRequest request; + request.project_id = "my-project"; + request.pool_id = "my-pool"; + StatusOr allowed_locations = + stub.AllowedLocations(request); + EXPECT_THAT(allowed_locations, + StatusIs(StatusCode::kUnavailable, HasSubstr("MDS unavailable"))); +} + +TEST(MinimalIamCredentialsRestTest, + WorkforceIdentityAllowedLocationsUniverseDomainFailure) { + auto mock_credentials = std::make_shared(); + EXPECT_CALL(*mock_credentials, universe_domain) + .WillOnce(Return(Status(StatusCode::kUnavailable, "MDS unavailable"))); + EXPECT_CALL(*mock_credentials, GetToken).Times(0); + MockHttpClientFactory mock_client_factory; + EXPECT_CALL(mock_client_factory, Call).Times(0); + auto stub = + MinimalIamCredentialsRestStub(std::move(mock_credentials), Options{}, + mock_client_factory.AsStdFunction()); + WorkforceIdentityAllowedLocationsRequest request; + request.pool_id = "my-pool"; + StatusOr allowed_locations = + stub.AllowedLocations(request); + EXPECT_THAT(allowed_locations, + StatusIs(StatusCode::kUnavailable, HasSubstr("MDS unavailable"))); +} + // TODO(#16177): Update these tests to compile with MSVC. #ifndef _WIN32