From 4189fcf726c7cb4b5bd265524a71b282d0bdbe5e Mon Sep 17 00:00:00 2001 From: Jian Qiu Date: Fri, 4 Apr 2025 08:17:26 +0800 Subject: [PATCH] fix: hide image location (#22363) Co-authored-by: Qiu Jian --- go.mod | 2 +- go.sum | 4 ++-- pkg/appsrv/appsrv.go | 5 ++--- pkg/image/models/images.go | 2 +- vendor/modules.txt | 2 +- vendor/yunion.io/x/pkg/trace/trace.go | 17 +++++++++++------ 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index 6d082fba29..b895f90c68 100644 --- a/go.mod +++ b/go.mod @@ -98,7 +98,7 @@ require ( yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 - yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08 + yunion.io/x/pkg v1.10.4-0.20250403114914-586e94d39281 yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 yunion.io/x/sqlchemy v1.1.3-0.20250307104108-2f8e0af883e9 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c diff --git a/go.sum b/go.sum index 31f75e6f15..7116448648 100644 --- a/go.sum +++ b/go.sum @@ -1391,8 +1391,8 @@ yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 h1:Hu/4ERvoWaN6aiFs4h4/yvVB yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc= yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E= yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E= -yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08 h1:GBX/Bb72xWWp++tClxj7PjuhZnRhzgvmLIbD3RyEUZc= -yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM= +yunion.io/x/pkg v1.10.4-0.20250403114914-586e94d39281 h1:P22/MaBc9bqE9DyHvS3oQjc4XsaIEbIVGMLdTSroDew= +yunion.io/x/pkg v1.10.4-0.20250403114914-586e94d39281/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM= yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 h1:1KJ3YYinydPHpDEQRXdr/T8SYcKZ5Er+m489H+PnaQ4= yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo= yunion.io/x/sqlchemy v1.1.3-0.20250307104108-2f8e0af883e9 h1:KU8BikBBUJlSkA1Ib01htqaDdzt20K+ezNkTZD8Rxjk= diff --git a/pkg/appsrv/appsrv.go b/pkg/appsrv/appsrv.go index a7e0466436..9dd97067fd 100644 --- a/pkg/appsrv/appsrv.go +++ b/pkg/appsrv/appsrv.go @@ -23,7 +23,6 @@ import ( "encoding/base64" "fmt" "io" - "io/ioutil" olog "log" "math/rand" "net" @@ -421,9 +420,9 @@ func (app *Application) defaultHandle(w http.ResponseWriter, r *http.Request, ri task.appParams.Request = r task.appParams.Response = w if r.Body != nil && r.ContentLength > 0 && getContentType(r) == ContentTypeJson { - data, _ := ioutil.ReadAll(r.Body) + data, _ := io.ReadAll(r.Body) task.appParams.Body, _ = jsonutils.Parse(data) - r.Body = ioutil.NopCloser(bytes.NewBuffer(data)) + r.Body = io.NopCloser(bytes.NewBuffer(data)) } session.Run( task, diff --git a/pkg/image/models/images.go b/pkg/image/models/images.go index 178cf919ef..7803074f61 100644 --- a/pkg/image/models/images.go +++ b/pkg/image/models/images.go @@ -135,7 +135,7 @@ type SImage struct { // 镜像大小, 单位Byte Size int64 `nullable:"true" list:"user" create:"optional"` // 存储地址 - Location string `nullable:"true" list:"user"` + Location string `nullable:"true"` // 镜像格式 DiskFormat string `width:"20" charset:"ascii" nullable:"true" list:"user" create:"optional" default:"raw"` diff --git a/vendor/modules.txt b/vendor/modules.txt index ea6dd3e9e3..c3b3bb732c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1882,7 +1882,7 @@ yunion.io/x/log/hooks yunion.io/x/ovsdb/cli_util yunion.io/x/ovsdb/schema/ovn_nb yunion.io/x/ovsdb/types -# yunion.io/x/pkg v1.10.4-0.20250324235849-27051af0af08 +# yunion.io/x/pkg v1.10.4-0.20250403114914-586e94d39281 ## explicit; go 1.18 yunion.io/x/pkg/appctx yunion.io/x/pkg/errors diff --git a/vendor/yunion.io/x/pkg/trace/trace.go b/vendor/yunion.io/x/pkg/trace/trace.go index b9a06e60dc..ae125c6786 100644 --- a/vendor/yunion.io/x/pkg/trace/trace.go +++ b/vendor/yunion.io/x/pkg/trace/trace.go @@ -85,7 +85,9 @@ func StartServerTrace(w http.ResponseWriter, r *http.Request, localSpanName stri var debug bool var localAddr string var localPort int + var isBorder bool if len(traceId) == 0 { + isBorder = true traceId = utils.GenRequestId(4) spanId = "0" spanName = localSpanName @@ -144,12 +146,15 @@ func StartServerTrace(w http.ResponseWriter, r *http.Request, localSpanName stri RemoteEndpoint: remoteEp, Tags: tags, } - w.Header().Set(X_YUNION_SPAN_NAME, spanName) - w.Header().Set(X_YUNION_PEER_SERVICE_NAME, localServiceName) - w.Header().Set(X_YUNION_REMOTE_ADDR, r.RemoteAddr) - if tags != nil { - for k, v := range tags { - w.Header().Set(X_YUNION_TRACE_TAG+k, v) + if !isBorder { + // do not distribute trace info across border + w.Header().Set(X_YUNION_SPAN_NAME, spanName) + w.Header().Set(X_YUNION_PEER_SERVICE_NAME, localServiceName) + w.Header().Set(X_YUNION_REMOTE_ADDR, r.RemoteAddr) + if tags != nil { + for k, v := range tags { + w.Header().Set(X_YUNION_TRACE_TAG+k, v) + } } } return &trace