grpc 1.74.0 → 1.75.0.pre1

data/src/core/util/windows/thd.cc

@@ -175,8 +175,6 @@ Thread::Thread(const char* /* thd_name */, void (*thd_body)(void* arg),
 
 }  // namespace grpc_core
 
-gpr_thd_id gpr_thd_currentid(void) {
-  return reinterpret_cast<gpr_thd_id>(g_thd_info);
-}
+gpr_thd_id gpr_thd_currentid(void) { return GetCurrentThreadId(); }
 
 #endif  // GPR_WINDOWS

data/src/core/util/work_serializer.cc

@@ -187,7 +187,7 @@ void WorkSerializer::WorkSerializerImpl::Run(
 
 // Implementation of EventEngine::Closure::Run - our actual work loop
 void WorkSerializer::WorkSerializerImpl::Run() {
-  GRPC_LATENT_SEE_PARENT_SCOPE("WorkSerializer::Run");
+  GRPC_LATENT_SEE_SCOPE("WorkSerializer::Run");
   flow_.End();
   // TODO(ctiller): remove these when we can deprecate ExecCtx
   ExecCtx exec_ctx;

data/src/core/xds/grpc/file_watcher_certificate_provider_factory.cc

@@ -31,6 +31,7 @@
 #include "src/core/config/core_configuration.h"
 #include "src/core/credentials/transport/tls/grpc_tls_certificate_provider.h"
 #include "src/core/util/down_cast.h"
+#include "src/core/util/env.h"
 
 namespace grpc_core {
 
@@ -38,6 +39,14 @@ namespace {
 
 constexpr absl::string_view kFileWatcherPlugin = "file_watcher";
 
+bool SpiffeBundleMapEnabled() {
+  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_MTLS_SPIFFE");
+  if (!value.has_value()) return false;
+  bool parsed_value;
+  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
+  return parse_succeeded && parsed_value;
+}
+
 }  // namespace
 
 //
@@ -63,6 +72,10 @@ std::string FileWatcherCertificateProviderFactory::Config::ToString() const {
     parts.push_back(
         absl::StrFormat("ca_certificate_file=\"%s\", ", root_cert_file_));
   }
+  if (!spiffe_bundle_map_file_.empty()) {
+    parts.push_back(absl::StrFormat("spiffe_bundle_map_file=\"%s\", ",
+                                    spiffe_bundle_map_file_));
+  }
   parts.push_back(
       absl::StrFormat("refresh_interval=%ldms}", refresh_interval_.millis()));
   return absl::StrJoin(parts, "");
@@ -75,6 +88,8 @@ FileWatcherCertificateProviderFactory::Config::JsonLoader(const JsonArgs&) {
           .OptionalField("certificate_file", &Config::identity_cert_file_)
           .OptionalField("private_key_file", &Config::private_key_file_)
           .OptionalField("ca_certificate_file", &Config::root_cert_file_)
+          .OptionalField("spiffe_bundle_map_file",
+                         &Config::spiffe_bundle_map_file_)
           .OptionalField("refresh_interval", &Config::refresh_interval_)
           .Finish();
   return loader;
@@ -88,11 +103,22 @@ void FileWatcherCertificateProviderFactory::Config::JsonPostLoad(
         "fields \"certificate_file\" and \"private_key_file\" must be both set "
         "or both unset");
   }
-  if ((json.object().find("certificate_file") == json.object().end()) &&
-      (json.object().find("ca_certificate_file") == json.object().end())) {
-    errors->AddError(
-        "at least one of \"certificate_file\" and \"ca_certificate_file\" must "
-        "be specified");
+  if (SpiffeBundleMapEnabled()) {
+    if (json.object().find("certificate_file") == json.object().end() &&
+        json.object().find("ca_certificate_file") == json.object().end() &&
+        json.object().find("spiffe_bundle_map_file") == json.object().end()) {
+      errors->AddError(
+          "at least one of \"certificate_file\", \"ca_certificate_file\", and "
+          "\"spiffe_bundle_map_file\" must be specified");
+    }
+  } else {
+    spiffe_bundle_map_file_ = "";
+    if ((json.object().find("certificate_file") == json.object().end()) &&
+        (json.object().find("ca_certificate_file") == json.object().end())) {
+      errors->AddError(
+          "at least one of \"certificate_file\" and \"ca_certificate_file\" "
+          "must be specified");
+    }
   }
 }
 
@@ -124,6 +150,7 @@ FileWatcherCertificateProviderFactory::CreateCertificateProvider(
       file_watcher_config->private_key_file(),
       file_watcher_config->identity_cert_file(),
       file_watcher_config->root_cert_file(),
+      file_watcher_config->spiffe_bundle_map_file(),
       file_watcher_config->refresh_interval().millis() / GPR_MS_PER_SEC);
 }
 

data/src/core/xds/grpc/file_watcher_certificate_provider_factory.h

@@ -52,6 +52,10 @@ class FileWatcherCertificateProviderFactory final
 
     const std::string& root_cert_file() const { return root_cert_file_; }
 
+    const std::string& spiffe_bundle_map_file() const {
+      return spiffe_bundle_map_file_;
+    }
+
     Duration refresh_interval() const { return refresh_interval_; }
 
     static const JsonLoaderInterface* JsonLoader(const JsonArgs& args);
@@ -62,6 +66,7 @@ class FileWatcherCertificateProviderFactory final
     std::string identity_cert_file_;
     std::string private_key_file_;
     std::string root_cert_file_;
+    std::string spiffe_bundle_map_file_;
     Duration refresh_interval_ = Duration::Minutes(10);
   };
 

data/src/core/xds/grpc/xds_certificate_provider.cc

@@ -45,12 +45,11 @@ class RootCertificatesWatcher final
       RefCountedPtr<grpc_tls_certificate_distributor> parent)
       : parent_(std::move(parent)) {}
 
