grpc 1.47.0 → 1.53.0

data/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.c

@@ -0,0 +1,36 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#include "upb/def.h"
+#include "xds/type/v3/range.upbdefs.h"
+#include "xds/type/v3/range.upb.h"
+
+static const char descriptor[285] = {'\n', '\027', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 'r', 'a', 'n', 'g', 'e', '.', 'p', 'r', 'o', 't', 'o', 
+'\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\"', '4', '\n', '\n', 'I', 'n', 't', '6', '4', 'R', 'a', 'n', 
+'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\003', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', 
+'\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\003', 'R', '\003', 'e', 'n', 'd', '\"', '4', '\n', '\n', 'I', 'n', 't', '3', 
+'2', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', '\005', 'R', '\005', 's', 't', 
+'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\005', 'R', '\003', 'e', 'n', 'd', '\"', '5', '\n', '\013', 
+'D', 'o', 'u', 'b', 'l', 'e', 'R', 'a', 'n', 'g', 'e', '\022', '\024', '\n', '\005', 's', 't', 'a', 'r', 't', '\030', '\001', ' ', '\001', '(', 
+'\001', 'R', '\005', 's', 't', 'a', 'r', 't', '\022', '\020', '\n', '\003', 'e', 'n', 'd', '\030', '\002', ' ', '\001', '(', '\001', 'R', '\003', 'e', 'n', 
+'d', 'B', 'J', '\n', '\026', 'c', 'o', 'm', '.', 'g', 'i', 't', 'h', 'u', 'b', '.', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 
+'v', '3', 'B', '\n', 'R', 'a', 'n', 'g', 'e', 'P', 'r', 'o', 't', 'o', 'P', '\001', 'Z', '\"', 'g', 'i', 't', 'h', 'u', 'b', '.', 
+'c', 'o', 'm', '/', 'c', 'n', 'c', 'f', '/', 'x', 'd', 's', '/', 'g', 'o', '/', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 
+'v', '3', 'b', '\006', 'p', 'r', 'o', 't', 'o', '3', 
+};
+
+static _upb_DefPool_Init *deps[1] = {
+  NULL
+};
+
+_upb_DefPool_Init xds_type_v3_range_proto_upbdefinit = {
+  deps,
+  &xds_type_v3_range_proto_upb_file_layout,
+  "xds/type/v3/range.proto",
+  UPB_STRINGVIEW_INIT(descriptor, 285)
+};

data/src/core/ext/upbdefs-generated/xds/type/v3/range.upbdefs.h

@@ -0,0 +1,45 @@
+/* This file was generated by upbc (the upb compiler) from the input
+ * file:
+ *
+ *     xds/type/v3/range.proto
+ *
+ * Do not edit -- your changes will be discarded when the file is
+ * regenerated. */
+
+#ifndef XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+#define XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_
+
+#include "upb/def.h"
+#include "upb/port_def.inc"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "upb/def.h"
+
+#include "upb/port_def.inc"
+
+extern _upb_DefPool_Init xds_type_v3_range_proto_upbdefinit;
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_Int64Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int64Range");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_Int32Range_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.Int32Range");
+}
+
+UPB_INLINE const upb_MessageDef *xds_type_v3_DoubleRange_getmsgdef(upb_DefPool *s) {
+  _upb_DefPool_LoadDefInit(s, &xds_type_v3_range_proto_upbdefinit);
+  return upb_DefPool_FindMessageByName(s, "xds.type.v3.DoubleRange");
+}
+
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
+#include "upb/port_undef.inc"
+
+#endif  /* XDS_TYPE_V3_RANGE_PROTO_UPBDEFS_H_ */

data/src/core/ext/upbdefs-generated/xds/type/v3/typed_struct.upbdefs.c

@@ -10,11 +10,9 @@
 #include "xds/type/v3/typed_struct.upbdefs.h"
 #include "xds/type/v3/typed_struct.upb.h"
 
