github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(websocket): feat(websocket): remove Origin header before handling request (#1901)

pull/1907/head
Anthony Lapenna 2018-05-16 09:13:46 +02:00 committed by GitHub
parent 32800a843a
commit 45f52657cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/http/handler/websocket.go
View File

@ -94,6 +94,8 @@ func (handler *WebSocketHandler) handleWebsocketExec(w http.ResponseWriter, r *h
} }
func (handler *WebSocketHandler) handleRequest(w http.ResponseWriter, r *http.Request, params *webSocketExecRequestParams) error { func (handler *WebSocketHandler) handleRequest(w http.ResponseWriter, r *http.Request, params *webSocketExecRequestParams) error {
r.Header.Del("Origin")
if params.nodeName != "" { if params.nodeName != "" {
return handler.proxyWebsocketRequest(w, r, params) return handler.proxyWebsocketRequest(w, r, params)
} }
@ -135,7 +137,6 @@ func (handler *WebSocketHandler) proxyWebsocketRequest(w http.ResponseWriter, r
out.Set(portainer.PortainerAgentTargetHeader, params.nodeName) out.Set(portainer.PortainerAgentTargetHeader, params.nodeName)
} }
r.Header.Del("Origin")
proxy.ServeHTTP(w, r) proxy.ServeHTTP(w, r)
return nil return nil