-  void OnCertificatesChanged(std::optional<absl::string_view> root_certs,
+  void OnCertificatesChanged(std::shared_ptr<RootCertInfo> roots,
                              std::optional<PemKeyCertPairList>
                              /* key_cert_pairs */) override {
-    if (root_certs.has_value()) {
-      parent_->SetKeyMaterials("", std::string(root_certs.value()),
-                               std::nullopt);
+    if (roots != nullptr) {
+      parent_->SetKeyMaterials("", roots, std::nullopt);
     }
   }
 
@@ -79,10 +78,10 @@ class IdentityCertificatesWatcher final
       : parent_(std::move(parent)) {}
 
   void OnCertificatesChanged(
-      std::optional<absl::string_view> /* root_certs */,
+      std::shared_ptr<RootCertInfo> /* root_certs */,
       std::optional<PemKeyCertPairList> key_cert_pairs) override {
     if (key_cert_pairs.has_value()) {
-      parent_->SetKeyMaterials("", std::nullopt, key_cert_pairs);
+      parent_->SetKeyMaterials("", nullptr, key_cert_pairs);
     }
   }
 

data/src/ruby/ext/grpc/rb_channel.c

@@ -62,6 +62,7 @@ static VALUE grpc_rb_cChannelArgs;
 /* grpc_rb_channel wraps a grpc_channel. */
 typedef struct grpc_rb_channel {
   grpc_channel* channel;
+  VALUE mark;
 } grpc_rb_channel;
 
 static void grpc_rb_channel_free(void* p) {
@@ -76,13 +77,19 @@ static void grpc_rb_channel_free(void* p) {
   xfree(p);
 }
 
-static rb_data_type_t grpc_channel_data_type = {
-    "grpc_channel",
-    {NULL, grpc_rb_channel_free, GRPC_RB_MEMSIZE_UNAVAILABLE, {NULL, NULL}},
-    NULL,
-    NULL,
+static void grpc_rb_channel_mark(void* p) {
+  rb_gc_mark(((grpc_rb_channel*)p)->mark);
+}
+
+static rb_data_type_t grpc_channel_data_type = {"grpc_channel",
+                                                {grpc_rb_channel_mark,
+                                                 grpc_rb_channel_free,
+                                                 GRPC_RB_MEMSIZE_UNAVAILABLE,
+                                                 {NULL, NULL}},
+                                                NULL,
+                                                NULL,
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    RUBY_TYPED_FREE_IMMEDIATELY
+                                                RUBY_TYPED_FREE_IMMEDIATELY
 #endif
 };
 
@@ -91,6 +98,7 @@ static VALUE grpc_rb_channel_alloc(VALUE cls) {
   grpc_ruby_init();
   grpc_rb_channel* wrapper = ALLOC(grpc_rb_channel);
   wrapper->channel = NULL;
+  wrapper->mark = Qnil;
   return TypedData_Wrap_Struct(cls, &grpc_channel_data_type, wrapper);
 }
 
@@ -139,6 +147,7 @@ static VALUE grpc_rb_channel_init(int argc, VALUE* argv, VALUE self) {
       return Qnil;
     }
     wrapper->channel = grpc_channel_create(target_chars, creds, &channel_args);
+    wrapper->mark = rb_credentials;
   }
   grpc_rb_channel_args_destroy(&channel_args);
   if (wrapper->channel == NULL) {

data/src/ruby/ext/grpc/rb_grpc_imports.generated.h

@@ -207,7 +207,7 @@ extern grpc_tls_identity_pairs_destroy_type grpc_tls_identity_pairs_destroy_impo
 typedef grpc_tls_certificate_provider*(*grpc_tls_certificate_provider_static_data_create_type)(const char* root_certificate, grpc_tls_identity_pairs* pem_key_cert_pairs);
 extern grpc_tls_certificate_provider_static_data_create_type grpc_tls_certificate_provider_static_data_create_import;
 #define grpc_tls_certificate_provider_static_data_create grpc_tls_certificate_provider_static_data_create_import
-typedef grpc_tls_certificate_provider*(*grpc_tls_certificate_provider_file_watcher_create_type)(const char* private_key_path, const char* identity_certificate_path, const char* root_cert_path, unsigned int refresh_interval_sec);
+typedef grpc_tls_certificate_provider*(*grpc_tls_certificate_provider_file_watcher_create_type)(const char* private_key_path, const char* identity_certificate_path, const char* root_cert_path, const char* spiffe_bundle_map_path, unsigned int refresh_interval_sec);
 extern grpc_tls_certificate_provider_file_watcher_create_type grpc_tls_certificate_provider_file_watcher_create_import;
 #define grpc_tls_certificate_provider_file_watcher_create grpc_tls_certificate_provider_file_watcher_create_import
 typedef void(*grpc_tls_certificate_provider_release_type)(grpc_tls_certificate_provider* provider);

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.74.0'
+  VERSION = '1.75.0.pre1'
 end