go/kratos
1
0
Fork 0
mirror of https://github.com/go-kratos/kratos.git synced 2025-02-21 19:19:32 +02:00
Code Issues Releases Activity

feat: decode google.protobuf.BytesValue compatible base64.URLEncoding. (#1991)

Browse Source
This commit is contained in:
Comolli 2022-05-19 22:37:44 +08:00 committed by GitHub
parent ab04490d49
commit ec78198050
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
encoding/form/form_test.go
View File

@ -1,6 +1,7 @@
package form
import (
"encoding/base64"
"reflect"
"testing"
@ -178,3 +179,16 @@ func TestDecodeStructPb(t *testing.T) {
t.Errorf("except %v, got %v", "go-kratos", req.Data.GetFields()["name2"].GetStringValue())
}
}
func TestDecodeBytesValuePb(t *testing.T) {
url := "https://example.com/xx/?a=1&b=2&c=3"
val := base64.URLEncoding.EncodeToString([]byte(url))
content := "bytes=" + val
in2 := &complex.Complex{}
if err := encoding.GetCodec(contentType).Unmarshal([]byte(content), in2); err != nil {
t.Errorf("expect %v, got %v", nil, err)
}
if !reflect.DeepEqual(url, string(in2.Bytes.Value)) {
t.Errorf("except %v, got %v", val, string(in2.Bytes.Value))
}
}

4
encoding/form/proto_decode.go
View File

@ -283,7 +283,9 @@ func parseMessage(md protoreflect.MessageDescriptor, value string) (protoreflect
case "google.protobuf.BytesValue":
v, err := base64.StdEncoding.DecodeString(value)
if err != nil {
return protoreflect.Value{}, err
if v, err = base64.URLEncoding.DecodeString(value); err != nil {
return protoreflect.Value{}, err
}
}
msg = wrapperspb.Bytes(v)
case "google.protobuf.FieldMask":