grpc 1.83.1 → 1.84.0

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

@@ -17,16 +17,12 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLIENT_GRPC_H
 
-#include <grpc/grpc.h>
-#include <grpc/support/port_platform.h>
-
 #include <memory>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/iomgr/iomgr_fwd.h"
 #include "src/core/resolver/endpoint_addresses.h"
 #include "src/core/telemetry/metrics.h"
-#include "src/core/util/orphanable.h"
 #include "src/core/util/ref_counted_ptr.h"
 #include "src/core/util/useful.h"
 #include "src/core/xds/grpc/certificate_provider_store.h"

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

@@ -28,6 +28,7 @@
 #include "src/core/xds/grpc/xds_health_status.h"
 #include "src/core/xds/grpc/xds_metadata.h"
 #include "src/core/xds/grpc/xds_server_grpc.h"
+#include "src/core/xds/grpc/xds_tls_context.h"
 #include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
 #include "src/core/xds/xds_client/xds_resource_type_impl.h"

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

@@ -54,6 +54,7 @@
 #include "src/core/xds/grpc/xds_common_types_parser.h"
 #include "src/core/xds/grpc/xds_lb_policy_registry.h"
 #include "src/core/xds/grpc/xds_metadata_parser.h"
+#include "src/core/xds/grpc/xds_tls_context_parser.h"
 #include "src/core/xds/xds_client/lrs_client.h"
 #include "src/core/xds/xds_client/xds_backend_metric_propagation.h"
 #include "upb/base/string_view.h"
