baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix wss in x-forwarded-proto

Browse source
This commit is contained in:
Julien Salleyron 2020-04-30 18:00:04 +02:00 committed by GitHub
parent efcaf64a43
commit e22c62baba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/middlewares/forwardedheaders/forwarded_header.go
View file

@ -141,7 +141,7 @@ func (x *XForwarded) rewrite(outreq *http.Request) {
} }
if isWebsocketRequest(outreq) { if isWebsocketRequest(outreq) {
if outreq.Header.Get(xForwardedProto) == "https" { if outreq.Header.Get(xForwardedProto) == "https" || outreq.Header.Get(xForwardedProto) == "wss" {
outreq.Header.Set(xForwardedProto, "wss") outreq.Header.Set(xForwardedProto, "wss")
} else { } else {
outreq.Header.Set(xForwardedProto, "ws") outreq.Header.Set(xForwardedProto, "ws")

11
pkg/middlewares/forwardedheaders/forwarded_header_test.go
View file

@ -203,6 +203,17 @@ func TestServeHTTP(t *testing.T) {
xForwardedProto: "wss", xForwardedProto: "wss",
}, },
}, },
{
desc: "xForwardedProto with websocket and tls and already x-forwarded-proto with wss",
tls: true,
websocket: true,
incomingHeaders: map[string]string{
xForwardedProto: "wss",
},
expectedHeaders: map[string]string{
xForwardedProto: "wss",
},
},
{ {
desc: "xForwardedPort with explicit port", desc: "xForwardedPort with explicit port",
host: "foo.com:8080", host: "foo.com:8080",