Skip to content

Experimental #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wbpcode wants to merge 3 commits into
base: 1.27
Choose a base branch
from
Open

Experimental #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
330b5a4
Support StopIteration status in onRequestHeaders and onResponseHeader…
gengleilei Oct 9, 2023
9028736
fix 0_2_100 register callback
johnlanni May 21, 2024
cf20814
fix 0_2_100 register callback
Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions include/proxy-wasm/wasm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,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_;
Expand Down
2 changes: 1 addition & 1 deletion include/proxy-wasm/wasm_vm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 4 additions & 0 deletions src/bytecode_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
20 changes: 14 additions & 6 deletions src/context.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,14 +311,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);
}
Expand Down Expand Up @@ -487,7 +494,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.
Expand Down
7 changes: 6 additions & 1 deletion src/wasm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ void WasmBase::registerCallbacks() {
} else if (abiVersion() == AbiVersion::ProxyWasm_0_2_0) {
_REGISTER_PROXY(continue_stream);
_REGISTER_PROXY(close_stream);
} else if (abiVersion() == AbiVersion::ProxyWasm_0_2_1) {
} else if (abiVersion() == AbiVersion::ProxyWasm_0_2_1 ||
abiVersion() == AbiVersion::ProxyWasm_0_2_100) {
_REGISTER_PROXY(continue_stream);
_REGISTER_PROXY(close_stream);
_REGISTER_PROXY(get_log_level);
Expand Down Expand Up @@ -179,6 +180,10 @@ 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);
_GET_PROXY_ABI(on_response_headers, _abi_02);
_GET_PROXY(on_foreign_function);
}
#undef _GET_PROXY_ABI
#undef _GET_PROXY
Expand Down