mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-01-09 03:39:24 +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>
368 lines
10 KiB
Go
368 lines
10 KiB
Go
// Copyright 2018 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 prototext
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
"unicode/utf8"
|
|
|
|
"google.golang.org/protobuf/internal/encoding/text"
|
|
"google.golang.org/protobuf/internal/encoding/wire"
|
|
"google.golang.org/protobuf/internal/errors"
|
|
"google.golang.org/protobuf/internal/fieldnum"
|
|
"google.golang.org/protobuf/internal/mapsort"
|
|
"google.golang.org/protobuf/internal/pragma"
|
|
"google.golang.org/protobuf/proto"
|
|
pref "google.golang.org/protobuf/reflect/protoreflect"
|
|
"google.golang.org/protobuf/reflect/protoregistry"
|
|
)
|
|
|
|
// Marshal writes the given proto.Message in textproto format using default options.
|
|
func Marshal(m proto.Message) ([]byte, error) {
|
|
return MarshalOptions{}.Marshal(m)
|
|
}
|
|
|
|
// MarshalOptions is a configurable text format marshaler.
|
|
type MarshalOptions struct {
|
|
pragma.NoUnkeyedLiterals
|
|
|
|
// AllowPartial allows messages that have missing required fields to marshal
|
|
// without returning an error. If AllowPartial is false (the default),
|
|
// Marshal will return error if there are any missing required fields.
|
|
AllowPartial bool
|
|
|
|
// If Indent is a non-empty string, it causes entries for a Message to be
|
|
// preceded by the indent and trailed by a newline. Indent can only be
|
|
// composed of space or tab characters.
|
|
Indent string
|
|
|
|
// Resolver is used for looking up types when expanding google.protobuf.Any
|
|
// messages. If nil, this defaults to using protoregistry.GlobalTypes.
|
|
Resolver interface {
|
|
protoregistry.ExtensionTypeResolver
|
|
protoregistry.MessageTypeResolver
|
|
}
|
|
}
|
|
|
|
// Marshal writes the given proto.Message in textproto format using options in MarshalOptions object.
|
|
func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) {
|
|
if o.Resolver == nil {
|
|
o.Resolver = protoregistry.GlobalTypes
|
|
}
|
|
|
|
v, err := o.marshalMessage(m.ProtoReflect())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
delims := [2]byte{'{', '}'}
|
|
const outputASCII = false
|
|
b, err := text.Marshal(v, o.Indent, delims, outputASCII)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if o.AllowPartial {
|
|
return b, nil
|
|
}
|
|
return b, proto.IsInitialized(m)
|
|
}
|
|
|
|
// marshalMessage converts a protoreflect.Message to a text.Value.
|
|
func (o MarshalOptions) marshalMessage(m pref.Message) (text.Value, error) {
|
|
var msgFields [][2]text.Value
|
|
messageDesc := m.Descriptor()
|
|
|
|
// Handle Any expansion.
|
|
if messageDesc.FullName() == "google.protobuf.Any" {
|
|
if msg, err := o.marshalAny(m); err == nil {
|
|
// Return as is if no error.
|
|
return msg, nil
|
|
}
|
|
// Otherwise continue on to marshal Any as a regular message.
|
|
}
|
|
|
|
// Handle known fields.
|
|
fieldDescs := messageDesc.Fields()
|
|
size := fieldDescs.Len()
|
|
for i := 0; i < size; i++ {
|
|
fd := fieldDescs.Get(i)
|
|
if !m.Has(fd) {
|
|
continue
|
|
}
|
|
|
|
name := text.ValueOf(fd.Name())
|
|
// Use type name for group field name.
|
|
if fd.Kind() == pref.GroupKind {
|
|
name = text.ValueOf(fd.Message().Name())
|
|
}
|
|
pval := m.Get(fd)
|
|
var err error
|
|
msgFields, err = o.appendField(msgFields, name, pval, fd)
|
|
if err != nil {
|
|
return text.Value{}, err
|
|
}
|
|
}
|
|
|
|
// Handle extensions.
|
|
var err error
|
|
msgFields, err = o.appendExtensions(msgFields, m)
|
|
if err != nil {
|
|
return text.Value{}, err
|
|
}
|
|
|
|
// Handle unknown fields.
|
|
// TODO: Provide option to exclude or include unknown fields.
|
|
msgFields = appendUnknown(msgFields, m.GetUnknown())
|
|
|
|
return text.ValueOf(msgFields), nil
|
|
}
|
|
|
|
// appendField marshals a protoreflect.Value and appends it to the given [][2]text.Value.
|
|
func (o MarshalOptions) appendField(msgFields [][2]text.Value, name text.Value, pval pref.Value, fd pref.FieldDescriptor) ([][2]text.Value, error) {
|
|
switch {
|
|
case fd.IsList():
|
|
items, err := o.marshalList(pval.List(), fd)
|
|
if err != nil {
|
|
return msgFields, err
|
|
}
|
|
|
|
for _, item := range items {
|
|
msgFields = append(msgFields, [2]text.Value{name, item})
|
|
}
|
|
case fd.IsMap():
|
|
items, err := o.marshalMap(pval.Map(), fd)
|
|
if err != nil {
|
|
return msgFields, err
|
|
}
|
|
|
|
for _, item := range items {
|
|
msgFields = append(msgFields, [2]text.Value{name, item})
|
|
}
|
|
default:
|
|
tval, err := o.marshalSingular(pval, fd)
|
|
if err != nil {
|
|
return msgFields, err
|
|
}
|
|
msgFields = append(msgFields, [2]text.Value{name, tval})
|
|
}
|
|
|
|
return msgFields, nil
|
|
}
|
|
|
|
// marshalSingular converts a non-repeated field value to text.Value.
|
|
// This includes all scalar types, enums, messages, and groups.
|
|
func (o MarshalOptions) marshalSingular(val pref.Value, fd pref.FieldDescriptor) (text.Value, error) {
|
|
kind := fd.Kind()
|
|
switch kind {
|
|
case pref.BoolKind,
|
|
pref.Int32Kind, pref.Sint32Kind, pref.Uint32Kind,
|
|
pref.Int64Kind, pref.Sint64Kind, pref.Uint64Kind,
|
|
pref.Sfixed32Kind, pref.Fixed32Kind,
|
|
pref.Sfixed64Kind, pref.Fixed64Kind,
|
|
pref.FloatKind, pref.DoubleKind,
|
|
pref.BytesKind:
|
|
return text.ValueOf(val.Interface()), nil
|
|
|
|
case pref.StringKind:
|
|
s := val.String()
|
|
if !utf8.ValidString(s) {
|
|
return text.Value{}, errors.InvalidUTF8(string(fd.FullName()))
|
|
}
|
|
return text.ValueOf(s), nil
|
|
|
|
case pref.EnumKind:
|
|
num := val.Enum()
|
|
if desc := fd.Enum().Values().ByNumber(num); desc != nil {
|
|
return text.ValueOf(desc.Name()), nil
|
|
}
|
|
// Use numeric value if there is no enum description.
|
|
return text.ValueOf(int32(num)), nil
|
|
|
|
case pref.MessageKind, pref.GroupKind:
|
|
return o.marshalMessage(val.Message())
|
|
}
|
|
|
|
panic(fmt.Sprintf("%v has unknown kind: %v", fd.FullName(), kind))
|
|
}
|
|
|
|
// marshalList converts a protoreflect.List to []text.Value.
|
|
func (o MarshalOptions) marshalList(list pref.List, fd pref.FieldDescriptor) ([]text.Value, error) {
|
|
size := list.Len()
|
|
values := make([]text.Value, 0, size)
|
|
|
|
for i := 0; i < size; i++ {
|
|
item := list.Get(i)
|
|
val, err := o.marshalSingular(item, fd)
|
|
if err != nil {
|
|
// Return already marshaled values.
|
|
return values, err
|
|
}
|
|
values = append(values, val)
|
|
}
|
|
|
|
return values, nil
|
|
}
|
|
|
|
var (
|
|
mapKeyName = text.ValueOf(pref.Name("key"))
|
|
mapValueName = text.ValueOf(pref.Name("value"))
|
|
)
|
|
|
|
// marshalMap converts a protoreflect.Map to []text.Value.
|
|
func (o MarshalOptions) marshalMap(mmap pref.Map, fd pref.FieldDescriptor) ([]text.Value, error) {
|
|
// values is a list of messages.
|
|
values := make([]text.Value, 0, mmap.Len())
|
|
|
|
var err error
|
|
mapsort.Range(mmap, fd.MapKey().Kind(), func(key pref.MapKey, val pref.Value) bool {
|
|
var keyTxtVal text.Value
|
|
keyTxtVal, err = o.marshalSingular(key.Value(), fd.MapKey())
|
|
if err != nil {
|
|
return false
|
|
}
|
|
var valTxtVal text.Value
|
|
valTxtVal, err = o.marshalSingular(val, fd.MapValue())
|
|
if err != nil {
|
|
return false
|
|
}
|
|
// Map entry (message) contains 2 fields, first field for key and second field for value.
|
|
msg := text.ValueOf([][2]text.Value{
|
|
{mapKeyName, keyTxtVal},
|
|
{mapValueName, valTxtVal},
|
|
})
|
|
values = append(values, msg)
|
|
err = nil
|
|
return true
|
|
})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return values, nil
|
|
}
|
|
|
|
// appendExtensions marshals extension fields and appends them to the given [][2]text.Value.
|
|
func (o MarshalOptions) appendExtensions(msgFields [][2]text.Value, m pref.Message) ([][2]text.Value, error) {
|
|
var err error
|
|
var entries [][2]text.Value
|
|
m.Range(func(fd pref.FieldDescriptor, v pref.Value) bool {
|
|
if !fd.IsExtension() {
|
|
return true
|
|
}
|
|
xt := fd.(pref.ExtensionType)
|
|
|
|
// If extended type is a MessageSet, set field name to be the message type name.
|
|
name := xt.Descriptor().FullName()
|
|
if isMessageSetExtension(xt) {
|
|
name = xt.Descriptor().Message().FullName()
|
|
}
|
|
|
|
// Use string type to produce [name] format.
|
|
tname := text.ValueOf(string(name))
|
|
entries, err = o.appendField(entries, tname, v, xt)
|
|
if err != nil {
|
|
return false
|
|
}
|
|
err = nil
|
|
return true
|
|
})
|
|
if err != nil {
|
|
return msgFields, err
|
|
}
|
|
|
|
// Sort extensions lexicographically and append to output.
|
|
sort.SliceStable(entries, func(i, j int) bool {
|
|
return entries[i][0].String() < entries[j][0].String()
|
|
})
|
|
return append(msgFields, entries...), nil
|
|
}
|
|
|
|
// isMessageSetExtension reports whether extension extends a message set.
|
|
func isMessageSetExtension(xt pref.ExtensionType) bool {
|
|
xd := xt.Descriptor()
|
|
if xd.Name() != "message_set_extension" {
|
|
return false
|
|
}
|
|
md := xd.Message()
|
|
if md == nil {
|
|
return false
|
|
}
|
|
if xd.FullName().Parent() != md.FullName() {
|
|
return false
|
|
}
|
|
xmd, ok := xd.ContainingMessage().(interface{ IsMessageSet() bool })
|
|
return ok && xmd.IsMessageSet()
|
|
}
|
|
|
|
// appendUnknown parses the given []byte and appends field(s) into the given fields slice.
|
|
// This function assumes proper encoding in the given []byte.
|
|
func appendUnknown(fields [][2]text.Value, b []byte) [][2]text.Value {
|
|
for len(b) > 0 {
|
|
var value interface{}
|
|
num, wtype, n := wire.ConsumeTag(b)
|
|
b = b[n:]
|
|
|
|
switch wtype {
|
|
case wire.VarintType:
|
|
value, n = wire.ConsumeVarint(b)
|
|
case wire.Fixed32Type:
|
|
value, n = wire.ConsumeFixed32(b)
|
|
case wire.Fixed64Type:
|
|
value, n = wire.ConsumeFixed64(b)
|
|
case wire.BytesType:
|
|
value, n = wire.ConsumeBytes(b)
|
|
case wire.StartGroupType:
|
|
var v []byte
|
|
v, n = wire.ConsumeGroup(num, b)
|
|
var msg [][2]text.Value
|
|
value = appendUnknown(msg, v)
|
|
default:
|
|
panic(fmt.Sprintf("error parsing unknown field wire type: %v", wtype))
|
|
}
|
|
|
|
fields = append(fields, [2]text.Value{text.ValueOf(uint32(num)), text.ValueOf(value)})
|
|
b = b[n:]
|
|
}
|
|
return fields
|
|
}
|
|
|
|
// marshalAny converts a google.protobuf.Any protoreflect.Message to a text.Value.
|
|
func (o MarshalOptions) marshalAny(m pref.Message) (text.Value, error) {
|
|
fds := m.Descriptor().Fields()
|
|
fdType := fds.ByNumber(fieldnum.Any_TypeUrl)
|
|
fdValue := fds.ByNumber(fieldnum.Any_Value)
|
|
|
|
typeURL := m.Get(fdType).String()
|
|
value := m.Get(fdValue)
|
|
|
|
emt, err := o.Resolver.FindMessageByURL(typeURL)
|
|
if err != nil {
|
|
return text.Value{}, err
|
|
}
|
|
em := emt.New().Interface()
|
|
err = proto.UnmarshalOptions{
|
|
AllowPartial: true,
|
|
Resolver: o.Resolver,
|
|
}.Unmarshal(value.Bytes(), em)
|
|
if err != nil {
|
|
return text.Value{}, err
|
|
}
|
|
|
|
msg, err := o.marshalMessage(em.ProtoReflect())
|
|
if err != nil {
|
|
return text.Value{}, err
|
|
}
|
|
// Expanded Any field value contains only a single field with the type_url field value as the
|
|
// field name in [] and a text marshaled field value of the embedded message.
|
|
msgFields := [][2]text.Value{
|
|
{
|
|
text.ValueOf(typeURL),
|
|
msg,
|
|
},
|
|
}
|
|
return text.ValueOf(msgFields), nil
|
|
}
|