Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 25 additions & 7 deletions net/ghttp/ghttp_request_param.go
Original file line number Diff line number Diff line change
Expand Up @@ -233,22 +233,40 @@ func (r *Request) parseBody() {
if r.ContentLength == 0 {
return
}
// If it's a multipart request, it does not parse the body content.
contentType := r.Header.Get("Content-Type")
if gstr.Contains(contentType, "multipart/") {
return
}
if body := r.GetBody(); len(body) > 0 {
// Trim space/new line characters.
body = bytes.TrimSpace(body)
// JSON format checks.
if body[0] == '{' && body[len(body)-1] == '}' {

// json/xml content type checks.
if gstr.Contains(contentType, "/json") {
_ = json.UnmarshalUseNumber(body, &r.bodyMap)
return
}
// XML format checks.
if len(body) > 5 && bytes.EqualFold(body[:5], xmlHeaderBytes) {
if gstr.Contains(contentType, "/xml") {
r.bodyMap, _ = gxml.DecodeWithoutRoot(body)
Copy link

Copilot AI Mar 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After decoding XML in the AutoDecodingBody block, consider adding a return statement to prevent falling through to the default decoding logic, which may inadvertently override the XML decoding result.

Copilot uses AI. Check for mistakes.
return
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

保留错误应该会更好?

}
if body[0] == '<' && body[len(body)-1] == '>' {
r.bodyMap, _ = gxml.DecodeWithoutRoot(body)
// Auto decoding body content.
if r.Server.config.AutoDecodingBody {
// JSON format checks.
if body[0] == '{' && body[len(body)-1] == '}' {
_ = json.UnmarshalUseNumber(body, &r.bodyMap)
}
// XML format checks.
if len(body) > 5 && bytes.EqualFold(body[:5], xmlHeaderBytes) {
r.bodyMap, _ = gxml.DecodeWithoutRoot(body)
}
if body[0] == '<' && body[len(body)-1] == '>' {
r.bodyMap, _ = gxml.DecodeWithoutRoot(body)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

为什么后面两个if不是else if

}
// Default parameters decoding.
if contentType := r.Header.Get("Content-Type"); (contentType == "" || !gstr.Contains(contentType, "multipart/")) && r.bodyMap == nil {
if r.bodyMap == nil {
r.bodyMap, _ = gstr.Parse(r.GetBodyString())
}
}
Expand Down
6 changes: 5 additions & 1 deletion net/ghttp/ghttp_server_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ type ServerConfig struct {
// Logging.
// ======================================================================================================

Logger *glog.Logger `json:"logger"` // Logger specifies the logger for server.
Logger *glog.Logger `json:"logger"` // Logger directly specifies the logger for server.
LogPath string `json:"logPath"` // LogPath specifies the directory for storing logging files.
LogLevel string `json:"logLevel"` // LogLevel specifies the logging level for logger.
LogStdout bool `json:"logStdout"` // LogStdout specifies whether printing logging content to stdout.
Expand Down Expand Up @@ -267,6 +267,9 @@ type ServerConfig struct {

// DumpRouterMap specifies whether automatically dumps router map when server starts.
DumpRouterMap bool `json:"dumpRouterMap"`

// AutoDecodingBody specifies whether automatically decodes request body using common encoding types: json/xml.
AutoDecodingBody bool `json:"auto_decoding_body"`
}

// NewConfig creates and returns a ServerConfig object with default configurations.
Expand Down Expand Up @@ -313,6 +316,7 @@ func NewConfig() ServerConfig {
Graceful: false,
GracefulTimeout: 2, // seconds
GracefulShutdownTimeout: 5, // seconds
AutoDecodingBody: true,
}
}

Expand Down
Loading