all: remove non-fatal UTF-8 validation errors (and non-fatal in general)
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>
diff --git a/internal/impl/encode_field.go b/internal/impl/encode_field.go
index a6580ce..f4c9406 100644
--- a/internal/impl/encode_field.go
+++ b/internal/impl/encode_field.go
@@ -10,7 +10,6 @@
"unicode/utf8"
"google.golang.org/protobuf/internal/encoding/wire"
- "google.golang.org/protobuf/internal/errors"
"google.golang.org/protobuf/proto"
pref "google.golang.org/protobuf/reflect/protoreflect"
)
@@ -221,18 +220,17 @@
func appendMessageSliceInfo(b []byte, p pointer, wiretag uint64, mi *MessageInfo, opts marshalOptions) ([]byte, error) {
s := p.PointerSlice()
- var nerr errors.NonFatal
var err error
for _, v := range s {
b = wire.AppendVarint(b, wiretag)
siz := mi.sizePointer(v, opts)
b = wire.AppendVarint(b, uint64(siz))
b, err = mi.marshalAppendPointer(b, v, opts)
- if !nerr.Merge(err) {
+ if err != nil {
return b, err
}
}
- return b, nerr.E
+ return b, nil
}
func sizeMessageSlice(p pointer, goType reflect.Type, tagsize int, _ marshalOptions) int {
@@ -247,7 +245,6 @@
func appendMessageSlice(b []byte, p pointer, wiretag uint64, goType reflect.Type, opts marshalOptions) ([]byte, error) {
s := p.PointerSlice()
- var nerr errors.NonFatal
var err error
for _, v := range s {
m := Export{}.MessageOf(v.AsValueOf(goType.Elem()).Interface()).Interface()
@@ -255,11 +252,11 @@
siz := proto.Size(m)
b = wire.AppendVarint(b, uint64(siz))
b, err = opts.Options().MarshalAppend(b, m)
- if !nerr.Merge(err) {
+ if err != nil {
return b, err
}
}
- return b, nerr.E
+ return b, nil
}
// Slices of messages
@@ -312,18 +309,17 @@
func appendGroupSlice(b []byte, p pointer, wiretag uint64, messageType reflect.Type, opts marshalOptions) ([]byte, error) {
s := p.PointerSlice()
- var nerr errors.NonFatal
var err error
for _, v := range s {
m := Export{}.MessageOf(v.AsValueOf(messageType.Elem()).Interface()).Interface()
b = wire.AppendVarint(b, wiretag) // start group
b, err = opts.Options().MarshalAppend(b, m)
- if !nerr.Merge(err) {
+ if err != nil {
return b, err
}
b = wire.AppendVarint(b, wiretag+1) // end group
}
- return b, nerr.E
+ return b, nil
}
func sizeGroupSliceInfo(p pointer, mi *MessageInfo, tagsize int, opts marshalOptions) int {
@@ -337,17 +333,16 @@
func appendGroupSliceInfo(b []byte, p pointer, wiretag uint64, mi *MessageInfo, opts marshalOptions) ([]byte, error) {
s := p.PointerSlice()
- var nerr errors.NonFatal
var err error
for _, v := range s {
b = wire.AppendVarint(b, wiretag) // start group
b, err = mi.marshalAppendPointer(b, v, opts)
- if !nerr.Merge(err) {
+ if err != nil {
return b, err
}
b = wire.AppendVarint(b, wiretag+1) // end group
}
- return b, nerr.E
+ return b, nil
}
func sizeGroupSliceIface(ival interface{}, tagsize int, opts marshalOptions) int {