jiazhizhong/higress
1
0
Fork 0
mirror of https://github.com/alibaba/higress.git synced 2026-06-08 12:17:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: jaymie9019 <jaymie9019@gmail.com>
This commit is contained in:
jaymie9019
2024-09-10 20:00:26 +08:00
committed by GitHub
parent d18e22432a
commit ffe3aceefc
1 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
plugins/wasm-rust/src/plugin_wrapper.rs
View File

@@ -14,7 +14,9 @@
use crate::rule_matcher::SharedRuleMatcher; use crate::rule_matcher::SharedRuleMatcher;
use multimap::MultiMap; use multimap::MultiMap;
use proxy_wasm::hostcalls::log;
use proxy_wasm::traits::{Context, HttpContext, RootContext}; use proxy_wasm::traits::{Context, HttpContext, RootContext};
use proxy_wasm::types::LogLevel;
use proxy_wasm::types::{Action, Bytes, DataAction, HeaderAction}; use proxy_wasm::types::{Action, Bytes, DataAction, HeaderAction};
use serde::de::DeserializeOwned; use serde::de::DeserializeOwned;
@@ -143,9 +145,26 @@ where
fn on_http_request_headers(&mut self, num_headers: usize, end_of_stream: bool) -> HeaderAction { fn on_http_request_headers(&mut self, num_headers: usize, end_of_stream: bool) -> HeaderAction {
let binding = self.rule_matcher.borrow(); let binding = self.rule_matcher.borrow();
self.config = binding.get_match_config().map(|config| config.1.clone()); 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 { if let Some(config) = &self.config {
self.http_content.on_config(config); self.http_content.on_config(config);
} }
@@ -187,9 +206,25 @@ where
num_headers: usize, num_headers: usize,
end_of_stream: bool, end_of_stream: bool,
) -> HeaderAction { ) -> HeaderAction {
for (k, v) in self.get_http_response_headers() { for (k, v) in self.get_http_response_headers_bytes() {
self.res_headers.insert(k, v); 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 let ret = self
.http_content .http_content
.on_http_response_headers(num_headers, end_of_stream); .on_http_response_headers(num_headers, end_of_stream);