rename to allow_on_headers_stop_iteration

Rename option to allow_on_headers_stop_iteration and test onResponseHeaders
behavior as well.

Signed-off-by: Michael Warres <[email protected]>

Author: mpwarres

include/proxy-wasm/context.h

@@ -402,7 +402,7 @@ class ContextBase : public RootInterface,
   // translates FilterHeaderStatus::StopIteration to
   // FilterHeadersStatus::StopAllIterationAndWatermark, which is the default
   // behavior for v0.2.* of the Proxy-Wasm ABI.
-  bool allow_on_request_headers_stop_iteration_ = false;
+  bool allow_on_headers_stop_iteration_ = false;
 
 private:
   // helper functions

src/context.cc

@@ -494,7 +494,7 @@ FilterHeadersStatus ContextBase::convertVmCallResultToFilterHeadersStatus(uint64
     return FilterHeadersStatus::StopAllIterationAndWatermark;
   }
   if (result == static_cast<uint64_t>(FilterHeadersStatus::StopIteration) &&
-      !allow_on_request_headers_stop_iteration_) {
+      !allow_on_headers_stop_iteration_) {
     // Default behavior for Proxy-Wasm 0.2.* ABI is to translate StopIteration
     // (pause processing headers, but continue processing body) to
     // StopAllIterationAndWatermark (pause all processing), as described in

test/stop_iteration_test.cc

@@ -24,7 +24,7 @@ INSTANTIATE_TEST_SUITE_P(WasmEngines, TestVm, testing::ValuesIn(getWasmEngines()
                          });
 
 // TestVm is parameterized for each engine and creates a VM on construction.
-TEST_P(TestVm, AllowOnRequestHeadersStopIteration) {
+TEST_P(TestVm, AllowOnHeadersStopIteration) {
   // Read the wasm source.
   auto source = readTestWasmFile("stop_iteration.wasm");
   ASSERT_FALSE(source.empty());
@@ -47,8 +47,8 @@ TEST_P(TestVm, AllowOnRequestHeadersStopIteration) {
   // On the root context, call onConfigure().
   ASSERT_TRUE(wasm->configure(root_context, plugin));
 
-  // By default, stream context onRequestHeaders translates
-  // FilterHeadersStatus::StopIteration to
+  // By default, stream context onRequestHeaders and onResponseHeaders
+  // translates FilterHeadersStatus::StopIteration to
   // FilterHeadersStatus::StopAllIterationAndWatermark.
   {
     auto wasm_handle = std::make_shared<WasmHandleBase>(wasm);
@@ -57,7 +57,8 @@ TEST_P(TestVm, AllowOnRequestHeadersStopIteration) {
     stream_context.onCreate();
     EXPECT_EQ(stream_context.onRequestHeaders(/*headers=*/0, /*end_of_stream=*/false),
               FilterHeadersStatus::StopAllIterationAndWatermark);
-    stream_context.onResponseHeaders(/*headers=*/0, /*end_of_stream=*/false);
+    EXPECT_EQ(stream_context.onResponseHeaders(/*headers=*/0, /*end_of_stream=*/false),
+              FilterHeadersStatus::StopAllIterationAndWatermark);
     stream_context.onDone();
     stream_context.onDelete();
   }
@@ -68,11 +69,12 @@ TEST_P(TestVm, AllowOnRequestHeadersStopIteration) {
     auto wasm_handle = std::make_shared<WasmHandleBase>(wasm);
     auto plugin_handle = std::make_shared<PluginHandleBase>(wasm_handle, plugin);
     auto stream_context = TestContext(wasm.get(), root_context->id(), plugin_handle);
-    stream_context.set_allow_on_request_headers_stop_iteration(true);
+    stream_context.set_allow_on_headers_stop_iteration(true);
     stream_context.onCreate();
     EXPECT_EQ(stream_context.onRequestHeaders(/*headers=*/0, /*end_of_stream=*/false),
               FilterHeadersStatus::StopIteration);
-    stream_context.onResponseHeaders(/*headers=*/0, /*end_of_stream=*/false);
+    EXPECT_EQ(stream_context.onResponseHeaders(/*headers=*/0, /*end_of_stream=*/false),
+              FilterHeadersStatus::StopIteration);
     stream_context.onDone();
     stream_context.onDelete();
   }

test/test_data/stop_iteration.cc

@@ -21,6 +21,10 @@ class StopIterationContext : public Context {
   FilterHeadersStatus onRequestHeaders(uint32_t headers, bool end_of_stream) override {
     return FilterHeadersStatus::StopIteration;
   }
+
+  FilterHeadersStatus onResponseHeaders(uint32_t headers, bool end_of_stream) override {
+    return FilterHeadersStatus::StopIteration;
+  }
 };
 
 static RegisterContextFactory register_StaticContext(CONTEXT_FACTORY(StopIterationContext),

test/utility.h

@@ -133,8 +133,8 @@ class TestContext : public ContextBase {
         .count();
   }
 
-  void set_allow_on_request_headers_stop_iteration(bool allow) {
-    allow_on_request_headers_stop_iteration_ = allow;
+  void set_allow_on_headers_stop_iteration(bool allow) {
+    allow_on_headers_stop_iteration_ = allow;
   }
 
 private: