mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2025-01-06 00:55:51 +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>
186 lines
4.7 KiB
Go
186 lines
4.7 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 text
|
|
|
|
import (
|
|
"bytes"
|
|
"strings"
|
|
|
|
"google.golang.org/protobuf/internal/detrand"
|
|
"google.golang.org/protobuf/internal/errors"
|
|
)
|
|
|
|
// Marshal serializes v as the proto text format, where v must be a Message.
|
|
// In the proto text format, the top-level value is always a message where the
|
|
// delimiters are elided.
|
|
//
|
|
// If indent is a non-empty string, it causes every entry in a List or Message
|
|
// to be preceded by the indent and trailed by a newline.
|
|
//
|
|
// If delims is not the zero value, it controls the delimiter characters used
|
|
// for messages (e.g., "{}" vs "<>").
|
|
//
|
|
// If outputASCII is true, strings will be serialized in such a way that
|
|
// multi-byte UTF-8 sequences are escaped. This property ensures that the
|
|
// overall output is ASCII (as opposed to UTF-8).
|
|
func Marshal(v Value, indent string, delims [2]byte, outputASCII bool) ([]byte, error) {
|
|
p := encoder{}
|
|
if len(indent) > 0 {
|
|
if strings.Trim(indent, " \t") != "" {
|
|
return nil, errors.New("indent may only be composed of space and tab characters")
|
|
}
|
|
p.indent = indent
|
|
p.newline = "\n"
|
|
}
|
|
switch delims {
|
|
case [2]byte{0, 0}:
|
|
p.delims = [2]byte{'{', '}'}
|
|
case [2]byte{'{', '}'}, [2]byte{'<', '>'}:
|
|
p.delims = delims
|
|
default:
|
|
return nil, errors.New("delimiters may only be \"{}\" or \"<>\"")
|
|
}
|
|
p.outputASCII = outputASCII
|
|
|
|
err := p.marshalMessage(v, false)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(indent) > 0 {
|
|
return append(bytes.TrimRight(p.out, "\n"), '\n'), nil
|
|
}
|
|
return p.out, nil
|
|
}
|
|
|
|
type encoder struct {
|
|
out []byte
|
|
|
|
indent string
|
|
indents []byte
|
|
newline string // set to "\n" if len(indent) > 0
|
|
delims [2]byte
|
|
outputASCII bool
|
|
}
|
|
|
|
func (p *encoder) marshalList(v Value) error {
|
|
if v.Type() != List {
|
|
return errors.New("invalid type %v, expected list", v.Type())
|
|
}
|
|
elems := v.List()
|
|
p.out = append(p.out, '[')
|
|
p.indents = append(p.indents, p.indent...)
|
|
if len(elems) > 0 {
|
|
p.out = append(p.out, p.newline...)
|
|
}
|
|
for i, elem := range elems {
|
|
p.out = append(p.out, p.indents...)
|
|
if err := p.marshalValue(elem); err != nil {
|
|
return err
|
|
}
|
|
if i < len(elems)-1 {
|
|
p.out = append(p.out, ',')
|
|
}
|
|
p.out = append(p.out, p.newline...)
|
|
}
|
|
p.indents = p.indents[:len(p.indents)-len(p.indent)]
|
|
if len(elems) > 0 {
|
|
p.out = append(p.out, p.indents...)
|
|
}
|
|
p.out = append(p.out, ']')
|
|
return nil
|
|
}
|
|
|
|
func (p *encoder) marshalMessage(v Value, emitDelims bool) error {
|
|
if v.Type() != Message {
|
|
return errors.New("invalid type %v, expected message", v.Type())
|
|
}
|
|
items := v.Message()
|
|
if emitDelims {
|
|
p.out = append(p.out, p.delims[0])
|
|
p.indents = append(p.indents, p.indent...)
|
|
if len(items) > 0 {
|
|
p.out = append(p.out, p.newline...)
|
|
}
|
|
}
|
|
for i, item := range items {
|
|
p.out = append(p.out, p.indents...)
|
|
if err := p.marshalKey(item[0]); err != nil {
|
|
return err
|
|
}
|
|
p.out = append(p.out, ':')
|
|
if len(p.indent) > 0 {
|
|
p.out = append(p.out, ' ')
|
|
}
|
|
// For multi-line output, add a random extra space after key: per message to
|
|
// make output unstable.
|
|
if len(p.indent) > 0 && detrand.Bool() {
|
|
p.out = append(p.out, ' ')
|
|
}
|
|
|
|
if err := p.marshalValue(item[1]); err != nil {
|
|
return err
|
|
}
|
|
if i < len(items)-1 && len(p.indent) == 0 {
|
|
p.out = append(p.out, ' ')
|
|
}
|
|
// For single-line output, add a random extra space after a field per message to
|
|
// make output unstable.
|
|
if len(p.indent) == 0 && detrand.Bool() && i != len(items)-1 {
|
|
p.out = append(p.out, ' ')
|
|
}
|
|
p.out = append(p.out, p.newline...)
|
|
}
|
|
if emitDelims {
|
|
p.indents = p.indents[:len(p.indents)-len(p.indent)]
|
|
if len(items) > 0 {
|
|
p.out = append(p.out, p.indents...)
|
|
}
|
|
p.out = append(p.out, p.delims[1])
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (p *encoder) marshalKey(v Value) error {
|
|
switch v.Type() {
|
|
case String:
|
|
var err error
|
|
p.out = append(p.out, '[')
|
|
if len(urlRegexp.FindString(v.str)) == len(v.str) {
|
|
p.out = append(p.out, v.str...)
|
|
} else {
|
|
err = p.marshalString(v)
|
|
}
|
|
p.out = append(p.out, ']')
|
|
return err
|
|
case Uint:
|
|
return p.marshalNumber(v)
|
|
case Name:
|
|
s, _ := v.Name()
|
|
p.out = append(p.out, s...)
|
|
return nil
|
|
default:
|
|
return errors.New("invalid type %v to encode key", v.Type())
|
|
}
|
|
}
|
|
|
|
func (p *encoder) marshalValue(v Value) error {
|
|
switch v.Type() {
|
|
case Bool, Int, Uint, Float32, Float64:
|
|
return p.marshalNumber(v)
|
|
case String:
|
|
return p.marshalString(v)
|
|
case List:
|
|
return p.marshalList(v)
|
|
case Message:
|
|
return p.marshalMessage(v, true)
|
|
case Name:
|
|
s, _ := v.Name()
|
|
p.out = append(p.out, s...)
|
|
return nil
|
|
default:
|
|
return errors.New("invalid type %v to encode value", v.Type())
|
|
}
|
|
}
|