From 45d66ce2fe82ed8c690012c9921359a7f5d3a9f4 Mon Sep 17 00:00:00 2001 From: 1-1-2 <50569812+1-1-2@users.noreply.github.com> Date: Thu, 15 Aug 2024 22:25:53 +0800 Subject: [PATCH] fix: decode body if enable gzip (#7003) --- internal/net/serve.go | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/internal/net/serve.go b/internal/net/serve.go index adee75ae1d6..e58d7eb9f46 100644 --- a/internal/net/serve.go +++ b/internal/net/serve.go @@ -1,6 +1,7 @@ package net import ( + "compress/gzip" "context" "fmt" "io" @@ -222,8 +223,19 @@ func RequestHttp(ctx context.Context, httpMethod string, headerOverride http.Hea } // TODO clean header with blocklist or passlist res.Header.Del("set-cookie") + var reader io.Reader if res.StatusCode >= 400 { - all, _ := io.ReadAll(res.Body) + // 根据 Content-Encoding 判断 Body 是否压缩 + switch res.Header.Get("Content-Encoding") { + case "gzip": + // 使用gzip.NewReader解压缩 + reader, _ = gzip.NewReader(res.Body) + defer reader.(*gzip.Reader).Close() + default: + // 没有Content-Encoding,直接读取 + reader = res.Body + } + all, _ := io.ReadAll(reader) _ = res.Body.Close() msg := string(all) log.Debugln(msg)