@@ -66,11 +67,6 @@
 
 namespace grpc_core {
 
-// TODO(roth): Remove this once the feature passes interop tests.
-bool XdsHttpConnectEnabled() {
-  return IsExperimentEnvVarEnabled("GRPC_EXPERIMENTAL_XDS_HTTP_CONNECT");
-}
-
 namespace {
 
 constexpr absl::string_view kUpstreamTlsContextType =

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

@@ -31,8 +31,6 @@
 
 namespace grpc_core {
 
-bool XdsHttpConnectEnabled();
-
 class XdsClusterResourceType
     : public XdsResourceTypeImpl<XdsClusterResourceType, XdsClusterResource> {
  public:

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

@@ -16,8 +16,6 @@
 
 #include "src/core/xds/grpc/xds_cluster_specifier_plugin.h"
 
-#include <grpc/support/json.h>
-#include <grpc/support/port_platform.h>
 #include <stddef.h>
 
 #include <map>

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

@@ -17,8 +17,6 @@
 #ifndef GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 #define GRPC_SRC_CORE_XDS_GRPC_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
-#include <grpc/support/port_platform.h>
-
 #include <map>
 #include <memory>
 #include <utility>

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

@@ -21,7 +21,6 @@
 
 #include "src/core/call/metadata_batch.h"
 #include "src/core/lib/slice/slice.h"
-#include "src/core/util/match.h"
 #include "src/core/util/string.h"
 #include "absl/status/status.h"
 #include "absl/strings/match.h"
@@ -30,96 +29,6 @@
 
 namespace grpc_core {
 
-//
-// CommonTlsContext::CertificateProviderPluginInstance
-//
-
-std::string CommonTlsContext::CertificateProviderPluginInstance::ToString()
-    const {
-  std::string result = "{";
-  bool is_first = true;
-  if (!instance_name.empty()) {
-    StrAppend(result, "instance_name=");
-    StrAppend(result, instance_name);
-    is_first = false;
-  }
-  if (!certificate_name.empty()) {
-    if (!is_first) StrAppend(result, ", ");
-    StrAppend(result, "certificate_name=");
-    StrAppend(result, certificate_name);
-  }
-  StrAppend(result, "}");
-  return result;
-}
-
-bool CommonTlsContext::CertificateProviderPluginInstance::Empty() const {
-  return instance_name.empty() && certificate_name.empty();
-}
-
-//
-// CommonTlsContext::CertificateValidationContext
-//
-
-std::string CommonTlsContext::CertificateValidationContext::ToString() const {
-  std::string result = "{";
-  bool is_first = true;
-  Match(
-      ca_certs, [](const std::monostate&) {},
-      [&](const CertificateProviderPluginInstance& cert_provider) {
-        StrAppend(result, "ca_certs=cert_provider");
-        StrAppend(result, cert_provider.ToString());
-        is_first = false;
-      },
-      [&](const SystemRootCerts&) {
-        StrAppend(result, "ca_certs=system_root_certs{}");
-        is_first = false;
-      });
-  if (!match_subject_alt_names.empty()) {
-    if (!is_first) StrAppend(result, ", ");
-    StrAppend(result, "match_subject_alt_names=[");
-    bool is_first_san = true;
-    for (const auto& match : match_subject_alt_names) {
-      if (!is_first_san) StrAppend(result, ", ");
-      StrAppend(result, match.ToString());
-      is_first_san = false;
-    }
-    StrAppend(result, "]");
-  }
-  StrAppend(result, "}");
-  return result;
-}
-
-bool CommonTlsContext::CertificateValidationContext::Empty() const {
-  return std::holds_alternative<std::monostate>(ca_certs) &&
-         match_subject_alt_names.empty();
-}
-
-//
-// CommonTlsContext
-//
-
-std::string CommonTlsContext::ToString() const {
-  std::string result = "{";
-  bool is_first = true;
-  if (!tls_certificate_provider_instance.Empty()) {
-    StrAppend(result, "tls_certificate_provider_instance=");
-    StrAppend(result, tls_certificate_provider_instance.ToString());
-    is_first = false;
-  }
-  if (!certificate_validation_context.Empty()) {
-    if (!is_first) StrAppend(result, ", ");
-    StrAppend(result, "certificate_validation_context=");
-    StrAppend(result, certificate_validation_context.ToString());
-  }
-  StrAppend(result, "}");
-  return result;
-}
-
-bool CommonTlsContext::Empty() const {
-  return tls_certificate_provider_instance.Empty() &&
-         certificate_validation_context.Empty();
-}
-
 //
 // HeaderMutationRules
 //

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

@@ -23,61 +23,15 @@
 #include <variant>
 #include <vector>
 
+#include "re2/re2.h"
 #include "src/core/call/metadata_batch.h"
 #include "src/core/util/json/json.h"
-#include "src/core/util/matchers.h"
 #include "src/core/util/validation_errors.h"
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
-struct CommonTlsContext {
-  struct CertificateProviderPluginInstance {
-    std::string instance_name;
-    std::string certificate_name;
-
-    bool operator==(const CertificateProviderPluginInstance& other) const {
-      return instance_name == other.instance_name &&
-             certificate_name == other.certificate_name;
-    }
-
-    std::string ToString() const;
-    bool Empty() const;
-  };
-
-  struct CertificateValidationContext {
-    struct SystemRootCerts {
-      bool operator==(const SystemRootCerts&) const { return true; }
-    };
-    std::variant<std::monostate, CertificateProviderPluginInstance,
-                 SystemRootCerts>
-        ca_certs;
-    std::vector<StringMatcher> match_subject_alt_names;
-
-    bool operator==(const CertificateValidationContext& other) const {
-      return ca_certs == other.ca_certs &&
-             match_subject_alt_names == other.match_subject_alt_names;
-    }
-
-    std::string ToString() const;
-    bool Empty() const;
-  };
-
-  CertificateValidationContext certificate_validation_context;
-  CertificateProviderPluginInstance tls_certificate_provider_instance;
-
-  bool operator==(const CommonTlsContext& other) const {
-    return certificate_validation_context ==
-               other.certificate_validation_context &&
-           tls_certificate_provider_instance ==
-               other.tls_certificate_provider_instance;
-  }
-
-  std::string ToString() const;
-  bool Empty() const;
-};
-
 struct XdsExtension {
   // The type, either from the top level or from inside the TypedStruct.
   absl::string_view type;