-
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
feat(net/ghttp): add AutoDecodingBody
configuration for ghttp.Server
#4197
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
gqcn
wants to merge
2
commits into
master
Choose a base branch
from
feat/auto-decoding-body
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,6 +10,7 @@ import ( | |
"bytes" | ||
"fmt" | ||
"io" | ||
"mime" | ||
"mime/multipart" | ||
"net/http" | ||
"reflect" | ||
|
@@ -233,22 +234,46 @@ 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 | ||
} | ||
|
||
// Skip binary content types, which should not be parsed. | ||
if r.isBinaryContentType(contentType) { | ||
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) | ||
return | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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) | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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()) | ||
} | ||
} | ||
|
@@ -383,3 +408,42 @@ func (r *Request) GetMultipartFiles(name string) []*multipart.FileHeader { | |
} | ||
return nil | ||
} | ||
|
||
// isBinaryContentType check the content type is binary or not. | ||
func (r *Request) isBinaryContentType(contentType string) bool { | ||
// parseMediaType | ||
mimeType, _, err := mime.ParseMediaType(contentType) | ||
// If the content type is invalid, it's treated as binary. | ||
if err != nil { | ||
return true | ||
} | ||
|
||
// Lowercase the MIME type for easier comparison | ||
mimeType = strings.ToLower(mimeType) | ||
|
||
// if the MIME type is text, then it's definitely not binary | ||
if strings.HasPrefix(mimeType, "text/") { | ||
return false | ||
} | ||
|
||
// defined non-binary MIME types | ||
nonBinaryTypes := map[string]struct{}{ | ||
"application/json": {}, | ||
"application/xml": {}, | ||
"application/x-www-form-urlencoded": {}, | ||
"application/javascript": {}, | ||
"application/xhtml+xml": {}, | ||
} | ||
if _, ok := nonBinaryTypes[mimeType]; ok { | ||
return false | ||
} | ||
|
||
// if the MIME type is JSON or XML, it's definitely not binary | ||
if strings.HasSuffix(mimeType, "+json") || strings.HasSuffix(mimeType, "+xml") { | ||
return false | ||
} | ||
|
||
// otherwise, it's binary | ||
// (this includes application/octet-stream、image/*、video/*、audio/*) | ||
return true | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.