Merge pull request higress-group#2 from higress-group/support-stopIteration

Support StopIteration status in onRequestHeaders and onResponseHeader…

Author: johnlanni

include/proxy-wasm/wasm.h

@@ -244,6 +244,7 @@ class WasmBase : public std::enable_shared_from_this<WasmBase> {
 
   WasmCallWord<2> on_request_headers_abi_01_;
   WasmCallWord<3> on_request_headers_abi_02_;
+  WasmCallWord<3> on_request_headers_abi_03_;
   WasmCallWord<3> on_request_body_;
   WasmCallWord<2> on_request_trailers_;
   WasmCallWord<2> on_request_metadata_;

include/proxy-wasm/wasm_vm.h

@@ -139,7 +139,7 @@ enum class Cloneable {
   InstantiatedModule // VMs can be cloned from an instantiated module.
 };
 
-enum class AbiVersion { ProxyWasm_0_1_0, ProxyWasm_0_2_0, ProxyWasm_0_2_1, Unknown };
+enum class AbiVersion { ProxyWasm_0_1_0, ProxyWasm_0_2_0, ProxyWasm_0_2_1, ProxyWasm_0_2_100, Unknown };
 
 class NullPlugin;
 

src/bytecode_util.cc

@@ -83,6 +83,10 @@ bool BytecodeUtil::getAbiVersion(std::string_view bytecode, proxy_wasm::AbiVersi
             ret = AbiVersion::ProxyWasm_0_2_1;
             return true;
           }
+          if (export_name == "proxy_abi_version_0_2_100") {
+            ret = AbiVersion::ProxyWasm_0_2_100;
+            return true;
+          }
         }
         // Skip export's index.
         if (!parseVarint(pos, end, export_name_size)) {

src/context.cc

@@ -317,14 +317,21 @@ template <typename P> static uint32_t headerSize(const P &p) { return p ? p->siz
 
 FilterHeadersStatus ContextBase::onRequestHeaders(uint32_t headers, bool end_of_stream) {
   CHECK_FAIL_HTTP(FilterHeadersStatus::Continue, FilterHeadersStatus::StopAllIterationAndWatermark);
-  if (!wasm_->on_request_headers_abi_01_ && !wasm_->on_request_headers_abi_02_) {
+  if (!wasm_->on_request_headers_abi_01_ && !wasm_->on_request_headers_abi_02_ &&
+      !wasm_->on_request_headers_abi_03_) {
     return FilterHeadersStatus::Continue;
   }
   DeferAfterCallActions actions(this);
-  const auto result = wasm_->on_request_headers_abi_01_
-                          ? wasm_->on_request_headers_abi_01_(this, id_, headers)
-                          : wasm_->on_request_headers_abi_02_(this, id_, headers,
-                                                              static_cast<uint32_t>(end_of_stream));
+  uint64_t result;
+  if (wasm_->on_request_headers_abi_01_) {
+    result = wasm_->on_request_headers_abi_01_(this, id_, headers);
+  } else if (wasm_->on_request_headers_abi_02_) {
+    result =
+        wasm_->on_request_headers_abi_02_(this, id_, headers, static_cast<uint32_t>(end_of_stream));
+  } else if (wasm_->on_request_headers_abi_03_) {
+    result =
+        wasm_->on_request_headers_abi_03_(this, id_, headers, static_cast<uint32_t>(end_of_stream));
+  }
   CHECK_FAIL_HTTP(FilterHeadersStatus::Continue, FilterHeadersStatus::StopAllIterationAndWatermark);
   return convertVmCallResultToFilterHeadersStatus(result);
 }
@@ -493,7 +500,8 @@ FilterHeadersStatus ContextBase::convertVmCallResultToFilterHeadersStatus(uint64
       result > static_cast<uint64_t>(FilterHeadersStatus::StopAllIterationAndWatermark)) {
     return FilterHeadersStatus::StopAllIterationAndWatermark;
   }
-  if (result == static_cast<uint64_t>(FilterHeadersStatus::StopIteration)) {
+  if ((wasm_->on_request_headers_abi_01_ || wasm_->on_request_headers_abi_02_) &&
+      result == static_cast<uint64_t>(FilterHeadersStatus::StopIteration)) {
     // Always convert StopIteration (pause processing headers, but continue processing body)
     // to StopAllIterationAndWatermark (pause all processing), since the former breaks all
     // assumptions about HTTP processing.

src/wasm.cc

@@ -200,6 +200,8 @@ void WasmBase::getFunctions() {
     _GET_PROXY_ABI(on_request_headers, _abi_02);
     _GET_PROXY_ABI(on_response_headers, _abi_02);
     _GET_PROXY(on_foreign_function);
+  } else if (abiVersion() == AbiVersion::ProxyWasm_0_2_100) {
+    _GET_PROXY_ABI(on_request_headers, _abi_03);
   }
 #undef _GET_PROXY_ABI
 #undef _GET_PROXY