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

refactor X-Forwarded-Proto

Browse source
This commit is contained in:
Jan Christian Grünhage 2020-06-10 14:32:03 +02:00 committed by GitHub
parent c0c540dc09
commit b0f7b71453
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,19 +132,19 @@ func (x *XForwarded) rewrite(outreq *http.Request) {
xfProto := outreq.Header.Get(xForwardedProto) xfProto := outreq.Header.Get(xForwardedProto)
if xfProto == "" { if xfProto == "" {
if isWebsocketRequest(outreq) {
if outreq.TLS != nil {
outreq.Header.Set(xForwardedProto, "wss")
} else {
outreq.Header.Set(xForwardedProto, "ws")
}
} else {
if outreq.TLS != nil { if outreq.TLS != nil {
outreq.Header.Set(xForwardedProto, "https") outreq.Header.Set(xForwardedProto, "https")
} else { } else {
outreq.Header.Set(xForwardedProto, "http") outreq.Header.Set(xForwardedProto, "http")
} }
} }
if isWebsocketRequest(outreq) {
if outreq.Header.Get(xForwardedProto) == "https" || outreq.Header.Get(xForwardedProto) == "wss" {
outreq.Header.Set(xForwardedProto, "wss")
} else {
outreq.Header.Set(xForwardedProto, "ws")
}
} }
if xfPort := outreq.Header.Get(xForwardedPort); xfPort == "" { if xfPort := outreq.Header.Get(xForwardedPort); xfPort == "" {