trustchain-oc1-orchestral/authentik
Archived
10
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

outposts/proxy: improve host header detection

Browse source 
Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>
This commit is contained in:
Jens Langhammer 2021-05-11 20:02:36 +02:00
parent 84dfbcaaae
commit dd1a6a81c8
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
outpost/pkg/proxy/server.go
View file

@ -57,7 +57,7 @@ func (s *Server) handler(w http.ResponseWriter, r *http.Request) {
for k := range s.Handlers { for k := range s.Handlers {
hostKeys = append(hostKeys, k) hostKeys = append(hostKeys, k)
} }
s.logger.WithField("host", host).WithField("known-hosts", strings.Join(hostKeys, ", ")).Debug("Host header does not match any we know of") s.logger.WithField("host", host).WithField("known-hosts", strings.Join(hostKeys, ",")).Debug("Host header does not match any we know of")
w.WriteHeader(404) w.WriteHeader(404)
return return
} }

14
outpost/pkg/proxy/utils.go
View file

@ -1,12 +1,20 @@
package proxy package proxy
import "net/http" import (
"net"
"net/http"
)
var xForwardedHost = http.CanonicalHeaderKey("X-Forwarded-Host") var xForwardedHost = http.CanonicalHeaderKey("X-Forwarded-Host")
func getHost(req *http.Request) string { func getHost(req *http.Request) string {
host := req.Host
if req.Header.Get(xForwardedHost) != "" { if req.Header.Get(xForwardedHost) != "" {
return req.Header.Get(xForwardedHost) host = req.Header.Get(xForwardedHost)
} }
return req.Host hostOnly, _, err := net.SplitHostPort(host)
if err != nil {
return host
}
return hostOnly
} }