Skip to content

fix: httpx.ParseJsonBody error when request has []byte field #4450 #4471

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jan 22, 2025
Merged

fix: httpx.ParseJsonBody error when request has []byte field #4450 #4471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion core/mapping/unmarshaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,15 @@
return true, tval.UnmarshalText(mv)
}
}

//[]byte
if fieldType.Kind() == reflect.Slice && fieldType.Elem().Kind() == reflect.Uint8 {
b, err := base64.StdEncoding.DecodeString(mapValue.(string))
if err != nil {
return false, err
}

Check warning on line 756 in core/mapping/unmarshaler.go

View check run for this annotation

Codecov / codecov/patch

core/mapping/unmarshaler.go#L755-L756 

Added lines #L755 - L756 were not covered by tests
value.SetBytes(b)
return true, nil
}
return false, nil
}

Expand Down
20 changes: 20 additions & 0 deletions rest/httpx/requests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package httpx

import (
"bytes"
"encoding/json"
"errors"
"net/http"
"net/http/httptest"
Expand Down Expand Up @@ -515,6 +516,25 @@ func TestParseJsonBody(t *testing.T) {
assert.Equal(t, "apple", v[0].Name)
assert.Equal(t, 18, v[0].Age)
})
t.Run("bytes field", func(t *testing.T) {
type v struct {
Signature []byte `json:"signature,optional"`
}
v1 := v{
Signature: []byte{0x01, 0xff, 0x00},
}
body, _ := json.Marshal(v1)
t.Logf("body:%s", string(body))
r := httptest.NewRequest(http.MethodPost, "/", strings.NewReader(string(body)))
r.Header.Set(ContentType, header.JsonContentType)
var v2 v
err := ParseJsonBody(r, &v2)
if assert.NoError(t, err) {
assert.Greater(t, len(v2.Signature), 0)
}
t.Logf("%x", v2.Signature)
assert.EqualValues(t, v1.Signature, v2.Signature)
})
}

func TestParseRequired(t *testing.T) {
Expand Down
Loading