encoding: verify that the target message is extendable
After resolving a FieldDescriptor from the resolver, verify that the
returned descriptor truly does extend the target message.
This will never happen with the global registry, since it checks this
but can happen with poorly written custom resolvers.
Change-Id: I2de5b9d2fb9d32e076ec4e82adda98d672891444
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/193737
Reviewed-by: Herbie Ong <herbie@google.com>
diff --git a/encoding/protojson/decode.go b/encoding/protojson/decode.go
index e8552f0..cb4f7fb 100644
--- a/encoding/protojson/decode.go
+++ b/encoding/protojson/decode.go
@@ -184,6 +184,9 @@
}
if extType != nil {
fd = extType.TypeDescriptor()
+ if !messageDesc.ExtensionRanges().Has(fd.Number()) || fd.ContainingMessage().FullName() != messageDesc.FullName() {
+ return errors.New("message %v cannot be extended by %v", messageDesc.FullName(), fd.FullName())
+ }
}
} else {
// The name can either be the JSON name or the proto field name.
diff --git a/encoding/prototext/decode.go b/encoding/prototext/decode.go
index 1bf25c2..99ef5dc 100644
--- a/encoding/prototext/decode.go
+++ b/encoding/prototext/decode.go
@@ -128,6 +128,9 @@
}
if xt != nil {
fd = xt.TypeDescriptor()
+ if !messageDesc.ExtensionRanges().Has(fd.Number()) || fd.ContainingMessage().FullName() != messageDesc.FullName() {
+ return errors.New("message %v cannot be extended by %v", messageDesc.FullName(), fd.FullName())
+ }
}
}
