mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-01-01 11:58:21 +00:00
8c86fc5e7d
Immediately abort (un)marshal operations when encountering invalid UTF-8 data in proto3 strings. No other proto implementation supports non-UTF-8 data in proto3 strings (and many reject it in proto2 strings as well). Producing invalid output is an interoperability threat (other implementations won't be able to read it). The case where existing string data is found to contain non-UTF8 data is better handled by changing the field to the `bytes` type, which (aside from UTF-8 validation) is wire-compatible with `string`. Remove the errors.NonFatal type, since there are no remaining cases where it is needed. "Non-fatal" errors which produce results and a non-nil error are problematic because they compose poorly; the better approach is to take an option like AllowPartial indicating which conditions to check for. Change-Id: I9d189ec6ffda7b5d96d094aa1b290af2e3f23736 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/183098 Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
140 lines
3.9 KiB
Go
140 lines
3.9 KiB
Go
// Copyright 2019 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package proto_test
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"testing"
|
|
|
|
protoV1 "github.com/golang/protobuf/proto"
|
|
"github.com/google/go-cmp/cmp"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
test3pb "google.golang.org/protobuf/internal/testprotos/test3"
|
|
)
|
|
|
|
func TestEncode(t *testing.T) {
|
|
for _, test := range testProtos {
|
|
for _, want := range test.decodeTo {
|
|
t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
|
|
opts := proto.MarshalOptions{
|
|
AllowPartial: test.partial,
|
|
}
|
|
wire, err := opts.Marshal(want)
|
|
if err != nil {
|
|
t.Fatalf("Marshal error: %v\nMessage:\n%v", err, marshalText(want))
|
|
}
|
|
|
|
size := proto.Size(want)
|
|
if size != len(wire) {
|
|
t.Errorf("Size and marshal disagree: Size(m)=%v; len(Marshal(m))=%v\nMessage:\n%v", size, len(wire), marshalText(want))
|
|
}
|
|
|
|
got := want.ProtoReflect().New().Interface()
|
|
uopts := proto.UnmarshalOptions{
|
|
AllowPartial: test.partial,
|
|
}
|
|
if err := uopts.Unmarshal(wire, got); err != nil {
|
|
t.Errorf("Unmarshal error: %v\nMessage:\n%v", err, protoV1.MarshalTextString(want.(protoV1.Message)))
|
|
return
|
|
}
|
|
|
|
if test.invalidExtensions {
|
|
// Equal doesn't work on messages containing invalid extension data.
|
|
return
|
|
}
|
|
if !proto.Equal(got, want) {
|
|
t.Errorf("Unmarshal returned unexpected result; got:\n%v\nwant:\n%v", protoV1.MarshalTextString(got.(protoV1.Message)), protoV1.MarshalTextString(want.(protoV1.Message)))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEncodeDeterministic(t *testing.T) {
|
|
for _, test := range testProtos {
|
|
for _, want := range test.decodeTo {
|
|
t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
|
|
opts := proto.MarshalOptions{
|
|
Deterministic: true,
|
|
AllowPartial: test.partial,
|
|
}
|
|
wire, err := opts.Marshal(want)
|
|
if err != nil {
|
|
t.Fatalf("Marshal error: %v\nMessage:\n%v", err, marshalText(want))
|
|
}
|
|
wire2, err := opts.Marshal(want)
|
|
if err != nil {
|
|
t.Fatalf("Marshal error: %v\nMessage:\n%v", err, marshalText(want))
|
|
}
|
|
if !bytes.Equal(wire, wire2) {
|
|
t.Fatalf("deterministic marshal returned varying results:\n%v", cmp.Diff(wire, wire2))
|
|
}
|
|
|
|
got := want.ProtoReflect().New().Interface()
|
|
uopts := proto.UnmarshalOptions{
|
|
AllowPartial: test.partial,
|
|
}
|
|
if err := uopts.Unmarshal(wire, got); err != nil {
|
|
t.Errorf("Unmarshal error: %v\nMessage:\n%v", err, marshalText(want))
|
|
return
|
|
}
|
|
|
|
if test.invalidExtensions {
|
|
// Equal doesn't work on messages containing invalid extension data.
|
|
return
|
|
}
|
|
if !proto.Equal(got, want) {
|
|
t.Errorf("Unmarshal returned unexpected result; got:\n%v\nwant:\n%v", marshalText(got), marshalText(want))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEncodeInvalidUTF8(t *testing.T) {
|
|
for _, test := range invalidUTF8TestProtos {
|
|
for _, want := range test.decodeTo {
|
|
t.Run(fmt.Sprintf("%s (%T)", test.desc, want), func(t *testing.T) {
|
|
_, err := proto.Marshal(want)
|
|
if err == nil {
|
|
t.Errorf("Marshal did not return expected error for invalid UTF8: %v\nMessage:\n%v", err, marshalText(want))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestEncodeRequiredFieldChecks(t *testing.T) {
|
|
for _, test := range testProtos {
|
|
if !test.partial {
|
|
continue
|
|
}
|
|
for _, m := range test.decodeTo {
|
|
t.Run(fmt.Sprintf("%s (%T)", test.desc, m), func(t *testing.T) {
|
|
_, err := proto.Marshal(m)
|
|
if err == nil {
|
|
t.Fatalf("Marshal succeeded (want error)\nMessage:\n%v", marshalText(m))
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestMarshalAppend(t *testing.T) {
|
|
want := []byte("prefix")
|
|
got := append([]byte(nil), want...)
|
|
got, err := proto.MarshalOptions{}.MarshalAppend(got, &test3pb.TestAllTypes{
|
|
OptionalString: "value",
|
|
})
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if !bytes.HasPrefix(got, want) {
|
|
t.Fatalf("MarshalAppend modified prefix: got %v, want prefix %v", got, want)
|
|
}
|
|
}
|