refactor: improve HTTPS detection logic by using case-insensitive comparison for X-Forwarded-Proto header

This commit is contained in:
yusing
2025-11-07 15:49:51 +08:00
parent e9ac3cd1a9
commit d81521f293
3 changed files with 5 additions and 3 deletions

View File

@@ -10,6 +10,7 @@ import (
"net/http" "net/http"
"net/url" "net/url"
"slices" "slices"
"strings"
"time" "time"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
@@ -199,7 +200,7 @@ func (auth *OIDCProvider) HandleAuth(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "" { if r.URL.Path == "" {
r.URL.Path = OIDCAuthInitPath r.URL.Path = OIDCAuthInitPath
} }
if r.TLS == nil && r.Header.Get("X-Forwarded-Proto") != "https" { if r.TLS == nil && strings.EqualFold(r.Header.Get("X-Forwarded-Proto"), "https") {
r.URL.Scheme = "https" r.URL.Scheme = "https"
http.Redirect(w, r, r.URL.String(), http.StatusFound) http.Redirect(w, r, r.URL.String(), http.StatusFound)
return return

View File

@@ -5,6 +5,7 @@ import (
"errors" "errors"
"net" "net"
"net/http" "net/http"
"strings"
"time" "time"
"github.com/yusing/godoxy/internal/route/routes" "github.com/yusing/godoxy/internal/route/routes"
@@ -71,7 +72,7 @@ func (m *forwardAuthMiddleware) before(w http.ResponseWriter, r *http.Request) (
} }
proto := "http" proto := "http"
if r.TLS != nil || r.Header.Get("X-Forwarded-Proto") == "https" { if r.TLS != nil || strings.EqualFold(r.Header.Get("X-Forwarded-Proto"), "https") {
proto = "https" proto = "https"
} }

View File

@@ -19,7 +19,7 @@ var RedirectHTTP = NewMiddleware[redirectHTTP]()
// before implements RequestModifier. // before implements RequestModifier.
func (m *redirectHTTP) before(w http.ResponseWriter, r *http.Request) (proceed bool) { func (m *redirectHTTP) before(w http.ResponseWriter, r *http.Request) (proceed bool) {
if r.TLS != nil || r.Header.Get("X-Forwarded-Proto") == "https" { if r.TLS != nil || strings.EqualFold(r.Header.Get("X-Forwarded-Proto"), "https") {
return true return true
} }