mirror of
https://github.com/protocolbuffers/protobuf-go.git
synced 2024-12-28 18:25:46 +00:00
0bf97b7e36
Recognize messagesets in the validator. Currently, this just gives up and reports an unknown validity rather than trying to descend into the messageset. Plumb fast-path initialization checks through messageset decoding. Change-Id: Ice55f28e8555764e4ce2720251830e8cf475c133 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/216245 Reviewed-by: Joe Tsai <joetsai@google.com>
273 lines
9.0 KiB
Go
273 lines
9.0 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 (
|
|
"google.golang.org/protobuf/internal/encoding/pack"
|
|
"google.golang.org/protobuf/internal/encoding/wire"
|
|
"google.golang.org/protobuf/internal/flags"
|
|
"google.golang.org/protobuf/internal/impl"
|
|
"google.golang.org/protobuf/proto"
|
|
|
|
messagesetpb "google.golang.org/protobuf/internal/testprotos/messageset/messagesetpb"
|
|
msetextpb "google.golang.org/protobuf/internal/testprotos/messageset/msetextpb"
|
|
)
|
|
|
|
func init() {
|
|
if flags.ProtoLegacy {
|
|
testValidMessages = append(testValidMessages, messageSetTestProtos...)
|
|
}
|
|
}
|
|
|
|
var messageSetTestProtos = []testProto{
|
|
{
|
|
desc: "MessageSet type_id before message content",
|
|
decodeTo: []proto.Message{func() proto.Message {
|
|
m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
|
|
proto.SetExtension(m.MessageSet, msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
|
|
Ext1Field1: proto.Int32(10),
|
|
})
|
|
return m
|
|
}()},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet type_id after message content",
|
|
decodeTo: []proto.Message{func() proto.Message {
|
|
m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
|
|
proto.SetExtension(m.MessageSet, msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
|
|
Ext1Field1: proto.Int32(10),
|
|
})
|
|
return m
|
|
}()},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet does not preserve unknown field",
|
|
decodeTo: []proto.Message{build(
|
|
&messagesetpb.MessageSet{},
|
|
extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
|
|
Ext1Field1: proto.Int32(10),
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
// Unknown field
|
|
pack.Tag{4, pack.VarintType}, pack.Varint(30),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with unknown type_id",
|
|
decodeTo: []proto.Message{build(
|
|
&messagesetpb.MessageSet{},
|
|
unknown(pack.Message{
|
|
pack.Tag{999, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
}.Marshal()),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(999),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet merges repeated message fields in item",
|
|
decodeTo: []proto.Message{build(
|
|
&messagesetpb.MessageSet{},
|
|
extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
|
|
Ext1Field1: proto.Int32(10),
|
|
Ext1Field2: proto.Int32(20),
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(20),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet merges message fields in repeated items",
|
|
decodeTo: []proto.Message{build(
|
|
&messagesetpb.MessageSet{},
|
|
extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{
|
|
Ext1Field1: proto.Int32(10),
|
|
Ext1Field2: proto.Int32(20),
|
|
}),
|
|
extend(msetextpb.E_Ext2_MessageSetExtension, &msetextpb.Ext2{
|
|
Ext2Field1: proto.Int32(30),
|
|
}),
|
|
)},
|
|
wire: pack.Message{
|
|
// Ext1, field1
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
// Ext2, field1
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1001),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(30),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
// Ext2, field2
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(20),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with missing type_id",
|
|
decodeTo: []proto.Message{build(
|
|
&messagesetpb.MessageSet{},
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(10),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with missing message",
|
|
decodeTo: []proto.Message{build(
|
|
&messagesetpb.MessageSet{},
|
|
extend(msetextpb.E_Ext1_MessageSetExtension, &msetextpb.Ext1{}),
|
|
)},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1000),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with type id out of valid field number range",
|
|
decodeTo: []proto.Message{func() proto.Message {
|
|
m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
|
|
proto.SetExtension(m.MessageSet, msetextpb.E_ExtLargeNumber_MessageSetExtension, &msetextpb.ExtLargeNumber{})
|
|
return m
|
|
}()},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(wire.MaxValidNumber + 1),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with unknown type id out of valid field number range",
|
|
decodeTo: []proto.Message{func() proto.Message {
|
|
m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
|
|
m.MessageSet.ProtoReflect().SetUnknown(
|
|
pack.Message{
|
|
pack.Tag{wire.MaxValidNumber + 2, pack.BytesType}, pack.LengthPrefix{},
|
|
}.Marshal(),
|
|
)
|
|
return m
|
|
}()},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(wire.MaxValidNumber + 2),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with required field set",
|
|
checkFastInit: true,
|
|
decodeTo: []proto.Message{func() proto.Message {
|
|
m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
|
|
proto.SetExtension(m.MessageSet, msetextpb.E_ExtRequired_MessageSetExtension, &msetextpb.ExtRequired{
|
|
RequiredField1: proto.Int32(1),
|
|
})
|
|
return m
|
|
}()},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1002),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.VarintType}, pack.Varint(1),
|
|
}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
{
|
|
desc: "MessageSet with required field unset",
|
|
checkFastInit: true,
|
|
partial: true,
|
|
decodeTo: []proto.Message{func() proto.Message {
|
|
m := &messagesetpb.MessageSetContainer{MessageSet: &messagesetpb.MessageSet{}}
|
|
proto.SetExtension(m.MessageSet, msetextpb.E_ExtRequired_MessageSetExtension, &msetextpb.ExtRequired{})
|
|
return m
|
|
}()},
|
|
wire: pack.Message{
|
|
pack.Tag{1, pack.BytesType}, pack.LengthPrefix(pack.Message{
|
|
pack.Tag{1, pack.StartGroupType},
|
|
pack.Tag{2, pack.VarintType}, pack.Varint(1002),
|
|
pack.Tag{3, pack.BytesType}, pack.LengthPrefix(pack.Message{}),
|
|
pack.Tag{1, pack.EndGroupType},
|
|
}),
|
|
}.Marshal(),
|
|
validationStatus: impl.ValidationUnknown,
|
|
},
|
|
}
|