mirror of https://github.com/k3s-io/k3s
36c20d1f5e
Automatic merge from submit-queue (batch tested with PRs 38525, 38977) Prevent json decoder panic on invalid input Related downstream issue: https://github.com/openshift/origin/issues/12132 ``` # Can be replicated on kubectl with: $ cat panic.json { "kind": "Pod", "apiVersion": "v1", "metadata": { "name": "", "labels": { "name": "" }, "generateName": "", "namespace": "", "annotations": [] }, "spec": {} }, $ kubectl create -f panic.json --validate=false ``` **Release note**: ```release-note release-note-none ``` This patch handles cases where `ioutil.ReadAll` will return a single character output on an invalid json input, causing the `Decode` method to panic when it tries to calculate the line number for the syntax error. The example below would cause a panic due to the trailing comma at the end: ``` { "kind": "Pod", "apiVersion": "v1", "metadata": { "name": "", "labels": { "name": "" }, "generateName": "", "namespace": "", "annotations": [] }, "spec": {} }, ``` @kubernetes/cli-review @fabianofranz |
||
|---|---|---|
| .. | ||
| schema | ||
| serializer | ||
| BUILD | ||
| OWNERS | ||
| codec.go | ||
| codec_check.go | ||
| conversion.go | ||
| conversion_test.go | ||
| doc.go | ||
| embedded.go | ||
| embedded_test.go | ||
| error.go | ||
| extension.go | ||
| extension_test.go | ||
| generated.pb.go | ||
| generated.proto | ||
| helper.go | ||
| helper_test.go | ||
| interfaces.go | ||
| register.go | ||
| scheme.go | ||
| scheme_builder.go | ||
| scheme_test.go | ||
| swagger_doc_generator.go | ||
| swagger_doc_generator_test.go | ||
| types.go | ||
| types_proto.go | ||
| unversioned_test.go | ||
| zz_generated.deepcopy.go | ||