github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106576 from liggitt/bad-request-patch

Browse Source 
Return BadRequest for invalid large patch
This commit is contained in:
Kubernetes Prow Robot 2021-11-21 13:05:00 -08:00 committed by GitHub
commit a8c9dd6274
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
View File

@ -412,6 +412,9 @@ func (p *jsonPatcher) applyJSPatch(versionedJS []byte) (patchedJS []byte, strict
} }
patchedJS, retErr = jsonpatch.MergePatch(versionedJS, p.patchBytes) patchedJS, retErr = jsonpatch.MergePatch(versionedJS, p.patchBytes)
if retErr == jsonpatch.ErrBadJSONPatch {
return nil, nil, errors.NewBadRequest(retErr.Error())
}
return patchedJS, strictErrors, retErr return patchedJS, strictErrors, retErr
default: default:
// only here as a safety net - go-restful filters content-type // only here as a safety net - go-restful filters content-type