add wasm abi: injectEncodedDataToFilterChainOnHeader

Author: johnlanni

source/extensions/common/wasm/BUILD

@@ -91,6 +91,7 @@ envoy_cc_extension(
         "//source/common/network/dns_resolver:dns_factory_util_lib",
         "//source/common/tracing:http_tracer_lib",
         "//source/extensions/common/wasm/ext:declare_property_cc_proto",
+        "//source/extensions/common/wasm/ext:inject_encoded_data_cc_proto",
         "//source/extensions/common/wasm/ext:envoy_null_vm_wasm_api",
         "//source/extensions/filters/common/expr:context_lib",
         "@com_google_cel_cpp//eval/public:builtin_func_registrar",

source/extensions/common/wasm/context.cc

@@ -1940,6 +1940,19 @@ WasmResult Context::injectEncodedDataToFilterChain(std::string_view body_text, b
   }
   return WasmResult::Ok;
 }
+
+WasmResult Context::injectEncodedDataToFilterChainOnHeader(std::string_view body_text,
+                                                           bool end_stream) {
+  if (encoder_callbacks_) {
+    std::string body_text_copy(body_text);
+    encoder_callbacks_->dispatcher().post([=]() {
+      auto buffer = ::Envoy::Buffer::OwnedImpl(body_text_copy);
+      encoder_callbacks_->injectEncodedDataToFilterChain(buffer, end_stream);
+    });
+  }
+  return WasmResult::Ok;
+}
+
 std::string convertHealthStatusToString(Upstream::Host::Health status) {
   if (status == Upstream::Host::Health::Unhealthy) {
     return "Unhealthy";
@@ -1949,13 +1962,16 @@ std::string convertHealthStatusToString(Upstream::Host::Health status) {
     return "Healthy";
   }
 }
-WasmResult Context::getUpstreamHosts(StringPairs * result) {
+WasmResult Context::getUpstreamHosts(StringPairs* result) {
   if (decoder_callbacks_) {
     auto upstream_cluster = decoder_callbacks_->clusterInfo();
     if (!upstream_cluster) {
       return WasmResult::Ok;
     }
-    for (auto& p : this->clusterManager().getThreadLocalCluster(upstream_cluster->name())->prioritySet().hostSetsPerPriority()) {
+    for (auto& p : this->clusterManager()
+                       .getThreadLocalCluster(upstream_cluster->name())
+                       ->prioritySet()
+                       .hostSetsPerPriority()) {
       for (auto& h : p->hosts()) {
         std::map<std::string, std::string> info_map;
         if (!h->getEndpointMetrics().empty()) {
@@ -1967,7 +1983,8 @@ WasmResult Context::getUpstreamHosts(StringPairs * result) {
           result->push_back(std::make_pair(h->address()->asString(), j.dump(0)));
         } catch (const std::exception& e) {
           ENVOY_LOG(error, "getUpstreamHosts json dump failed: {}", e.what());
-          result->push_back(std::make_pair(h->address()->asString(), "{\"error\": \"Failed to get host info\"}"));
+          result->push_back(
+              std::make_pair(h->address()->asString(), "{\"error\": \"Failed to get host info\"}"));
         }
       }
     }

source/extensions/common/wasm/context.h

@@ -220,6 +220,7 @@ class Context : public proxy_wasm::ContextBase,
                                std::string_view details) override;
 #if defined(HIGRESS)
   WasmResult injectEncodedDataToFilterChain(std::string_view body_text, bool end_stream) override;
+  WasmResult injectEncodedDataToFilterChainOnHeader(std::string_view body_text, bool end_stream);
   WasmResult getUpstreamHosts(StringPairs * result) override;
   WasmResult setUpstreamOverrideHost(std::string_view address) override;
 #endif

source/extensions/common/wasm/ext/BUILD

@@ -89,3 +89,21 @@ cc_proto_library(
         # "//external:protobuf_clib",
     ],
 )
+
+# NB: this target is compiled both to native code and to Wasm. Hence the generic rule.
+proto_library(
+    name = "inject_encoded_data_proto",
+    srcs = ["inject_encoded_data.proto"],
+    deps = [
+        "@com_google_protobuf//:struct_proto",
+    ],
+)
+
+# NB: this target is compiled both to native code and to Wasm. Hence the generic rule.
+cc_proto_library(
+    name = "inject_encoded_data_cc_proto",
+    deps = [
+        ":inject_encoded_data_proto",
+        # "//external:protobuf_clib",
+    ],
+)

source/extensions/common/wasm/ext/inject_encoded_data.proto

@@ -0,0 +1,8 @@
+syntax = "proto3";
+
+package envoy.source.extensions.common.wasm;
+
+message InjectEncodedDataToFilterChainArguments {
+  string body = 1;
+  bool endstream = 2;
+};

source/extensions/common/wasm/foreign.cc

@@ -1,5 +1,6 @@
 #include "source/common/common/logger.h"
 #include "source/extensions/common/wasm/ext/declare_property.pb.h"
+#include "source/extensions/common/wasm/ext/inject_encoded_data.pb.h"
 #include "source/extensions/common/wasm/wasm.h"
 
 #if defined(WASM_USE_CEL_PARSER)
@@ -271,6 +272,46 @@ RegisterForeignFunction
     registerDeclarePropertyForeignFunction("declare_property",
                                            createFromClass<DeclarePropertyFactory>());
 
+#if defined(HIGRESS)
+class InjectEncodedDataToFilterChainFactory: public Logger::Loggable<Logger::Id::wasm> {
+public:
+  WasmForeignFunction create(std::shared_ptr<InjectEncodedDataToFilterChainFactory> self) const {
+    WasmForeignFunction f = [self](WasmBase&, std::string_view arguments,
+                                    const std::function<void*(size_t size)>&) -> WasmResult {
+      envoy::source::extensions::common::wasm::InjectEncodedDataToFilterChainArguments args;
+      if (args.ParseFromArray(arguments.data(), arguments.size())) {
+        auto context = static_cast<Context*>(proxy_wasm::current_context_);
+        return context->injectEncodedDataToFilterChain(args.body(), args.endstream());
+      }
+      return WasmResult::BadArgument;
+    };
+    return f;
+  }
+};
+RegisterForeignFunction
+    registerInjectEncodedDataToFilterChainFactory("inject_encoded_data_to_filter_chain",
+                                            createFromClass<InjectEncodedDataToFilterChainFactory>());
+
+class InjectEncodedDataToFilterChainOnHeaderFactory: public Logger::Loggable<Logger::Id::wasm> {
+  public:
+    WasmForeignFunction create(std::shared_ptr<InjectEncodedDataToFilterChainOnHeaderFactory> self) const {
+      WasmForeignFunction f = [self](WasmBase&, std::string_view arguments,
+                                      const std::function<void*(size_t size)>&) -> WasmResult {
+        envoy::source::extensions::common::wasm::InjectEncodedDataToFilterChainArguments args;
+        if (args.ParseFromArray(arguments.data(), arguments.size())) {
+          auto context = static_cast<Context*>(proxy_wasm::current_context_);
+          return context->injectEncodedDataToFilterChainOnHeader(args.body(), args.endstream());
+        }
+        return WasmResult::BadArgument;
+      };
+      return f;
+    }
+  };
+  RegisterForeignFunction
+      registerInjectEncodedDataToFilterChainOnHeaderFactory("inject_encoded_data_to_filter_chain_on_header",
+                                              createFromClass<InjectEncodedDataToFilterChainOnHeaderFactory>());
+#endif
+
 } // namespace Wasm
 } // namespace Common
 } // namespace Extensions