zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-11 00:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: always ignore unknown fields for gateway requests (#5072)

Browse Source 
Signed-off-by: kevin <wanjunfeng@gmail.com>
This commit is contained in:
Kevin Wan
2025-08-09 13:07:17 +08:00
committed by GitHub
parent 00e67b9d20
commit 2583673c8b
4 changed files with 43 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gateway/internal/requestparser.go
View File

@@ -13,7 +13,7 @@ import (
)
// NewRequestParser creates a new request parser from the given http.Request and resolver.
func NewRequestParser(r *http.Request, resolver jsonpb.AnyResolver, ignoreUnknownFields bool) (grpcurl.RequestParser, error) {
func NewRequestParser(r *http.Request, resolver jsonpb.AnyResolver) (grpcurl.RequestParser, error) {
vars := pathvar.Vars(r)
params, err := httpx.GetFormValues(r)
if err != nil {
@@ -26,14 +26,11 @@ func NewRequestParser(r *http.Request, resolver jsonpb.AnyResolver, ignoreUnknow
body, ok := getBody(r)
if !ok {
return buildJsonRequestParserFromMap(params, resolver, ignoreUnknownFields)
return buildJsonRequestParserFromMap(params, resolver)
}
if len(params) == 0 {
if ignoreUnknownFields {
return buildJsonRequestParserWithUnknownFields(body, resolver)
}
return buildJsonRequestParser(body, resolver)
return buildJsonRequestParserFromReader(body, resolver)
}
m := make(map[string]any)
@@ -45,32 +42,27 @@ func NewRequestParser(r *http.Request, resolver jsonpb.AnyResolver, ignoreUnknow
m[k] = v
}
return buildJsonRequestParserFromMap(m, resolver, ignoreUnknownFields)
return buildJsonRequestParserFromMap(m, resolver)
}
func buildJsonRequestParserFromMap(data map[string]any, resolver jsonpb.AnyResolver, ignoreUnknownFields bool) (grpcurl.RequestParser, error) {
func buildJsonRequestParserFromMap(data map[string]any, resolver jsonpb.AnyResolver) (
grpcurl.RequestParser, error) {
var buf bytes.Buffer
if err := json.NewEncoder(&buf).Encode(data); err != nil {
return nil, err
}
if ignoreUnknownFields {
return buildJsonRequestParserWithUnknownFields(&buf, resolver)
}
return buildJsonRequestParser(&buf, resolver)
return buildJsonRequestParserFromReader(&buf, resolver)
}
// buildJsonRequestParser creates a JSON request parser with default settings
func buildJsonRequestParser(data io.Reader, resolver jsonpb.AnyResolver) (grpcurl.RequestParser, error) {
return grpcurl.NewJSONRequestParser(data, resolver), nil
}
// buildJsonRequestParserWithUnknownFields creates a JSON request parser that ignores unknown fields
func buildJsonRequestParserWithUnknownFields(data io.Reader, resolver jsonpb.AnyResolver) (grpcurl.RequestParser, error) {
// buildJsonRequestParserFromReader creates a JSON request parser with ignoring unknown fields.
func buildJsonRequestParserFromReader(data io.Reader, resolver jsonpb.AnyResolver) (
grpcurl.RequestParser, error) {
unmarshaler := jsonpb.Unmarshaler{
AllowUnknownFields: true,
AnyResolver: resolver,
}
return grpcurl.NewJSONRequestParserWithUnmarshaler(data, unmarshaler), nil
}