Skip to content

Automated fix for refs/heads/RegionalAccessBoundaryFetcher #59

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

Open
github-actions wants to merge 1 commit into
base: RegionalAccessBoundaryFetcher
Choose a base branch
from
+28 −24
Open

Automated fix for refs/heads/RegionalAccessBoundaryFetcher #59

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
6 changes: 4 additions & 2 deletions src/core/credentials/call/regional_access_boundary_fetcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@ void RegionalAccessBoundaryFetcher::Request::OnResponse(
grpc_error_handle error) {
bool success = false;
std::string encoded_locations;
absl::string_view response_body = ""; // NOLINT(readability-redundant-string-init)
absl::string_view response_body =
""; // NOLINT(readability-redundant-string-init)
if (response_.body != nullptr) {
response_body = absl::string_view(response_.body, response_.body_length);
}
Expand Down Expand Up @@ -307,7 +308,8 @@ class EmailFetcher::EmailRequest final
}

void OnResponse(grpc_error_handle error) {
absl::string_view response_body = ""; // NOLINT(readability-redundant-string-init)
absl::string_view response_body =
""; // NOLINT(readability-redundant-string-init)
if (response_.body != nullptr) {
response_body = absl::string_view(response_.body, response_.body_length);
}
Expand Down
46 changes: 24 additions & 22 deletions test/core/credentials/call/regional_access_boundary_fetcher_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,9 @@ TEST_F(EmailFetcherTest, EmailWithWhitespaceTrimmedAndSucceeds) {
}

std::string g_custom_email;
int httpcli_get_custom_email(const grpc_http_request* /*request*/, const URI& uri,
Timestamp /*deadline*/, grpc_closure* on_done,
int httpcli_get_custom_email(const grpc_http_request* /*request*/,
const URI& uri, Timestamp /*deadline*/,
grpc_closure* on_done,
grpc_http_response* response) {
if (uri.path() ==
"/computeMetadata/v1/instance/service-accounts/default/email") {
Expand All @@ -830,41 +831,40 @@ TEST_F(EmailFetcherTest, CustomEmailsValidation) {
bool should_fetch_rab;
};
std::vector<TestCase> test_cases = {
{"foo@bar.com", true},
{"foo@bar", false},
{"foo@bar@baz.com", false},
{"@bar.com", false},
{"foo@bar.com.", true},
{"foo@.bar.com", true},
{"foo@bar..com", true},
{"foo@bar.", false},
{"foo@bar.com", true}, {"foo@bar", false},
{"foo@bar@baz.com", false}, {"@bar.com", false},
{"foo@bar.com.", true}, {"foo@.bar.com", true},
{"foo@bar..com", true}, {"foo@bar.", false},
};
for (const auto& tc : test_cases) {
ExecCtx exec_ctx;
g_custom_email = tc.email;
HttpRequest::SetOverride(httpcli_get_custom_email, nullptr, nullptr);

auto email_fetcher = MakeRefCounted<EmailFetcher>(fuzzing_event_engine_);
email_fetcher->StartEmailFetch();
ExecCtx::Get()->Flush();

auto metadata = arena_->MakePooled<ClientMetadata>();
metadata->Append("authorization", Slice::FromStaticString("Bearer token"),
[](absl::string_view, const Slice&) { abort(); });
metadata->Append(":authority", Slice::FromStaticString("foo.googleapis.com"),
metadata->Append(":authority",
Slice::FromStaticString("foo.googleapis.com"),
[](absl::string_view, const Slice&) { abort(); });
email_fetcher->Fetch("token", *metadata);
ExecCtx::Get()->Flush();

std::string buffer;
std::optional<absl::string_view> value =
metadata->GetStringValue("x-allowed-locations", &buffer);
if (tc.should_fetch_rab) {
auto metadata2 = arena_->MakePooled<ClientMetadata>();
metadata2->Append("authorization", Slice::FromStaticString("Bearer token"),
[](absl::string_view, const Slice&) { abort(); });
metadata2->Append(":authority", Slice::FromStaticString("foo.googleapis.com"),
[](absl::string_view, const Slice&) { abort(); });
metadata2->Append("authorization",
Slice::FromStaticString("Bearer token"),
[](absl::string_view, const Slice&) { abort(); });
metadata2->Append(":authority",
Slice::FromStaticString("foo.googleapis.com"),
[](absl::string_view, const Slice&) { abort(); });
email_fetcher->Fetch("token", *metadata2);
std::string buffer2;
std::optional<absl::string_view> value2 =
Expand All @@ -874,10 +874,12 @@ TEST_F(EmailFetcherTest, CustomEmailsValidation) {
} else {
EXPECT_FALSE(value.has_value()) << "Failed for email: " << tc.email;
auto metadata2 = arena_->MakePooled<ClientMetadata>();
metadata2->Append("authorization", Slice::FromStaticString("Bearer token"),
[](absl::string_view, const Slice&) { abort(); });
metadata2->Append(":authority", Slice::FromStaticString("foo.googleapis.com"),
[](absl::string_view, const Slice&) { abort(); });
metadata2->Append("authorization",
Slice::FromStaticString("Bearer token"),
[](absl::string_view, const Slice&) { abort(); });
metadata2->Append(":authority",
Slice::FromStaticString("foo.googleapis.com"),
[](absl::string_view, const Slice&) { abort(); });
email_fetcher->Fetch("token", *metadata2);
std::string buffer2;
std::optional<absl::string_view> value2 =
Expand Down