Skip to content
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

fix: Wasm-rust plugin crashed when header name or value is not a valid UTF8 string #1295

Merged
merged 2 commits into from
Sep 10, 2024
Merged

fix: Wasm-rust plugin crashed when header name or value is not a valid UTF8 string #1295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ab10d
feat(wasm): 优化 PluginHttpWrapper 中 http header 的处理逻辑
jaymie9019 Sep 10, 2024
4b3a28a
style(wasm-rust-sdk): cargo fmt and cargo clippy
jaymiejjj Sep 10, 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
43 changes: 39 additions & 4 deletions plugins/wasm-rust/src/plugin_wrapper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@

use crate::rule_matcher::SharedRuleMatcher;
use multimap::MultiMap;
use proxy_wasm::hostcalls::log;
use proxy_wasm::traits::{Context, HttpContext, RootContext};
use proxy_wasm::types::LogLevel;
use proxy_wasm::types::{Action, Bytes, DataAction, HeaderAction};
use serde::de::DeserializeOwned;

Expand Down Expand Up @@ -143,9 +145,26 @@ where
fn on_http_request_headers(&mut self, num_headers: usize, end_of_stream: bool) -> HeaderAction {
let binding = self.rule_matcher.borrow();
self.config = binding.get_match_config().map(|config| config.1.clone());
for (k, v) in self.get_http_request_headers() {
self.req_headers.insert(k, v);

for (k, v) in self.get_http_request_headers_bytes() {
match String::from_utf8(v) {
Ok(header_value) => {
self.req_headers.insert(k, header_value);
}
Err(_) => {
log(
LogLevel::Warn,
format!(
"request http header contains non-ASCII characters header: {}",
k
)
.as_str(),
)
.unwrap();
}
}
}

if let Some(config) = &self.config {
self.http_content.on_config(config);
}
Expand Down Expand Up @@ -187,9 +206,25 @@ where
num_headers: usize,
end_of_stream: bool,
) -> HeaderAction {
for (k, v) in self.get_http_response_headers() {
self.res_headers.insert(k, v);
for (k, v) in self.get_http_response_headers_bytes() {
match String::from_utf8(v) {
Ok(header_value) => {
self.res_headers.insert(k, header_value);
}
Err(_) => {
log(
LogLevel::Warn,
format!(
"response http header contains non-ASCII characters header: {}",
k
)
.as_str(),
)
.unwrap();
}
}
}

let ret = self
.http_content
.on_http_response_headers(num_headers, end_of_stream);
Expand Down
Loading