Merge pull request #46854 from CaoShuFeng/jijacker

Automatic merge from submit-queue (batch tested with PRs 46897, 46899, 46864, 46854, 46875) [advanced audit] fix invalid status code for hijacker Fixes #47035 When using hijacker to take over the connection, the http status code should be 101 not 200. PS: Use "kubectl exec" as an example to review this change. Part of https://github.com/kubernetes/features/issues/22

Merge pull request #46854 from CaoShuFeng/jijacker
5633d759 · Kubernetes Submit Queue · GitHub · f04a7742 · 541935b1 · 5633d759
Commit 5633d759 authored Jun 06, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 06, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

audit.go staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go +3 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/filters/audit.go
@@ -177,7 +177,7 @@ func (a *auditResponseWriter) processCode(code int) {
 }

 func (a *auditResponseWriter) Write(bs []byte) (int, error) {
-	a.processCode(200) // the Go library calls WriteHeader internally if no code was written yet. But this will go unnoticed for us
+	a.processCode(http.StatusOK) // the Go library calls WriteHeader internally if no code was written yet. But this will go unnoticed for us
 	return a.ResponseWriter.Write(bs)
 }

@@ -202,6 +202,8 @@ func (f *fancyResponseWriterDelegator) Flush() {
 }

 func (f *fancyResponseWriterDelegator) Hijack() (net.Conn, *bufio.ReadWriter, error) {
+	// fake a response status before protocol switch happens
+	f.processCode(http.StatusSwitchingProtocols)
 	return f.ResponseWriter.(http.Hijacker).Hijack()
 }