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/encoding/text/text_test.go b/internal/encoding/text/text_test.go
index 97caa74..ee43190 100644
--- a/internal/encoding/text/text_test.go
+++ b/internal/encoding/text/text_test.go
@@ -354,32 +354,20 @@
wantOut: `str:"\x01\x02\x03\x04\x05\x06\x07\x08\t\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_` + "`abcdefghijklmnopqrstuvwxyz{|}~\x7f\"",
wantOutASCII: `str:"\x01\x02\x03\x04\x05\x06\x07\x08\t\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_` + "`abcdefghijklmnopqrstuvwxyz{|}~\x7f\"",
}, {
- in: "str: '\xde\xad\xbe\xef'",
- wantVal: V(Msg{{ID("str"), V("\xde\xad\xbe\xef")}}),
- wantOut: "str:\"\u07ad\\xbe\\xef\"",
- wantOutASCII: `str:"\u07ad\xbe\xef"`,
- wantErr: "invalid UTF-8 detected",
+ in: "str: '\xde\xad\xbe\xef'",
+ wantErr: "invalid UTF-8 detected",
}, {
// Valid UTF-8 wire encoding, but sub-optimal encoding.
- in: "str: '\xc0\x80'",
- wantVal: V(Msg{{ID("str"), V("\xc0\x80")}}),
- wantOut: `str:"\xc0\x80"`,
- wantOutASCII: `str:"\xc0\x80"`,
- wantErr: "invalid UTF-8 detected",
+ in: "str: '\xc0\x80'",
+ wantErr: "invalid UTF-8 detected",
}, {
// Valid UTF-8 wire encoding, but invalid rune (surrogate pair).
- in: "str: '\xed\xa0\x80'",
- wantVal: V(Msg{{ID("str"), V("\xed\xa0\x80")}}),
- wantOut: `str:"\xed\xa0\x80"`,
- wantOutASCII: `str:"\xed\xa0\x80"`,
- wantErr: "invalid UTF-8 detected",
+ in: "str: '\xed\xa0\x80'",
+ wantErr: "invalid UTF-8 detected",
}, {
// Valid UTF-8 wire encoding, but invalid rune (above max rune).
- in: "str: '\xf7\xbf\xbf\xbf'",
- wantVal: V(Msg{{ID("str"), V("\xf7\xbf\xbf\xbf")}}),
- wantOut: `str:"\xf7\xbf\xbf\xbf"`,
- wantOutASCII: `str:"\xf7\xbf\xbf\xbf"`,
- wantErr: "invalid UTF-8 detected",
+ in: "str: '\xf7\xbf\xbf\xbf'",
+ wantErr: "invalid UTF-8 detected",
}, {
// Valid UTF-8 wire encoding of the RuneError rune.
in: "str: '\xef\xbf\xbd'",