grpc 1.75.0 → 1.78.1

data/src/core/credentials/call/external/file_external_account_credentials.h

@@ -23,10 +23,10 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/external/external_account_credentials.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/external/url_external_account_credentials.cc

@@ -27,21 +27,21 @@
 #include <memory>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/str_split.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/transport/error_utils.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/http_client/parser.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/str_split.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/external/url_external_account_credentials.h

@@ -24,13 +24,13 @@
 #include <string>
 #include <vector>
 
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/external/external_account_credentials.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/uri.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/gcp_service_account_identity/gcp_service_account_identity_credentials.cc

@@ -16,19 +16,20 @@
 
 #include "src/core/credentials/call/gcp_service_account_identity/gcp_service_account_identity_credentials.h"
 
-#include "absl/functional/any_invocable.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/str_cat.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata.h"
 #include "src/core/credentials/call/jwt_util.h"
+#include "src/core/credentials/call/token_fetcher/token_fetcher_credentials.h"
 #include "src/core/credentials/transport/transport_credentials.h"
 #include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/transport/status_conversion.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/status_helper.h"
 #include "src/core/util/uri.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
@@ -36,78 +37,30 @@ namespace grpc_core {
 // JwtTokenFetcherCallCredentials
 //
 
-// State held for a pending HTTP request.
-class JwtTokenFetcherCallCredentials::HttpFetchRequest final
-    : public TokenFetcherCredentials::FetchRequest {
- public:
-  HttpFetchRequest(
-      JwtTokenFetcherCallCredentials* creds, Timestamp deadline,
-      absl::AnyInvocable<
-          void(absl::StatusOr<RefCountedPtr<TokenFetcherCredentials::Token>>)>
-          on_done)
-      : on_done_(std::move(on_done)) {
-    GRPC_CLOSURE_INIT(&on_http_response_, OnHttpResponse, this, nullptr);
-    Ref().release();  // Ref held by HTTP request callback.
-    http_request_ = creds->StartHttpRequest(creds->pollent(), deadline,
-                                            &response_, &on_http_response_);
-  }
-
-  ~HttpFetchRequest() override { grpc_http_response_destroy(&response_); }
-
-  void Orphan() override {
-    http_request_.reset();
-    Unref();
-  }
-
- private:
-  static void OnHttpResponse(void* arg, grpc_error_handle error) {
-    RefCountedPtr<HttpFetchRequest> self(static_cast<HttpFetchRequest*>(arg));
-    if (!error.ok()) {
-      // TODO(roth): It shouldn't be necessary to explicitly set the
-      // status to UNAVAILABLE here.  Once the HTTP client code is
-      // migrated to stop using legacy grpc_error APIs to create
-      // statuses, we should be able to just propagate the status as-is.
-      self->on_done_(absl::UnavailableError(StatusToString(error)));
-      return;
-    }
-    if (self->response_.status != 200) {
-      grpc_status_code status_code =
-          grpc_http2_status_to_grpc_status(self->response_.status);
-      if (status_code != GRPC_STATUS_UNAVAILABLE) {
-        status_code = GRPC_STATUS_UNAUTHENTICATED;
-      }
-      self->on_done_(absl::Status(static_cast<absl::StatusCode>(status_code),
-                                  absl::StrCat("JWT fetch failed with status ",
-                                               self->response_.status)));
-      return;
-    }
-    // Return token object.
-    absl::string_view body(self->response_.body, self->response_.body_length);
-    auto expiration_time = GetJwtExpirationTime(body);
-    if (!expiration_time.ok()) {
-      self->on_done_(expiration_time.status());
-      return;
-    }
-    self->on_done_(MakeRefCounted<Token>(
-        Slice::FromCopiedString(absl::StrCat("Bearer ", body)),
-        *expiration_time));
-  }
-
-  OrphanablePtr<HttpRequest> http_request_;
-  grpc_closure on_http_response_;
-  grpc_http_response response_;
-  absl::AnyInvocable<void(
-      absl::StatusOr<RefCountedPtr<TokenFetcherCredentials::Token>>)>
-      on_done_;
-};
-
 OrphanablePtr<TokenFetcherCredentials::FetchRequest>
 JwtTokenFetcherCallCredentials::FetchToken(
     Timestamp deadline,
     absl::AnyInvocable<
         void(absl::StatusOr<RefCountedPtr<TokenFetcherCredentials::Token>>)>
         on_done) {
-  return MakeOrphanable<HttpFetchRequest>(this, deadline, std::move(on_done));
+  return MakeOrphanable<HttpTokenFetcherCredentials::HttpFetchRequest>(
+      this, deadline,
+      [on_done = std::move(on_done)](
+          absl::StatusOr<grpc_http_response> response) mutable {
+        if (!response.ok()) {
+          on_done(response.status());
+          return;
+        }
+        absl::string_view body(response->body, response->body_length);
+        auto expiration_time = GetJwtExpirationTime(body);
+        if (!expiration_time.ok()) {
+          on_done(expiration_time.status());
+          return;
+        }
+        on_done(MakeRefCounted<Token>(
+            Slice::FromCopiedString(absl::StrCat("Bearer ", body)),
+            *expiration_time));
+      });
 }
 
 //

data/src/core/credentials/call/gcp_service_account_identity/gcp_service_account_identity_credentials.h

@@ -40,20 +40,13 @@ namespace grpc_core {
 
 // A base class for JWT token fetching credentials.
 // Subclasses must implement StartHttpRequest().
-class JwtTokenFetcherCallCredentials : public TokenFetcherCredentials {
+class JwtTokenFetcherCallCredentials : public HttpTokenFetcherCredentials {
  public:
   OrphanablePtr<FetchRequest> FetchToken(
       Timestamp deadline,
       absl::AnyInvocable<
           void(absl::StatusOr<RefCountedPtr<TokenFetcherCredentials::Token>>)>
           on_done) final;
-
- private:
-  class HttpFetchRequest;
-
-  virtual OrphanablePtr<HttpRequest> StartHttpRequest(
-      grpc_polling_entity* pollent, Timestamp deadline,
-      grpc_http_response* response, grpc_closure* on_complete) = 0;
 };
 
 // GCP service account identity call credentials.

data/src/core/credentials/call/iam/iam_credentials.cc

@@ -24,14 +24,14 @@
 #include <memory>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/ref_counted_ptr.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
 
 grpc_core::ArenaPromise<absl::StatusOr<grpc_core::ClientMetadataHandle>>
 grpc_google_iam_credentials::GetRequestMetadata(
@@ -69,9 +69,9 @@ grpc_call_credentials* grpc_google_iam_credentials_create(
   GRPC_TRACE_LOG(api, INFO) << "grpc_iam_credentials_create(token=" << token
                             << ", authority_selector=" << authority_selector
                             << ", reserved=" << reserved << ")";
-  CHECK_EQ(reserved, nullptr);
-  CHECK_NE(token, nullptr);
-  CHECK_NE(authority_selector, nullptr);
+  GRPC_CHECK_EQ(reserved, nullptr);
+  GRPC_CHECK_NE(token, nullptr);
+  GRPC_CHECK_NE(authority_selector, nullptr);
   return grpc_core::MakeRefCounted<grpc_google_iam_credentials>(
              token, authority_selector)
       .release();

data/src/core/credentials/call/iam/iam_credentials.h

@@ -26,13 +26,13 @@
 #include <optional>
 #include <string>
 
-#include "absl/status/statusor.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/lib/promise/arena_promise.h"
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/transport/transport.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/useful.h"
+#include "absl/status/statusor.h"
 
 class grpc_google_iam_credentials : public grpc_call_credentials {
  public:

data/src/core/credentials/call/json_util.cc

@@ -26,8 +26,8 @@
 #include <string>
 #include <utility>
 
-#include "absl/strings/str_cat.h"
 #include "src/core/lib/iomgr/error.h"
+#include "absl/strings/str_cat.h"
 
 const char* grpc_json_get_string_property(const grpc_core::Json& json,
                                           const char* prop_name,

data/src/core/credentials/call/jwt/json_token.cc

@@ -35,15 +35,15 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/escaping.h"
 #include "src/core/credentials/call/json_util.h"
 #include "src/core/lib/iomgr/error.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/escaping.h"
 
 using grpc_core::Json;
 
@@ -221,8 +221,8 @@ static char* dot_concat_and_free_strings(char* str1, char* str2) {
   *(current++) = '.';
   memcpy(current, str2, str2_len);
   current += str2_len;
-  CHECK(current >= result);
-  CHECK((uintptr_t)(current - result) == result_len);
+  GRPC_CHECK(current >= result);
+  GRPC_CHECK((uintptr_t)(current - result) == result_len);
   *current = '\0';
   gpr_free(str1);
   gpr_free(str2);

data/src/core/credentials/call/jwt/jwt_credentials.cc

@@ -30,20 +30,20 @@
 #include <string>
 #include <utility>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/credentials/call/call_creds_util.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/promise/promise.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_reader.h"
 #include "src/core/util/json/json_writer.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/uri.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 
 using grpc_core::Json;
 
@@ -161,7 +161,7 @@ grpc_call_credentials* grpc_service_account_jwt_access_credentials_create(
             << " }, reserved=" << reserved << ")";
     gpr_free(clean_json);
   }
-  CHECK_EQ(reserved, nullptr);
+  GRPC_CHECK_EQ(reserved, nullptr);
   grpc_core::ExecCtx exec_ctx;
   return grpc_service_account_jwt_access_credentials_create_from_auth_json_key(
              grpc_auth_json_key_create_from_string(json_key), token_lifetime)

data/src/core/credentials/call/jwt/jwt_credentials.h

@@ -29,10 +29,6 @@
 #include <optional>
 #include <string>
 
-#include "absl/status/statusor.h"
-#include "absl/strings/str_format.h"
-#include "absl/strings/string_view.h"
-#include "absl/time/time.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/credentials/call/jwt/json_token.h"
 #include "src/core/lib/promise/arena_promise.h"
@@ -41,6 +37,10 @@
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/unique_type_name.h"
 #include "src/core/util/useful.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/str_format.h"
+#include "absl/strings/string_view.h"
+#include "absl/time/time.h"
 
 class grpc_service_account_jwt_access_credentials
     : public grpc_call_credentials {

data/src/core/credentials/call/jwt/jwt_verifier.cc

@@ -45,12 +45,6 @@
 #include <grpc/support/string_util.h>
 #include <grpc/support/time.h>
 
-#include "absl/log/check.h"
-#include "absl/log/log.h"
-#include "absl/status/status.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/call_credentials.h"  // IWYU pragma: keep
 #include "src/core/credentials/transport/transport_credentials.h"  // IWYU pragma: keep
 #include "src/core/lib/iomgr/closure.h"
@@ -61,6 +55,7 @@
 #include "src/core/lib/slice/slice.h"
 #include "src/core/lib/slice/slice_internal.h"
 #include "src/core/tsi/ssl_types.h"
+#include "src/core/util/grpc_check.h"
 #include "src/core/util/http_client/httpcli.h"
 #include "src/core/util/http_client/httpcli_ssl_credentials.h"
 #include "src/core/util/http_client/parser.h"
@@ -70,6 +65,11 @@
 #include "src/core/util/orphanable.h"
 #include "src/core/util/string.h"
 #include "src/core/util/uri.h"
+#include "absl/log/log.h"
+#include "absl/status/status.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/string_view.h"
 
 using grpc_core::Json;
 
@@ -311,7 +311,7 @@ grpc_jwt_verifier_status grpc_jwt_claims_check(const grpc_jwt_claims* claims,
   gpr_timespec skewed_now;
   int audience_ok;
 
-  CHECK_NE(claims, nullptr);
+  GRPC_CHECK_NE(claims, nullptr);
 
   skewed_now =
       gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), grpc_jwt_verifier_clock_skew);
@@ -455,7 +455,7 @@ static EVP_PKEY* extract_pkey_from_x509(const char* x509_str) {
   EVP_PKEY* result = nullptr;
   BIO* bio = BIO_new(BIO_s_mem());
   size_t len = strlen(x509_str);
-  CHECK_LT(len, static_cast<size_t>(INT_MAX));
+  GRPC_CHECK_LT(len, static_cast<size_t>(INT_MAX));
   BIO_write(bio, x509_str, static_cast<int>(len));
   x509 = PEM_read_bio_X509(bio, nullptr, nullptr, nullptr);
   if (x509 == nullptr) {
@@ -526,8 +526,8 @@ static EVP_PKEY* pkey_from_jwk(const Json& json, const char* kty) {
   BIGNUM* tmp_e = nullptr;
   Json::Object::const_iterator it;
 
-  CHECK(json.type() == Json::Type::kObject);
-  CHECK_NE(kty, nullptr);
+  GRPC_CHECK(json.type() == Json::Type::kObject);
+  GRPC_CHECK_NE(kty, nullptr);
   if (strcmp(kty, "RSA") != 0) {
     LOG(ERROR) << "Unsupported key type " << kty;
     goto end;
@@ -652,7 +652,7 @@ static int verify_jwt_signature(EVP_PKEY* key, const char* alg,
   const EVP_MD* md = evp_md_from_alg(alg);
   int result = 0;
 
-  CHECK_NE(md, nullptr);  // Checked before.
+  GRPC_CHECK_NE(md, nullptr);  // Checked before.
   if (md_ctx == nullptr) {
     LOG(ERROR) << "Could not create EVP_MD_CTX.";
     goto end;
@@ -791,7 +791,7 @@ static email_key_mapping* verifier_get_mapping(grpc_jwt_verifier* v,
 static void verifier_put_mapping(grpc_jwt_verifier* v, const char* email_domain,
                                  const char* key_url_prefix) {
   email_key_mapping* mapping = verifier_get_mapping(v, email_domain);
-  CHECK(v->num_mappings < v->allocated_mappings);
+  GRPC_CHECK(v->num_mappings < v->allocated_mappings);
   if (mapping != nullptr) {
     gpr_free(mapping->key_url_prefix);
     mapping->key_url_prefix = gpr_strdup(key_url_prefix);
@@ -800,7 +800,7 @@ static void verifier_put_mapping(grpc_jwt_verifier* v, const char* email_domain,
   v->mappings[v->num_mappings].email_domain = gpr_strdup(email_domain);
   v->mappings[v->num_mappings].key_url_prefix = gpr_strdup(key_url_prefix);
   v->num_mappings++;
-  CHECK(v->num_mappings <= v->allocated_mappings);
+  GRPC_CHECK(v->num_mappings <= v->allocated_mappings);
 }
 
 // Very non-sophisticated way to detect an email address. Should be good
@@ -812,7 +812,7 @@ const char* grpc_jwt_issuer_email_domain(const char* issuer) {
   if (*email_domain == '\0') return nullptr;
   const char* dot = strrchr(email_domain, '.');
   if (dot == nullptr || dot == email_domain) return email_domain;
-  CHECK(dot > email_domain);
+  GRPC_CHECK(dot > email_domain);
   // There may be a subdomain, we just want the domain.
   dot = static_cast<const char*>(
       gpr_memrchr(email_domain, '.', static_cast<size_t>(dot - email_domain)));
@@ -833,7 +833,8 @@ static void retrieve_key_and_verify(verifier_cb_ctx* ctx) {
   char* path;
   absl::StatusOr<grpc_core::URI> uri;
 
-  CHECK(ctx != nullptr && ctx->header != nullptr && ctx->claims != nullptr);
+  GRPC_CHECK(ctx != nullptr && ctx->header != nullptr &&
+             ctx->claims != nullptr);
   iss = ctx->claims->iss;
   if (ctx->header->kid == nullptr) {
     LOG(ERROR) << "Missing kid in jose header.";
@@ -852,7 +853,7 @@ static void retrieve_key_and_verify(verifier_cb_ctx* ctx) {
   email_domain = grpc_jwt_issuer_email_domain(iss);
   if (email_domain != nullptr) {
     email_key_mapping* mapping;
-    CHECK_NE(ctx->verifier, nullptr);
+    GRPC_CHECK_NE(ctx->verifier, nullptr);
     mapping = verifier_get_mapping(ctx->verifier, email_domain);
     if (mapping == nullptr) {
       LOG(ERROR) << "Missing mapping for issuer email.";
@@ -919,8 +920,8 @@ void grpc_jwt_verifier_verify(grpc_jwt_verifier* verifier,
   Json json;
   std::string signature_str;
 
-  CHECK(verifier != nullptr && jwt != nullptr && audience != nullptr &&
-        cb != nullptr);
+  GRPC_CHECK(verifier != nullptr && jwt != nullptr && audience != nullptr &&
+             cb != nullptr);
   dot = strchr(cur, '.');
   if (dot == nullptr) goto error;
   json = parse_json_part_from_jwt(cur, static_cast<size_t>(dot - cur));

data/src/core/credentials/call/jwt_token_file/jwt_token_file_call_credentials.cc

@@ -16,10 +16,10 @@
 
 #include "src/core/credentials/call/jwt_token_file/jwt_token_file_call_credentials.h"
 
-#include "absl/status/status.h"
-#include "absl/strings/str_cat.h"
 #include "src/core/credentials/call/jwt_util.h"
 #include "src/core/util/load_file.h"
+#include "absl/status/status.h"
+#include "absl/strings/str_cat.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/jwt_token_file/jwt_token_file_call_credentials.h

@@ -22,15 +22,15 @@
 
 #include <string>
 
-#include "absl/functional/any_invocable.h"
-#include "absl/status/statusor.h"
-#include "absl/strings/string_view.h"
 #include "src/core/credentials/call/call_credentials.h"
 #include "src/core/credentials/call/token_fetcher/token_fetcher_credentials.h"
 #include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/time.h"
 #include "src/core/util/unique_type_name.h"
+#include "absl/functional/any_invocable.h"
+#include "absl/status/statusor.h"
+#include "absl/strings/string_view.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/jwt_util.cc

@@ -21,13 +21,13 @@
 #include <string>
 #include <vector>
 
-#include "absl/status/status.h"
-#include "absl/strings/escaping.h"
-#include "absl/strings/str_split.h"
 #include "src/core/util/json/json.h"
 #include "src/core/util/json/json_args.h"
 #include "src/core/util/json/json_object_loader.h"
 #include "src/core/util/json/json_reader.h"
+#include "absl/status/status.h"
+#include "absl/strings/escaping.h"
+#include "absl/strings/str_split.h"
 
 namespace grpc_core {
 

data/src/core/credentials/call/jwt_util.h

@@ -17,9 +17,9 @@
 #ifndef GRPC_SRC_CORE_CREDENTIALS_CALL_JWT_UTIL_H
 #define GRPC_SRC_CORE_CREDENTIALS_CALL_JWT_UTIL_H
 
+#include "src/core/util/time.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
-#include "src/core/util/time.h"
 
 namespace grpc_core {