github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Don't include user data in CRI streaming redirect URLs

Browse Source
This commit is contained in:
Tim St. Clair
2016-12-13 18:27:05 -08:00
parent 330c922706
commit c17f3ee367
8 changed files with 650 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/server/server.go
View File

@@ -606,7 +606,7 @@ func (s *Server) getAttach(request *restful.Request, response *restful.Response)
podFullName := kubecontainer.GetPodFullName(pod)
redirect, err := s.host.GetAttach(podFullName, params.podUID, params.containerName, *streamOpts)
if err != nil {
response.WriteError(streaming.HTTPStatus(err), err)
streaming.WriteError(err, response.ResponseWriter)
return
}
if redirect != nil {
@@ -644,7 +644,7 @@ func (s *Server) getExec(request *restful.Request, response *restful.Response) {
podFullName := kubecontainer.GetPodFullName(pod)
redirect, err := s.host.GetExec(podFullName, params.podUID, params.containerName, params.cmd, *streamOpts)
if err != nil {
response.WriteError(streaming.HTTPStatus(err), err)
streaming.WriteError(err, response.ResponseWriter)
return
}
if redirect != nil {
@@ -714,7 +714,7 @@ func (s *Server) getPortForward(request *restful.Request, response *restful.Resp
redirect, err := s.host.GetPortForward(pod.Name, pod.Namespace, pod.UID)
if err != nil {
response.WriteError(streaming.HTTPStatus(err), err)
streaming.WriteError(err, response.ResponseWriter)
return
}
if redirect != nil {