grpc 1.83.1 → 1.84.0

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

@@ -18,150 +18,33 @@
 
 #include <map>
 #include <utility>
-#include <variant>
 #include <vector>
 
-#include "envoy/extensions/filters/http/router/v3/router.upb.h"
-#include "envoy/extensions/filters/http/router/v3/router.upbdefs.h"
-#include "src/core/config/experiment_env_var.h"
 #include "src/core/util/grpc_check.h"
-#include "src/core/util/json/json.h"
-#include "src/core/util/sync.h"
-#include "src/core/xds/grpc/xds_http_composite_filter.h"
-#include "src/core/xds/grpc/xds_http_fault_filter.h"
-#include "src/core/xds/grpc/xds_http_gcp_authn_filter.h"
-#include "src/core/xds/grpc/xds_http_rbac_filter.h"
-#include "src/core/xds/grpc/xds_http_stateful_session_filter.h"
-#include "src/core/xds/grpc/xds_metadata_parser.h"
 
 namespace grpc_core {
 
-//
-// XdsHttpRouterFilter
-//
-
-absl::string_view XdsHttpRouterFilter::ConfigProtoName() const {
-  return "envoy.extensions.filters.http.router.v3.Router";
-}
-
-absl::string_view XdsHttpRouterFilter::OverrideConfigProtoName() const {
-  return "";
-}
-
-void XdsHttpRouterFilter::PopulateSymtab(upb_DefPool* symtab) const {
-  envoy_extensions_filters_http_router_v3_Router_getmsgdef(symtab);
-}
-
-std::optional<Json> XdsHttpRouterFilter::GenerateFilterConfig(
-    absl::string_view /*instance_name*/,
-    const XdsResourceType::DecodeContext& context,
-    const XdsExtension& extension, ValidationErrors* errors) const {
-  const absl::string_view* serialized_filter_config =
-      std::get_if<absl::string_view>(&extension.value);
-  if (serialized_filter_config == nullptr) {
-    errors->AddError("could not parse router filter config");
-    return std::nullopt;
-  }
-  if (envoy_extensions_filters_http_router_v3_Router_parse(
-          serialized_filter_config->data(), serialized_filter_config->size(),
-          context.arena) == nullptr) {
-    errors->AddError("could not parse router filter config");
-    return std::nullopt;
-  }
-  return Json();
-}
-
-std::optional<Json> XdsHttpRouterFilter::GenerateFilterConfigOverride(
-    absl::string_view /*instance_name*/,
-    const XdsResourceType::DecodeContext& /*context*/,
-    const XdsExtension& /*extension*/, ValidationErrors* errors) const {
-  errors->AddError("router filter does not support config override");
-  return std::nullopt;
-}
-
-RefCountedPtr<const FilterConfig> XdsHttpRouterFilter::ParseTopLevelConfig(
-    absl::string_view /*instance_name*/,
-    const XdsResourceType::DecodeContext& context,
-    const XdsExtension& extension, ValidationErrors* errors) const {
-  const absl::string_view* serialized_filter_config =
-      std::get_if<absl::string_view>(&extension.value);
-  if (serialized_filter_config == nullptr) {
-    errors->AddError("could not parse router filter config");
-    return nullptr;
-  }
-  if (envoy_extensions_filters_http_router_v3_Router_parse(
-          serialized_filter_config->data(), serialized_filter_config->size(),
-          context.arena) == nullptr) {
-    errors->AddError("could not parse router filter config");
-    return nullptr;
-  }
-  return nullptr;
-}
-
-RefCountedPtr<const FilterConfig> XdsHttpRouterFilter::ParseOverrideConfig(
-    absl::string_view /*instance_name*/,
-    const XdsResourceType::DecodeContext& /*context*/,
-    const XdsExtension& /*extension*/, ValidationErrors* errors) const {
-  errors->AddError("router filter does not support config override");
-  return nullptr;
-}
-
-//
-// XdsHttpFilterRegistry
-//
-
-namespace {
-
-Mutex* g_mu = new Mutex;
-NoDestruct<absl::AnyInvocable<std::unique_ptr<XdsHttpFilterImpl>()>>
-    g_http_filter_factory_factory ABSL_GUARDED_BY(*g_mu);
-
-}  // namespace
-
-void SetXdsHttpFilterFactoryForTest(
-    absl::AnyInvocable<std::unique_ptr<XdsHttpFilterImpl>()> factory) {
-  MutexLock lock(g_mu);
-  *g_http_filter_factory_factory = std::move(factory);
-}
-
-XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {
-  if (register_builtins) {
-    RegisterFilter(std::make_unique<XdsHttpRouterFilter>());
-    RegisterFilter(std::make_unique<XdsHttpFaultFilter>());
-    RegisterFilter(std::make_unique<XdsHttpRbacFilter>());
-    RegisterFilter(std::make_unique<XdsHttpStatefulSessionFilter>());
-    RegisterFilter(std::make_unique<XdsHttpGcpAuthnFilter>());
-    if (IsExperimentEnvVarEnabled("GRPC_EXPERIMENTAL_XDS_COMPOSITE_FILTER")) {
-      RegisterFilter(std::make_unique<XdsHttpCompositeFilter>());
-    }
-    MutexLock lock(g_mu);
-    if (*g_http_filter_factory_factory != nullptr) {
-      RegisterFilter((*g_http_filter_factory_factory)());
-    }
-  }
-}
-
 void XdsHttpFilterRegistry::RegisterFilter(
-    std::unique_ptr<XdsHttpFilterImpl> filter) {
+    std::unique_ptr<XdsHttpFilterFactory> factory) {
   GRPC_CHECK(
-      top_level_config_map_.emplace(filter->ConfigProtoName(), filter.get())
+      top_level_config_map_.emplace(factory->ConfigProtoName(), factory.get())
           .second);
-  auto override_proto_name = filter->OverrideConfigProtoName();
+  auto override_proto_name = factory->OverrideConfigProtoName();
   if (!override_proto_name.empty()) {
-    GRPC_CHECK(
-        override_config_map_.emplace(override_proto_name, filter.get()).second);
+    GRPC_CHECK(override_config_map_.emplace(override_proto_name, factory.get())
+                   .second);
   }
-  owning_list_.push_back(std::move(filter));
+  owning_list_.push_back(std::move(factory));
 }
 
-const XdsHttpFilterImpl* XdsHttpFilterRegistry::GetFilterForTopLevelType(
+const XdsHttpFilterFactory* XdsHttpFilterRegistry::GetFilterForTopLevelType(
     absl::string_view proto_type_name) const {
   auto it = top_level_config_map_.find(proto_type_name);
   if (it == top_level_config_map_.end()) return nullptr;
   return it->second;
 }
 
-const XdsHttpFilterImpl* XdsHttpFilterRegistry::GetFilterForOverrideType(
+const XdsHttpFilterFactory* XdsHttpFilterRegistry::GetFilterForOverrideType(
     absl::string_view proto_type_name) const {
   auto it = override_config_map_.find(proto_type_name);
   if (it == override_config_map_.end()) return nullptr;
@@ -169,8 +52,8 @@ const XdsHttpFilterImpl* XdsHttpFilterRegistry::GetFilterForOverrideType(
 }
 
 void XdsHttpFilterRegistry::PopulateSymtab(upb_DefPool* symtab) const {
-  for (const auto& filter : owning_list_) {
-    filter->PopulateSymtab(symtab);
+  for (const auto& factory : owning_list_) {
+    factory->PopulateSymtab(symtab);
   }
 }
 

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

@@ -19,68 +19,19 @@
 
 #include <map>
 #include <memory>
-#include <optional>
-#include <string>
 #include <utility>
 #include <vector>
 
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
-#include "src/core/util/validation_errors.h"
-#include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
-#include "src/core/xds/xds_client/xds_resource_type.h"
 #include "upb/reflection/def.h"
-#include "absl/functional/any_invocable.h"
-#include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
-// Exposed for testing purposes only.
-class XdsHttpRouterFilter final : public XdsHttpFilterImpl {
- public:
-  absl::string_view ConfigProtoName() const override;
-  absl::string_view OverrideConfigProtoName() const override;
-  void PopulateSymtab(upb_DefPool* symtab) const override;
-  std::optional<Json> GenerateFilterConfig(
-      absl::string_view /*instance_name*/,
-      const XdsResourceType::DecodeContext& context,
-      const XdsExtension& extension, ValidationErrors* errors) const override;
-  std::optional<Json> GenerateFilterConfigOverride(
-      absl::string_view /*instance_name*/,
-      const XdsResourceType::DecodeContext& context,
-      const XdsExtension& extension, ValidationErrors* errors) const override;
-  const grpc_channel_filter* channel_filter() const override { return nullptr; }
-  absl::StatusOr<ServiceConfigJsonEntry> GenerateMethodConfig(
-      const Json& /*hcm_filter_config*/,
-      const Json* /*filter_config_override*/) const override {
-    // This will never be called, since channel_filter() returns null.
-    return absl::UnimplementedError("router filter should never be called");
-  }
-  absl::StatusOr<ServiceConfigJsonEntry> GenerateServiceConfig(
-      const Json& /*hcm_filter_config*/) const override {
-    // This will never be called, since channel_filter() returns null.
-    return absl::UnimplementedError("router filter should never be called");
-  }
-  void AddFilter(FilterChainBuilder& /*builder*/,
-                 RefCountedPtr<const FilterConfig> /*config*/) const override {}
-  RefCountedPtr<const FilterConfig> ParseTopLevelConfig(
-      absl::string_view instance_name,
-      const XdsResourceType::DecodeContext& context,
-      const XdsExtension& extension, ValidationErrors* errors) const override;
-  RefCountedPtr<const FilterConfig> ParseOverrideConfig(
-      absl::string_view instance_name,
-      const XdsResourceType::DecodeContext& context,
-      const XdsExtension& extension, ValidationErrors* errors) const override;
-  bool IsSupportedOnClients() const override { return true; }
-  bool IsSupportedOnServers() const override { return true; }
-  bool IsTerminalFilter() const override { return true; }
-};
-
 class XdsHttpFilterRegistry final {
  public:
-  explicit XdsHttpFilterRegistry(bool register_builtins = true);
+  XdsHttpFilterRegistry() = default;
 
   // Not copyable.
   XdsHttpFilterRegistry(const XdsHttpFilterRegistry&) = delete;
@@ -98,25 +49,22 @@ class XdsHttpFilterRegistry final {
     return *this;
   }
 
-  void RegisterFilter(std::unique_ptr<XdsHttpFilterImpl> filter);
+  void RegisterFilter(std::unique_ptr<XdsHttpFilterFactory> factory);
 
-  const XdsHttpFilterImpl* GetFilterForTopLevelType(
+  const XdsHttpFilterFactory* GetFilterForTopLevelType(
       absl::string_view proto_type_name) const;
 
-  const XdsHttpFilterImpl* GetFilterForOverrideType(
+  const XdsHttpFilterFactory* GetFilterForOverrideType(
       absl::string_view proto_type_name) const;
 
   void PopulateSymtab(upb_DefPool* symtab) const;
 
  private:
-  std::vector<std::unique_ptr<XdsHttpFilterImpl>> owning_list_;
-  std::map<absl::string_view, XdsHttpFilterImpl*> top_level_config_map_;
-  std::map<absl::string_view, XdsHttpFilterImpl*> override_config_map_;
+  std::vector<std::unique_ptr<XdsHttpFilterFactory>> owning_list_;
+  std::map<absl::string_view, XdsHttpFilterFactory*> top_level_config_map_;
+  std::map<absl::string_view, XdsHttpFilterFactory*> override_config_map_;
 };
 
-void SetXdsHttpFilterFactoryForTest(
-    absl::AnyInvocable<std::unique_ptr<XdsHttpFilterImpl>()> factory);
-
 }  // namespace grpc_core
 
 #endif  // GRPC_SRC_CORE_XDS_GRPC_XDS_HTTP_FILTER_REGISTRY_H

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

@@ -16,8 +16,6 @@
 
 #include "src/core/xds/grpc/xds_http_gcp_authn_filter.h"
 
-#include <grpc/support/json.h>
-
 #include <string>
 #include <utility>
 #include <variant>
@@ -25,9 +23,6 @@
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upb.h"
 #include "envoy/extensions/filters/http/gcp_authn/v3/gcp_authn.upbdefs.h"
 #include "src/core/ext/filters/gcp_authentication/gcp_authentication_filter.h"
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/util/json/json.h"
-#include "src/core/util/json/json_writer.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_common_types_parser.h"
@@ -37,35 +32,37 @@
 
 namespace grpc_core {
 
-absl::string_view XdsHttpGcpAuthnFilter::ConfigProtoName() const {
+absl::string_view XdsHttpGcpAuthnFilterFactory::ConfigProtoName() const {
   return "envoy.extensions.filters.http.gcp_authn.v3.GcpAuthnFilterConfig";
 }
 
-absl::string_view XdsHttpGcpAuthnFilter::OverrideConfigProtoName() const {
+absl::string_view XdsHttpGcpAuthnFilterFactory::OverrideConfigProtoName()
+    const {
   return "";
 }
 
-void XdsHttpGcpAuthnFilter::PopulateSymtab(upb_DefPool* symtab) const {
+void XdsHttpGcpAuthnFilterFactory::PopulateSymtab(upb_DefPool* symtab) const {
   envoy_extensions_filters_http_gcp_authn_v3_GcpAuthnFilterConfig_getmsgdef(
       symtab);
 }
 
-const grpc_channel_filter* XdsHttpGcpAuthnFilter::channel_filter() const {
+const grpc_channel_filter* XdsHttpGcpAuthnFilterFactory::channel_filter()
+    const {
   return &GcpAuthenticationFilter::kFilterVtable;
 }
 
-void XdsHttpGcpAuthnFilter::AddFilter(
+void XdsHttpGcpAuthnFilterFactory::AddFilter(
     FilterChainBuilder& builder,
     RefCountedPtr<const FilterConfig> config) const {
   builder.AddFilter<GcpAuthenticationFilter>(std::move(config));
 }
 
-RefCountedPtr<const FilterConfig> XdsHttpGcpAuthnFilter::MergeConfigs(
+RefCountedPtr<const FilterConfig> XdsHttpGcpAuthnFilterFactory::MergeConfigs(
     RefCountedPtr<const FilterConfig> top_level_config,
     RefCountedPtr<const FilterConfig> /*virtual_host_override_config*/,
     RefCountedPtr<const FilterConfig> /*route_override_config*/,
     RefCountedPtr<const FilterConfig> /*cluster_weight_override_config*/,
-    Blackboard& blackboard) const {
+    XdsTransportFactory& /*transport_factory*/, Blackboard& blackboard) const {
   // Make a copy of the parsed config.
   const auto& parsed_config =
       DownCast<const GcpAuthenticationFilter::Config&>(*top_level_config);
@@ -87,7 +84,8 @@ RefCountedPtr<const FilterConfig> XdsHttpGcpAuthnFilter::MergeConfigs(
   return new_config;
 }
 
-RefCountedPtr<const FilterConfig> XdsHttpGcpAuthnFilter::ParseTopLevelConfig(
+RefCountedPtr<const FilterConfig>
+XdsHttpGcpAuthnFilterFactory::ParseTopLevelConfig(
     absl::string_view instance_name,
     const XdsResourceType::DecodeContext& context,
     const XdsExtension& extension, ValidationErrors* errors) const {
@@ -124,7 +122,8 @@ RefCountedPtr<const FilterConfig> XdsHttpGcpAuthnFilter::ParseTopLevelConfig(
   return config;
 }
 
-RefCountedPtr<const FilterConfig> XdsHttpGcpAuthnFilter::ParseOverrideConfig(
+RefCountedPtr<const FilterConfig>
+XdsHttpGcpAuthnFilterFactory::ParseOverrideConfig(
     absl::string_view /*instance_name*/,
     const XdsResourceType::DecodeContext& /*context*/,
     const XdsExtension& /*extension*/, ValidationErrors* errors) const {

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

@@ -19,19 +19,19 @@
 
 #include <optional>
 
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/util/validation_errors.h"
 #include "src/core/xds/grpc/xds_common_types.h"
 #include "src/core/xds/grpc/xds_http_filter.h"
 #include "src/core/xds/xds_client/xds_resource_type.h"
+#include "src/core/xds/xds_client/xds_transport.h"
 #include "upb/reflection/def.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 
 namespace grpc_core {
 
-class XdsHttpGcpAuthnFilter final : public XdsHttpFilterImpl {
+class XdsHttpGcpAuthnFilterFactory final : public XdsHttpFilterFactory {
  public:
   absl::string_view ConfigProtoName() const override;
   absl::string_view OverrideConfigProtoName() const override;
@@ -77,6 +77,7 @@ class XdsHttpGcpAuthnFilter final : public XdsHttpFilterImpl {
       RefCountedPtr<const FilterConfig> /*virtual_host_override_config*/,
       RefCountedPtr<const FilterConfig> /*route_override_config*/,
       RefCountedPtr<const FilterConfig> /*cluster_weight_override_config*/,
+      XdsTransportFactory& transport_factory,
       Blackboard& blackboard) const override;
   bool IsSupportedOnClients() const override { return true; }
   bool IsSupportedOnServers() const override { return false; }