From ebf482cc78eb59c0e82048dd5da67e52b80ff5f4 Mon Sep 17 00:00:00 2001
From: xiaoma <xiaoma@c5game.com>
Date: Tue, 10 Sep 2024 11:45:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(wasm):=20=E4=BC=98=E5=8C=96=20req=20hea?=
 =?UTF-8?q?der=20=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化 PluginHttpWrapper req_header 获取方方式，避免因为不规范的 http header 导致 plugin panic，并且打印不规范的 header 日志
---
 plugins/wasm-rust/src/plugin_wrapper.rs | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/plugins/wasm-rust/src/plugin_wrapper.rs b/plugins/wasm-rust/src/plugin_wrapper.rs
index 85b556c6bc..fcb6f7a574 100644
--- a/plugins/wasm-rust/src/plugin_wrapper.rs
+++ b/plugins/wasm-rust/src/plugin_wrapper.rs
@@ -17,6 +17,9 @@ use multimap::MultiMap;
 use proxy_wasm::traits::{Context, HttpContext, RootContext};
 use proxy_wasm::types::{Action, Bytes, DataAction, HeaderAction};
 use serde::de::DeserializeOwned;
+use proxy_wasm::hostcalls::log;
+use proxy_wasm::types::LogLevel;
+
 
 pub trait RootContextWrapper<PluginConfig>: RootContext
 where
@@ -143,9 +146,21 @@ 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!("http header contains non-ASCII characters header: {}", k ).as_str(),
+                    ).unwrap();
+                }
+            }
         }
+
         if let Some(config) = &self.config {
             self.http_content.on_config(config);
         }

From cea757a999afef950d3c541e4fbd3436dc608002 Mon Sep 17 00:00:00 2001
From: jaymie9019 <jjj19929019@outlook.com>
Date: Tue, 10 Sep 2024 15:55:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat(wasm):=20=E4=BC=98=E5=8C=96=20PluginHt?=
 =?UTF-8?q?tpWrapper=20=E4=B8=AD=20res=5Fheaders=20=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/wasm-rust/src/plugin_wrapper.rs | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/plugins/wasm-rust/src/plugin_wrapper.rs b/plugins/wasm-rust/src/plugin_wrapper.rs
index fcb6f7a574..76e8d1a05b 100644
--- a/plugins/wasm-rust/src/plugin_wrapper.rs
+++ b/plugins/wasm-rust/src/plugin_wrapper.rs
@@ -155,7 +155,7 @@ where
                 Err(_) => {
                     log(
                         LogLevel::Warn,
-                        format!("http header contains non-ASCII characters header: {}", k ).as_str(),
+                        format!("request http header contains non-ASCII characters header: {}", k ).as_str(),
                     ).unwrap();
                 }
             }
@@ -202,9 +202,20 @@ 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);