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

fix: avoid waiting for missing request bodies in transformer (#4024)

Browse Source 
Signed-off-by: johnlanni <zty98751@alibaba-inc.com>
This commit is contained in:
澄潭
2026-06-25 17:36:01 +08:00
committed by GitHub
parent 39ec41aab6
commit 6c98ea74e0
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/wasm-go/extensions/transformer/main.go
View File

@@ -39,6 +39,7 @@ func init() {
wrapper.ProcessRequestBodyBy(onHttpRequestBody), wrapper.ProcessRequestBodyBy(onHttpRequestBody),
wrapper.ProcessResponseHeadersBy(onHttpResponseHeaders), wrapper.ProcessResponseHeadersBy(onHttpResponseHeaders),
wrapper.ProcessResponseBodyBy(onHttpResponseBody), wrapper.ProcessResponseBodyBy(onHttpResponseBody),
wrapper.WithRebuildMaxMemBytes[TransformerConfig](200*1024*1024),
) )
} }
@@ -343,11 +344,12 @@ func onHttpRequestHeaders(ctx wrapper.HttpContext, config TransformerConfig, log
isValidRequestContent := isValidRequestContentType(contentType) isValidRequestContent := isValidRequestContentType(contentType)
isBodyChange := config.reqTrans.IsBodyChange() isBodyChange := config.reqTrans.IsBodyChange()
needBodyMapSource := config.reqTrans.NeedBodyMapSource() needBodyMapSource := config.reqTrans.NeedBodyMapSource()
hasRequestBody := ctx.HasRequestBody()
log.Debugf("contentType:%s, isValidRequestContent:%v, isBodyChange:%v, needBodyMapSource:%v", log.Debugf("contentType:%s, isValidRequestContent:%v, isBodyChange:%v, needBodyMapSource:%v, hasRequestBody:%v",
contentType, isValidRequestContent, isBodyChange, needBodyMapSource) contentType, isValidRequestContent, isBodyChange, needBodyMapSource, hasRequestBody)
if isBodyChange && isValidRequestContent { if isBodyChange && isValidRequestContent && hasRequestBody {
delete(hs, "content-length") delete(hs, "content-length")
} }
@@ -361,7 +363,7 @@ func onHttpRequestHeaders(ctx wrapper.HttpContext, config TransformerConfig, log
ctx.SetContext("headers", hs) ctx.SetContext("headers", hs)
ctx.SetContext("querys", qs) ctx.SetContext("querys", qs)
if !isValidRequestContent || (!isBodyChange && !needBodyMapSource) { if !hasRequestBody || !isValidRequestContent || (!isBodyChange && !needBodyMapSource) {
ctx.DontReadRequestBody() ctx.DontReadRequestBody()
} else if needBodyMapSource { } else if needBodyMapSource {
// we need do transform during body phase // we need do transform during body phase

37
plugins/wasm-go/extensions/transformer/main_test.go
View File

@@ -424,6 +424,43 @@ func TestRequest_MapFromBody_DelaysHeaderTransform(t *testing.T) {
}) })
} }
func TestRequest_MapFromBody_NoRequestBodyDoesNotPause(t *testing.T) {
test.RunTest(t, func(t *testing.T) {
host, status := test.NewTestHost(configJSON(map[string]any{
"reqRules": []map[string]any{
{
"operate": "map",
"mapSource": "body",
"headers": []map[string]any{
{"fromKey": "user.id", "toKey": "X-User-Id"},
},
},
{
"operate": "add",
"headers": []map[string]any{
{"key": "X-Static", "value": "ok"},
},
},
},
}))
defer host.Reset()
require.Equal(t, types.OnPluginStartStatusOK, status)
action := host.CallOnHttpRequestHeaders([][2]string{
{":authority", "test.com"},
{":path", "/p"},
{":method", "POST"},
{"content-type", "application/json"},
}, test.WithEndOfStream(true))
require.Equal(t, types.ActionContinue, action, "request without body must not wait for body callback")
got := headersToMap(host.GetRequestHeaders())
require.Equal(t, []string{"ok"}, got["x-static"])
require.NotContains(t, got, "x-user-id")
host.CompleteHttp()
})
}
// --- regex template --- // --- regex template ---
func TestRequest_Headers_AddWithHostPattern(t *testing.T) { func TestRequest_Headers_AddWithHostPattern(t *testing.T) {