-extern _upb_DefPool_Init validate_validate_proto_upbdefinit;
 extern _upb_DefPool_Init google_protobuf_struct_proto_upbdefinit;
-static const char descriptor[279] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', 'c', 
-'t', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\027', 'v', 'a', 'l', 
-'i', 'd', 'a', 't', 'e', '/', 'v', 'a', 'l', 'i', 'd', 'a', 't', 'e', '.', 'p', 'r', 'o', 't', 'o', '\032', '\034', 'g', 'o', 'o', 
+static const char descriptor[254] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y', 'p', 'e', '/', 'v', '3', '/', 't', 'y', 'p', 'e', 'd', '_', 's', 't', 'r', 'u', 'c', 
+'t', '.', 'p', 'r', 'o', 't', 'o', '\022', '\013', 'x', 'd', 's', '.', 't', 'y', 'p', 'e', '.', 'v', '3', '\032', '\034', 'g', 'o', 'o', 
 'g', 'l', 'e', '/', 'p', 'r', 'o', 't', 'o', 'b', 'u', 'f', '/', 's', 't', 'r', 'u', 'c', 't', '.', 'p', 'r', 'o', 't', 'o', 
 '\"', 'W', '\n', '\013', 'T', 'y', 'p', 'e', 'd', 'S', 't', 'r', 'u', 'c', 't', '\022', '\031', '\n', '\010', 't', 'y', 'p', 'e', '_', 'u', 
 'r', 'l', '\030', '\001', ' ', '\001', '(', '\t', 'R', '\007', 't', 'y', 'p', 'e', 'U', 'r', 'l', '\022', '-', '\n', '\005', 'v', 'a', 'l', 'u', 
@@ -26,8 +24,7 @@ static const char descriptor[279] = {'\n', '\036', 'x', 'd', 's', '/', 't', 'y',
 'o', 't', 'o', '3', 
 };
 
