diff --git a/src/core/credentials/call/regional_access_boundary_fetcher.cc b/src/core/credentials/call/regional_access_boundary_fetcher.cc index 25d5f3f6ed199..600549638da0c 100644 --- a/src/core/credentials/call/regional_access_boundary_fetcher.cc +++ b/src/core/credentials/call/regional_access_boundary_fetcher.cc @@ -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); } @@ -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); } diff --git a/test/core/credentials/call/regional_access_boundary_fetcher_test.cc b/test/core/credentials/call/regional_access_boundary_fetcher_test.cc index b2f8c80599a7a..2bed0099e2210 100644 --- a/test/core/credentials/call/regional_access_boundary_fetcher_test.cc +++ b/test/core/credentials/call/regional_access_boundary_fetcher_test.cc @@ -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") { @@ -830,41 +831,40 @@ TEST_F(EmailFetcherTest, CustomEmailsValidation) { bool should_fetch_rab; }; std::vector 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(fuzzing_event_engine_); email_fetcher->StartEmailFetch(); ExecCtx::Get()->Flush(); - + auto metadata = arena_->MakePooled(); 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 value = metadata->GetStringValue("x-allowed-locations", &buffer); if (tc.should_fetch_rab) { auto metadata2 = arena_->MakePooled(); - 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 value2 = @@ -874,10 +874,12 @@ TEST_F(EmailFetcherTest, CustomEmailsValidation) { } else { EXPECT_FALSE(value.has_value()) << "Failed for email: " << tc.email; auto metadata2 = arena_->MakePooled(); - 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 value2 =