Skip to content
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

feat(rest): support generateIdToken in impersonation url #14853

Merged
merged 1 commit into from
Nov 22, 2024
Merged

feat(rest): support generateIdToken in impersonation url #14853

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
27 changes: 8 additions & 19 deletions google/cloud/internal/oauth2_impersonate_service_account_credentials.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,32 +67,21 @@ ParseImpersonatedServiceAccountCredentials(std::string const& content,
}
// We strip the service account from the path URL.
auto url = it->get<std::string>();
auto colon = url.rfind(':');
if (colon == std::string::npos) {
return internal::InvalidArgumentError(
"Malformed `service_account_impersonation_url` field contents on data "
"from " +
source,
GCP_ERROR_INFO());
}
if (url.substr(colon) != ":generateAccessToken") {
// While `generateIdToken` is a valid RPC, we do not currently support ID
// token flow. So we might as well error when parsing the credentials.
return internal::InvalidArgumentError(
"Only access token authentication is supported for impersonated "
"service accounts from " +
source,
GCP_ERROR_INFO());
}
auto slash = url.rfind('/', colon);
auto slash = url.rfind('/');
if (slash == std::string::npos) {
return internal::InvalidArgumentError(
"Malformed `service_account_impersonation_url` field contents on data "
"from " +
source,
GCP_ERROR_INFO());
}
info.service_account = std::string{url.substr(slash + 1, colon - slash - 1)};

// In the url, after the last slash, it is in the format of
// `service_account[:action]`
auto service_account_action = url.substr(slash + 1);
auto colon = service_account_action.rfind(':');
auto end = colon == std::string::npos ? service_account_action.size() : colon;
info.service_account = service_account_action.substr(0, end);

it = credentials.find("delegates");
if (it != credentials.end()) {
Expand Down
26 changes: 26 additions & 0 deletions google/cloud/internal/oauth2_impersonate_service_account_credentials_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,19 @@ auto constexpr kFullValidConfig = R"""({
"type": "impersonated_service_account"
})""";

auto constexpr kFullValidConfigNoAction = R"""({
"service_account_impersonation_url": "https://iamcredentials.googleapis.com/v1/projects/-/serviceAccounts/sa3@developer.gserviceaccount.com",
"delegates": [
"sa1@developer.gserviceaccount.com",
"sa2@developer.gserviceaccount.com"
],
"quota_project_id": "my-project",
"source_credentials": {
"type": "authorized_user"
},
"type": "impersonated_service_account"
})""";

TEST(ParseImpersonatedServiceAccountCredentials, Success) {
auto actual =
ParseImpersonatedServiceAccountCredentials(kFullValidConfig, "test-data");
Expand Down Expand Up @@ -146,6 +159,19 @@ TEST(ImpersonateServiceAccountCredentialsTest, Basic) {
ASSERT_THAT(token, StatusIs(StatusCode::kPermissionDenied));
}

TEST(ParseImpersonatedServiceAccountCredentialsWithoutAction, Success) {
auto actual = ParseImpersonatedServiceAccountCredentials(
kFullValidConfigNoAction, "test-data");
ASSERT_STATUS_OK(actual);
EXPECT_EQ(actual->service_account, "sa3@developer.gserviceaccount.com");
EXPECT_THAT(actual->delegates,
ElementsAre("sa1@developer.gserviceaccount.com",
"sa2@developer.gserviceaccount.com"));
EXPECT_THAT(actual->quota_project_id, Optional<std::string>("my-project"));
EXPECT_THAT(actual->source_credentials,
AllOf(HasSubstr("type"), HasSubstr("authorized_user")));
}

} // namespace
GOOGLE_CLOUD_CPP_INLINE_NAMESPACE_END
} // namespace oauth2_internal
Expand Down
Loading