-static _upb_DefPool_Init *deps[3] = {
-  &validate_validate_proto_upbdefinit,
+static _upb_DefPool_Init *deps[2] = {
   &google_protobuf_struct_proto_upbdefinit,
   NULL
 };
@@ -36,5 +33,5 @@ _upb_DefPool_Init xds_type_v3_typed_struct_proto_upbdefinit = {
   deps,
   &xds_type_v3_typed_struct_proto_upb_file_layout,
   "xds/type/v3/typed_struct.proto",
-  UPB_STRINGVIEW_INIT(descriptor, 279)
+  UPB_STRINGVIEW_INIT(descriptor, 254)
 };

data/src/core/ext/xds/certificate_provider_store.cc

@@ -20,10 +20,70 @@
 
 #include "src/core/ext/xds/certificate_provider_store.h"
 
-#include "src/core/ext/xds/certificate_provider_registry.h"
+#include "absl/strings/str_cat.h"
+
+#include <grpc/support/log.h>
+
+#include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/status_helper.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/security/certificate_provider/certificate_provider_registry.h"
 
 namespace grpc_core {
 
+//
+// CertificateProviderStore::PluginDefinition
+//
+
+const JsonLoaderInterface*
+CertificateProviderStore::PluginDefinition::JsonLoader(const JsonArgs&) {
+  static const auto* loader =
+      JsonObjectLoader<PluginDefinition>()
+          .Field("plugin_name", &PluginDefinition::plugin_name)
+          .Finish();
+  return loader;
+}
+
+void CertificateProviderStore::PluginDefinition::JsonPostLoad(
+    const Json& json, const JsonArgs&, ValidationErrors* errors) {
+  // Check that plugin is supported.
+  CertificateProviderFactory* factory = nullptr;
+  if (!plugin_name.empty()) {
+    ValidationErrors::ScopedField field(errors, ".plugin_name");
+    factory = CoreConfiguration::Get()
+                  .certificate_provider_registry()
+                  .LookupCertificateProviderFactory(plugin_name);
+    if (factory == nullptr) {
+      errors->AddError(absl::StrCat("Unrecognized plugin name: ", plugin_name));
+      return;  // No point checking config.
+    }
+  }
+  // Parse the config field.
+  {
+    ValidationErrors::ScopedField field(errors, ".config");
+    auto it = json.object_value().find("config");
+    // The config field is optional; if not present, we use an empty JSON
+    // object.
+    Json::Object config_json;
+    if (it != json.object_value().end()) {
+      if (it->second.type() != Json::Type::OBJECT) {
+        errors->AddError("is not an object");
+        return;  // No point parsing config.
+      } else {
+        config_json = it->second.object_value();
+      }
+    }
+    if (factory == nullptr) return;
+    // Use plugin to validate and parse config.
+    grpc_error_handle parse_error;
+    config =
+        factory->CreateCertificateProviderConfig(config_json, &parse_error);
+    if (!parse_error.ok()) {
+      errors->AddError(StatusToString(parse_error));
+    }
+  }
+}
+
 //
 // CertificateProviderStore::CertificateProviderWrapper
 //
@@ -68,8 +128,10 @@ CertificateProviderStore::CreateCertificateProviderLocked(
     return nullptr;
   }
   CertificateProviderFactory* factory =
-      CertificateProviderRegistry::LookupCertificateProviderFactory(
-          plugin_config_it->second.plugin_name);
+      CoreConfiguration::Get()
+          .certificate_provider_registry()
+          .LookupCertificateProviderFactory(
+              plugin_config_it->second.plugin_name);
   if (factory == nullptr) {
     // This should never happen since an entry is only inserted in the
     // plugin_config_map_ if the corresponding factory was found when parsing

data/src/core/ext/xds/certificate_provider_store.h

@@ -16,19 +16,32 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
-#define GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#define GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
 
 #include <grpc/support/port_platform.h>
 
 #include <map>
+#include <string>
+#include <utility>
 
+#include "absl/base/thread_annotations.h"
 #include "absl/strings/string_view.h"
 
-#include "src/core/ext/xds/certificate_provider_factory.h"
+#include <grpc/grpc_security.h>
+
+#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/orphanable.h"
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/gprpp/unique_type_name.h"
+#include "src/core/lib/gprpp/validation_errors.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/json/json.h"
+#include "src/core/lib/json/json_args.h"
+#include "src/core/lib/json/json_object_loader.h"
+#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
+#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_distributor.h"
 #include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc_core {
@@ -40,6 +53,10 @@ class CertificateProviderStore
   struct PluginDefinition {
     std::string plugin_name;
     RefCountedPtr<CertificateProviderFactory::Config> config;
+
+    static const JsonLoaderInterface* JsonLoader(const JsonArgs&);
+    void JsonPostLoad(const Json& json, const JsonArgs&,
+                      ValidationErrors* errors);
   };
 
   // Maps plugin instance (opaque) name to plugin defition.
@@ -118,4 +135,4 @@ class CertificateProviderStore
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_CERTIFICATE_PROVIDER_STORE_H

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

@@ -20,11 +20,20 @@
 
 #include "src/core/ext/xds/file_watcher_certificate_provider_factory.h"
 
+#include <algorithm>
+#include <initializer_list>
+#include <memory>
+#include <vector>
+
 #include "absl/strings/str_format.h"
 #include "absl/strings/str_join.h"
 
-#include "src/core/ext/xds/certificate_provider_registry.h"
+#include <grpc/support/log.h>
+#include <grpc/support/time.h>
+
+#include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/json/json_util.h"
+#include "src/core/lib/security/credentials/tls/grpc_tls_certificate_provider.h"
 
 namespace grpc_core {
 
@@ -67,8 +76,7 @@ FileWatcherCertificateProviderFactory::Config::Parse(const Json& config_json,
                                                      grpc_error_handle* error) {
   auto config = MakeRefCounted<FileWatcherCertificateProviderFactory::Config>();
   if (config_json.type() != Json::Type::OBJECT) {
-    *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "error:config type should be OBJECT.");
+    *error = GRPC_ERROR_CREATE("error:config type should be OBJECT.");
     return nullptr;
   }
   std::vector<grpc_error_handle> error_list;
@@ -78,14 +86,14 @@ FileWatcherCertificateProviderFactory::Config::Parse(const Json& config_json,
                        &config->private_key_file_, &error_list, false);
   if (config->identity_cert_file_.empty() !=
       config->private_key_file_.empty()) {
-    error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+    error_list.push_back(GRPC_ERROR_CREATE(
         "fields \"certificate_file\" and \"private_key_file\" must be both set "
         "or both unset."));
   }
   ParseJsonObjectField(config_json.object_value(), "ca_certificate_file",
                        &config->root_cert_file_, &error_list, false);
   if (config->identity_cert_file_.empty() && config->root_cert_file_.empty()) {
-    error_list.push_back(GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+    error_list.push_back(GRPC_ERROR_CREATE(
         "At least one of \"certificate_file\" and \"ca_certificate_file\" must "
         "be specified."));
   }
@@ -134,11 +142,10 @@ FileWatcherCertificateProviderFactory::CreateCertificateProvider(
       file_watcher_config->refresh_interval().millis() / GPR_MS_PER_SEC);
 }
 
-void FileWatcherCertificateProviderInit() {
-  CertificateProviderRegistry::RegisterCertificateProviderFactory(
-      absl::make_unique<FileWatcherCertificateProviderFactory>());
+void RegisterFileWatcherCertificateProvider(
+    CoreConfiguration::Builder* builder) {
+  builder->certificate_provider_registry()->RegisterCertificateProviderFactory(
+      std::make_unique<FileWatcherCertificateProviderFactory>());
 }
 
-void FileWatcherCertificateProviderShutdown() {}
-
 }  // namespace grpc_core

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

@@ -16,12 +16,20 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
-#define GRPC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
+#define GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/certificate_provider_factory.h"
+#include <string>
+
+#include <grpc/grpc_security.h>
+
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/json/json.h"
+#include "src/core/lib/security/certificate_provider/certificate_provider_factory.h"
 
 namespace grpc_core {
 
@@ -66,4 +74,4 @@ class FileWatcherCertificateProviderFactory
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_FILE_WATCHER_CERTIFICATE_PROVIDER_FACTORY_H

data/src/core/ext/xds/upb_utils.h

@@ -14,40 +14,18 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_UPB_UTILS_H
-#define GRPC_CORE_EXT_XDS_UPB_UTILS_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
+#define GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H
 
 #include <grpc/support/port_platform.h>
 
 #include <string>
 
 #include "absl/strings/string_view.h"
-#include "upb/text_encode.h"
 #include "upb/upb.h"
-#include "upb/upb.hpp"
-
-#include "src/core/ext/xds/certificate_provider_store.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/lib/debug/trace.h"
 
 namespace grpc_core {
 
-class XdsClient;
-
-// TODO(roth): Rethink this.  All fields except symtab and arena should come
-// from XdsClient, injected into XdsResourceType::Decode() somehow without
-// passing through XdsApi code, maybe via the AdsResponseParser.
-struct XdsEncodingContext {
-  XdsClient* client;  // Used only for logging. Unsafe for dereferencing.
-  const XdsBootstrap::XdsServer& server;
-  TraceFlag* tracer;
-  upb_DefPool* symtab;
-  upb_Arena* arena;
-  bool use_v3;
-  const CertificateProviderStore::PluginDefinitionMap*
-      certificate_provider_definition_map;
-};
-
 // Works for both std::string and absl::string_view.
 template <typename T>
 inline upb_StringView StdStringToUpbString(const T& str) {
@@ -64,4 +42,4 @@ inline std::string UpbStringToStdString(const upb_StringView& str) {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_UPB_UTILS_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_UPB_UTILS_H