go/oauth2-proxy
1
0
Fork 0
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git synced 2025-06-23 00:40:46 +02:00
Code Issues Releases Activity

Confirm that the proto is not empty, and change condition to OR

Browse Source 
Co-Authored-By: Joel Speed <Joel.speed@hotmail.co.uk>
This commit is contained in:
Josh Michielsen
2019-10-22 14:21:06 +01:00
committed by GitHub
parent fe9efba0c5
commit c0bfe0357a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
http.go
View File

@ -156,7 +156,7 @@ func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
func redirectToHTTPS(opts *Options, h http.Handler) http.Handler { func redirectToHTTPS(opts *Options, h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
proto := r.Header.Get("X-Forwarded-Proto") proto := r.Header.Get("X-Forwarded-Proto")
if opts.ForceHTTPS && r.TLS == nil && strings.ToLower(proto) != "https" { if opts.ForceHTTPS && (r.TLS == nil || (proto != "" && strings.ToLower(proto) != "https")) {
http.Redirect(w, r, opts.HTTPSAddress, http.StatusPermanentRedirect) http.Redirect(w, r, opts.HTTPSAddress, http.StatusPermanentRedirect)
} }