Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add check for repeated google.protobuf.Any type #3080

Merged
merged 17 commits into from Dec 21, 2022
Merged

fix: add check for repeated google.protobuf.Any type #3080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c2405f8
Merge pull request #1 from grpc-ecosystem/master
veith Apr 21, 2021
8cc870b
test type any
veith Apr 21, 2021
c11e878
feat: Patcher for type google.protobuf.Any
veith Apr 21, 2021
4a0de88
feat: Patcher for type google.protobuf.Any
veith Apr 21, 2021
1f0ec43
feat: Patcher for type google.protobuf.Any
veith Apr 21, 2021
15fc586
fix: add propper error message if someone sends only parts of a googl…
veith Apr 22, 2021
482aa73
revert
renovate[bot] Mar 18, 2021
3de4a7b
Rerun generation
johanbrandhorst Apr 22, 2021
24a54b5
Rerun Bazel generation too
johanbrandhorst Apr 22, 2021
c57c398
Merge remote-tracking branch 'origin/master'
veith Apr 23, 2021
f99c04e
Merge branch 'master' of github.com:grpc-ecosystem/grpc-gateway
veith Apr 26, 2021
1d7636c
Merge branch 'grpc-ecosystem:master' into master
veith Feb 20, 2022
f17ba05
Merge branch 'grpc-ecosystem:main' into master
veith Dec 20, 2022
bb3ad2b
fix: add check for repeated google.protobuf.Any type for generating f…
veith Dec 20, 2022
9306c41
Merge branch 'grpc-ecosystem:main' into main
veith Dec 21, 2022
0f37da5
fix: add check for repeated google.protobuf.Any type for generating f…
veith Dec 20, 2022
5be2538
Merge remote-tracking branch 'origin/fix/patch_repeated_any_type' int…
veith Dec 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/fieldmask.go
View file
Open in desktop
Expand Up @@ -64,7 +64,7 @@ func FieldMaskFromRequestBody(r io.Reader, msg proto.Message) (*field_mask.Field
continue
}

if isProtobufAnyMessage(fd.Message()) {
if isProtobufAnyMessage(fd.Message()) && !fd.IsList() {
_, hasTypeField := v.(map[string]interface{})["@type"]
if hasTypeField {
queue = append(queue, fieldMaskPathItem{path: k})
Expand Down
7 changes: 6 additions & 1 deletion runtime/fieldmask_test.go
View file
Open in desktop
Expand Up @@ -165,13 +165,18 @@ func TestFieldMaskFromRequestBody(t *testing.T) {
"nested",
),
},

{
name: "protobuf-any",
msg: &examplepb.ABitOfEverything{},
input: `{"anytype":{"@type": "xx.xx/examplepb.NestedOuter", "one":{"two":{"three":{"a":true, "b":false}}}}}`,
expected: newFieldMask("anytype"), //going deeper makes no sense
},
{
name: "repeated-protobuf-any",
msg: &examplepb.ABitOfEverything{},
input: `{"repeated_anytype":[{"@type": "xx.xx/examplepb.NestedOuter", "one":{"two":{"three":{"a":true, "b":false}}}}]}`,
expected: newFieldMask("repeated_anytype"), //going deeper makes no sense
},
} {
t.Run(tc.name, func(t *testing.T) {
actual, err := FieldMaskFromRequestBody(bytes.NewReader([]byte(tc.input)), tc.msg)
Expand Down