From d49bff855f7da541c06dcdd49b7c48068c3c0072 Mon Sep 17 00:00:00 2001 From: cc <12904584+shvc@users.noreply.github.com> Date: Wed, 22 Feb 2023 23:18:09 +0800 Subject: [PATCH] refine: the server-side http Request Body is always non-nil (#115908) * refine: the server-side http Request Body is always non-nil * revert changes under vendor * Update staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go Co-authored-by: Jordan Liggitt * Update main.go --------- Co-authored-by: Jordan Liggitt --- .../k8s.io/pod-security-admission/cmd/webhook/server/server.go | 2 +- test/images/agnhost/net/main.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go b/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go index 782ab26c7d6..bcd2420a2a0 100644 --- a/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go +++ b/staging/src/k8s.io/pod-security-admission/cmd/webhook/server/server.go @@ -171,7 +171,7 @@ func (s *Server) HandleValidate(w http.ResponseWriter, r *http.Request) { defer cancel() } - if r.Body == nil { + if r.Body == nil || r.Body == http.NoBody { err = errors.New("request body is empty") klog.ErrorS(err, "bad request") http.Error(w, err.Error(), http.StatusBadRequest) diff --git a/test/images/agnhost/net/main.go b/test/images/agnhost/net/main.go index 3e4a78500fe..61bded22a7e 100644 --- a/test/images/agnhost/net/main.go +++ b/test/images/agnhost/net/main.go @@ -159,7 +159,7 @@ func handleRunRequest(w http.ResponseWriter, r *http.Request) { } runner := urlParts[2] - if r.Body == nil { + if r.Body == nil || r.Body == http.NoBody { http.Error(w, "Missing request body", 400) return }